summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client.c8
-rw-r--r--openbox/event.c8
-rw-r--r--openbox/grab.c8
-rw-r--r--openbox/mouse.c4
-rw-r--r--openbox/openbox.c4
-rw-r--r--openbox/screen.c20
6 files changed, 26 insertions, 26 deletions
diff --git a/openbox/client.c b/openbox/client.c
index 20ccfe3d..3c295017 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2123,7 +2123,7 @@ void client_update_icons(ObClient *self)
if (hints->flags & IconPixmapHint) {
self->nicons = 1;
self->icons = g_new(ObClientIcon, self->nicons);
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
if (!RrPixmapToRGBA(ob_rr_inst,
hints->icon_pixmap,
(hints->flags & IconMaskHint ?
@@ -2135,7 +2135,7 @@ void client_update_icons(ObClient *self)
g_free(self->icons);
self->nicons = 0;
}
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
}
XFree(hints);
}
@@ -3611,7 +3611,7 @@ gboolean client_focus(ObClient *self)
*/
event_cancel_all_key_grabs();
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
if (self->can_focus) {
/* This can cause a BadMatch error with CurrentTime, or if an app
@@ -3635,7 +3635,7 @@ gboolean client_focus(ObClient *self)
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
ob_debug_type(OB_DEBUG_FOCUS, "Error focusing? %d\n",
obt_display_error_occured);
diff --git a/openbox/event.c b/openbox/event.c
index 63e27df6..7e4e25f3 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -595,7 +595,7 @@ static void event_process(const XEvent *ec, gpointer data)
Window win, root;
gint i;
guint u;
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
if (XGetInputFocus(ob_display, &win, &i) != 0 &&
XGetGeometry(ob_display, win, &root, &i,&i,&u,&u,&u,&u) != 0 &&
root != RootWindow(ob_display, ob_screen))
@@ -607,7 +607,7 @@ static void event_process(const XEvent *ec, gpointer data)
else
ob_debug_type(OB_DEBUG_FOCUS,
"Focus went to a black hole !\n");
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
/* nothing is focused */
focus_set_client(NULL);
} else {
@@ -685,10 +685,10 @@ static void event_process(const XEvent *ec, gpointer data)
/* we are not to be held responsible if someone sends us an
invalid request! */
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
XConfigureWindow(ob_display, window,
e->xconfigurerequest.value_mask, &xwc);
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
}
#ifdef SYNC
else if (obt_display_extension_sync &&
diff --git a/openbox/grab.c b/openbox/grab.c
index cfbbbe1a..fea2b62e 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -175,11 +175,11 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
guint i;
/* can get BadAccess from these */
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
for (i = 0; i < MASK_LIST_SIZE; ++i)
XGrabButton(ob_display, button, state | mask_list[i], win, False, mask,
pointer_mode, GrabModeAsync, None, ob_cursor(cur));
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
if (obt_display_error_occured)
ob_debug("Failed to grab button %d modifiers %d", button, state);
}
@@ -197,11 +197,11 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
guint i;
/* can get BadAccess' from these */
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
for (i = 0; i < MASK_LIST_SIZE; ++i)
XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
GrabModeAsync, keyboard_mode);
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
if (obt_display_error_occured)
ob_debug("Failed to grab keycode %d modifiers %d", keycode, state);
}
diff --git a/openbox/mouse.c b/openbox/mouse.c
index 782ea62c..5a9fe170 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -257,10 +257,10 @@ void mouse_event(ObClient *client, XEvent *e)
Window wjunk;
guint ujunk, b, w, h;
/* this can cause errors to occur when the window closes */
- obt_display_ignore_errors(ob_display, TRUE);
+ obt_display_ignore_errors(TRUE);
junk1 = XGetGeometry(ob_display, e->xbutton.window,
&wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
- obt_display_ignore_errors(ob_display, FALSE);
+ obt_display_ignore_errors(FALSE);
if (junk1) {
if (e->xbutton.x >= (signed)-b &&
e->xbutton.y >= (signed)-b &&
diff --git a/openbox/openbox.c b/openbox/openbox.c
index ec283d5c..79b30c0d 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -142,9 +142,9 @@ gint main(gint argc, gchar **argv)
session_startup(argc, argv);
}
- ob_display = obt_display_open(NULL);
- if (ob_display == NULL)
+ if (!obt_display_open(NULL))
ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
+ ob_display = obt_display;
if (remote_control) {
prop_startup();
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);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 09:02:13 +0000