diff options
| author | Paulo Zanoni <przanoni@src.gnome.org> | 2007-08-27 04:43:33 +0000 |
|---|---|---|
| committer | Paulo Zanoni <przanoni@src.gnome.org> | 2007-08-27 04:43:33 +0000 |
| commit | aafaf298f7d8132aca02b3bfcf2340574fc7bfbf (patch) | |
| tree | b197ffe1e0af89f2beacf2f07d87c82494298b8c /src/screen.c | |
| parent | b41c8538b6e644bbc3a9fc01d7e008dd2bc3e2f9 (diff) | |
| download | metacity-aafaf298f7d8132aca02b3bfcf2340574fc7bfbf.tar.gz | |
Another very big commit...multiple_pointer_x
Now it is possible to do "multiple operations" at the same time:
dragging/resizing windows with multiple mice, for example.
Some bugs corrected.
Some other still need to be corrected...
svn path=/branches/multiple_pointer_x/; revision=3310
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c index adb65008..9a239fcc 100644 --- a/src/screen.c +++ b/src/screen.c @@ -655,13 +655,17 @@ meta_screen_new (MetaDisplay *display, /* Screens must have at least one workspace at all times, * so create that required workspace. */ - meta_workspace_activate (meta_workspace_new (screen), timestamp); + meta_workspace_activate (meta_workspace_new (screen), + &display->devices->keyboards[0], /* XXX */ + timestamp); update_num_workspaces (screen, timestamp); set_workspace_names (screen); - screen->all_keys_grabbed = FALSE; - screen->keys_grabbed = FALSE; +// screen->all_keys_grabbed = FALSE; +// screen->keys_grabbed = FALSE; + meta_devices_list_create (&screen->all_keys_grabbed); + meta_devices_list_create (&screen->keys_grabbed); for (idev = 0; idev < display->devices->keybsUsed; idev++) meta_screen_grab_keys (screen, &display->devices->keyboards[idev]); @@ -694,7 +698,9 @@ meta_screen_new (MetaDisplay *display, current_workspace); if (space != NULL) - meta_workspace_activate (space, timestamp); + meta_workspace_activate (space, + &display->devices->keyboards[0], /* XXX */ + timestamp); } meta_verbose ("Added screen %d ('%s') root 0x%lx\n", @@ -1198,7 +1204,9 @@ update_num_workspaces (MetaScreen *screen, } if (need_change_space) - meta_workspace_activate (last_remaining, timestamp); + meta_workspace_activate (last_remaining, + &screen->display->devices->keyboards[0], /* XXX */ + timestamp); /* Should now be safe to free the workspaces */ tmp = extras; |