added our input server signature in comment
added #ifndef COMPILE_FOR_R5 to avoid BPortLink linkage when needed git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8676 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -285,8 +285,9 @@ status_t _control_input_server_(BMessage *command, BMessage *reply)
|
||||
input_server = new BMessenger;
|
||||
|
||||
if (!input_server->IsValid())
|
||||
*input_server = BMessenger("Application/x-vnd.Be-input_server", -1, NULL);
|
||||
|
||||
*input_server = BMessenger("application/x-vnd.Be-input_server", -1, NULL);
|
||||
//*input_server = BMessenger("application/x-vnd.OBOS-input_server", -1, NULL);
|
||||
|
||||
status_t err = input_server->SendMessage(command, reply);
|
||||
|
||||
if (err != B_OK)
|
||||
|
||||
@@ -57,6 +57,7 @@ system_colors()
|
||||
return BScreen(B_MAIN_SCREEN_ID).ColorMap();
|
||||
}
|
||||
|
||||
#ifndef COMPILE_FOR_R5
|
||||
|
||||
_IMPEXP_BE status_t
|
||||
set_screen_space(int32 index, uint32 res, bool stick)
|
||||
@@ -104,6 +105,7 @@ set_scroll_bar_info(scroll_bar_info *info)
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
#endif // COMPILE_FOR_R5
|
||||
|
||||
_IMPEXP_BE status_t
|
||||
get_mouse_type(int32 *type)
|
||||
@@ -393,6 +395,16 @@ set_keyboard_locks(uint32 modifiers)
|
||||
}
|
||||
|
||||
|
||||
_IMPEXP_BE status_t
|
||||
_restore_key_map_()
|
||||
{
|
||||
BMessage message(IS_RESTORE_KEY_MAP);
|
||||
BMessage reply;
|
||||
|
||||
return _control_input_server_(&message, &reply);
|
||||
}
|
||||
|
||||
|
||||
_IMPEXP_BE rgb_color
|
||||
keyboard_navigation_color()
|
||||
{
|
||||
@@ -401,6 +413,8 @@ keyboard_navigation_color()
|
||||
}
|
||||
|
||||
|
||||
#ifndef COMPILE_FOR_R5
|
||||
|
||||
_IMPEXP_BE int32
|
||||
count_workspaces()
|
||||
{
|
||||
@@ -637,12 +651,4 @@ void __set_window_decor(int32 theme)
|
||||
link.Flush();
|
||||
}
|
||||
|
||||
|
||||
_IMPEXP_BE status_t
|
||||
_restore_key_map_()
|
||||
{
|
||||
BMessage message(IS_RESTORE_KEY_MAP);
|
||||
BMessage reply;
|
||||
|
||||
return _control_input_server_(&message, &reply);
|
||||
}
|
||||
#endif // COMPILE_FOR_R5
|
||||
|
||||
Reference in New Issue
Block a user