diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-26 20:03:31 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-20 01:36:54 -0500 |
| commit | 6c8acc079a9cbb40245e5df4b50b3f8b9c17cf83 (patch) | |
| tree | 70432a7643ac99542aac129b22503e9cacfa667f /openbox/screen.c | |
| parent | 5960d27b1c35c58d3c1731c71c44b9c61328a34d (diff) | |
add prop.[ch] to the libobt, but they are not used yet. add a global obt_display which obt can use, and the application.
Diffstat (limited to 'openbox/screen.c')
| -rw-r--r-- | openbox/screen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/openbox/screen.c b/openbox/screen.c index 0d891630..e8a175d1 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -102,13 +102,13 @@ static gboolean replace_wm(void) ob_screen); return FALSE; } - obt_display_ignore_errors(ob_display, TRUE); + obt_display_ignore_errors(TRUE); /* We want to find out when the current selection owner dies */ XSelectInput(ob_display, current_wm_sn_owner, StructureNotifyMask); XSync(ob_display, FALSE); - obt_display_ignore_errors(ob_display, FALSE); + obt_display_ignore_errors(FALSE); if (obt_display_error_occured) current_wm_sn_owner = None; } @@ -179,10 +179,10 @@ gboolean screen_annex(void) return FALSE; } - obt_display_ignore_errors(ob_display, TRUE); + obt_display_ignore_errors(TRUE); XSelectInput(ob_display, RootWindow(ob_display, ob_screen), ROOT_EVENTMASK); - obt_display_ignore_errors(ob_display, FALSE); + obt_display_ignore_errors(FALSE); if (obt_display_error_occured) { g_message(_("A window manager is already running on screen %d"), ob_screen); @@ -1239,16 +1239,16 @@ void screen_install_colormap(ObClient *client, gboolean install) { if (client == NULL || client->colormap == None) { if (install) - XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); + XInstallColormap(ob_display, RrColormap(ob_rr_inst)); else - XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); + XUninstallColormap(ob_display, RrColormap(ob_rr_inst)); } else { - obt_display_ignore_errors(ob_display, TRUE); + obt_display_ignore_errors(TRUE); if (install) - XInstallColormap(RrDisplay(ob_rr_inst), client->colormap); + XInstallColormap(ob_display, client->colormap); else - XUninstallColormap(RrDisplay(ob_rr_inst), client->colormap); - obt_display_ignore_errors(ob_display, FALSE); + XUninstallColormap(ob_display, client->colormap); + obt_display_ignore_errors(FALSE); } } |