isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace deprecated GDK functions

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=662245
This commit is contained in:
Florian Müllner 2011-10-19 23:52:11 +02:00
parent b62f5ef07d
commit 8a39145e3c
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shell-app.c
View File

@ -1081,6 +1081,7 @@ shell_app_launch (ShellApp *app,
gboolean ret; gboolean ret;
ShellGlobal *global; ShellGlobal *global;
MetaScreen *screen; MetaScreen *screen;
GdkDisplay *gdisplay;
if (startup_id) if (startup_id)
*startup_id = NULL; *startup_id = NULL;
@ -1099,6 +1100,7 @@ shell_app_launch (ShellApp *app,
global = shell_global_get (); global = shell_global_get ();
screen = shell_global_get_screen (global); screen = shell_global_get_screen (global);
gdisplay = gdk_screen_get_display (shell_global_get_gdk_screen (global));
if (timestamp == 0) if (timestamp == 0)
timestamp = shell_global_get_current_time (global); timestamp = shell_global_get_current_time (global);
@ -1106,7 +1108,7 @@ shell_app_launch (ShellApp *app,
if (workspace < 0) if (workspace < 0)
workspace = meta_screen_get_active_workspace_index (screen); workspace = meta_screen_get_active_workspace_index (screen);
context = gdk_app_launch_context_new (); context = gdk_display_get_app_launch_context (gdisplay);
gdk_app_launch_context_set_timestamp (context, timestamp); gdk_app_launch_context_set_timestamp (context, timestamp);
gdk_app_launch_context_set_desktop (context, workspace); gdk_app_launch_context_set_desktop (context, workspace);

25
src/shell-global.c
View File

@ -648,7 +648,7 @@ shell_global_set_cursor (ShellGlobal *global,
gdk_window_set_cursor (global->stage_gdk_window, cursor); gdk_window_set_cursor (global->stage_gdk_window, cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
/** /**
@ -1282,9 +1282,17 @@ shell_global_get_pointer (ShellGlobal *global,
int *y, int *y,
ClutterModifierType *mods) ClutterModifierType *mods)
{ {
GdkDeviceManager *gmanager;
GdkDevice *gdevice;
GdkScreen *gscreen;
GdkModifierType raw_mods; GdkModifierType raw_mods;
gdk_display_get_pointer (global->gdk_display, NULL, x, y, &raw_mods); gmanager = gdk_display_get_device_manager (global->gdk_display);
gdevice = gdk_device_manager_get_client_pointer (gmanager);
gdk_device_get_position (gdevice, &gscreen, x, y);
gdk_device_get_state (gdevice,
gdk_screen_get_root_window (gscreen),
NULL, &raw_mods);
*mods = raw_mods & GDK_MODIFIER_MASK; *mods = raw_mods & GDK_MODIFIER_MASK;
} }
@ -1301,9 +1309,18 @@ shell_global_sync_pointer (ShellGlobal *global)
{ {
int x, y; int x, y;
GdkModifierType mods; GdkModifierType mods;
GdkDeviceManager *gmanager;
GdkDevice *gdevice;
GdkScreen *gscreen;
ClutterMotionEvent event; ClutterMotionEvent event;
gdk_display_get_pointer (global->gdk_display, NULL, &x, &y, &mods); gmanager = gdk_display_get_device_manager (global->gdk_display);
gdevice = gdk_device_manager_get_client_pointer (gmanager);
gdk_device_get_position (gdevice, &gscreen, &x, &y);
gdk_device_get_state (gdevice,
gdk_screen_get_root_window (gscreen),
NULL, &mods);
event.type = CLUTTER_MOTION; event.type = CLUTTER_MOTION;
event.time = shell_global_get_current_time (global); event.time = shell_global_get_current_time (global);
@ -1405,7 +1422,7 @@ shell_global_create_app_launch_context (ShellGlobal *global)
{ {
GdkAppLaunchContext *context; GdkAppLaunchContext *context;
context = gdk_app_launch_context_new (); context = gdk_display_get_app_launch_context (global->gdk_display);
gdk_app_launch_context_set_timestamp (context, shell_global_get_current_time (global)); gdk_app_launch_context_set_timestamp (context, shell_global_get_current_time (global));
// Make sure that the app is opened on the current workspace even if // Make sure that the app is opened on the current workspace even if