From fde5f47cb26ad3563e0a8e5ed8fd5f6b913cbb54 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sat, 10 May 2003 21:05:34 +0000
Subject: [PATCH] Just small code cleanup.
(Old svn revision: 11100)
---
src/client.c | 76 ++++++++++++------------
src/events.c | 12 ++--
src/hints.c | 158 ++++++++++++++++++++++++-------------------------
src/keyboard.c | 18 +++---
src/main.c | 8 +--
src/misc.c | 4 +-
src/parserc.c | 2 +-
7 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/src/client.c b/src/client.c
index b63de3327..6639750a4 100644
--- a/src/client.c
+++ b/src/client.c
@@ -509,22 +509,22 @@ void clientUpdateNetState(Client * c, XClientMessageEvent * ev)
{
if(CLIENT_CAN_HIDE_WINDOW(c))
{
- clientHide(c, c->win_workspace, True);
+ clientHide(c, c->win_workspace, TRUE);
}
}
else if((action == NET_WM_STATE_REMOVE) && CLIENT_FLAG_TEST(c, CLIENT_FLAG_HIDDEN))
{
- clientShow(c, True);
+ clientShow(c, TRUE);
}
else if(action == NET_WM_STATE_TOGGLE)
{
if(CLIENT_FLAG_TEST(c, CLIENT_FLAG_HIDDEN))
{
- clientShow(c, True);
+ clientShow(c, TRUE);
}
else if(CLIENT_CAN_HIDE_WINDOW(c))
{
- clientHide(c, c->win_workspace, True);
+ clientHide(c, c->win_workspace, TRUE);
}
}
}
@@ -1020,7 +1020,7 @@ static void clientWindowType(Client * c)
void clientInstallColormaps(Client * c)
{
XWindowAttributes attr;
- gboolean installed = False;
+ gboolean installed = FALSE;
int i;
g_return_if_fail(c != NULL);
@@ -1034,7 +1034,7 @@ void clientInstallColormaps(Client * c)
XInstallColormap(dpy, attr.colormap);
if(c->cmap_windows[i] == c->window)
{
- installed = True;
+ installed = TRUE;
}
}
}
@@ -2027,8 +2027,8 @@ void clientConfigure(Client * c, XWindowChanges * wc, int mask, gboolean constra
ce.height = c->height;
ce.border_width = 0;
ce.above = c->frame;
- ce.override_redirect = False;
- XSendEvent(dpy, c->window, False, StructureNotifyMask, (XEvent *) & ce);
+ ce.override_redirect = FALSE;
+ XSendEvent(dpy, c->window, FALSE, StructureNotifyMask, (XEvent *) & ce);
}
}
@@ -2313,7 +2313,7 @@ void clientFrame(Window w, gboolean initial)
for(i = 0; i < BUTTON_COUNT; i++)
{
- c->button_pressed[i] = False;
+ c->button_pressed[i] = FALSE;
}
if(!XGetWMColormapWindows(dpy, c->window, &c->cmap_windows, &c->ncmap))
@@ -2435,7 +2435,7 @@ void clientFrame(Window w, gboolean initial)
clientAddToList(c);
clientSetNetActions(c);
clientGrabKeys(c);
- XGrabButton(dpy, AnyButton, AnyModifier, c->window, False, POINTER_EVENT_MASK, GrabModeSync, GrabModeAsync, None, None);
+ XGrabButton(dpy, AnyButton, AnyModifier, c->window, FALSE, POINTER_EVENT_MASK, GrabModeSync, GrabModeAsync, None, None);
if (!initial)
{
MyXUngrabServer();
@@ -2464,12 +2464,12 @@ void clientFrame(Window w, gboolean initial)
if(!CLIENT_FLAG_TEST(c, CLIENT_FLAG_HIDDEN))
{
- clientShow(c, True);
+ clientShow(c, TRUE);
if(!initial && params.focus_new && clientAcceptFocus(c) && (c->win_workspace == workspace))
{
/* We set the draw_active value to the wrong value to force a draw */
c->draw_active = FALSE;
- clientSetFocus(c, True);
+ clientSetFocus(c, TRUE);
}
else
{
@@ -2594,7 +2594,7 @@ void clientUnframeAll()
c = clientGetFromWindow(wins[i], FRAME);
if(c)
{
- clientUnframe(c, True);
+ clientUnframe(c, TRUE);
}
}
MyXUngrabServer();
@@ -2856,7 +2856,7 @@ void clientHideAll(Client * c, int ws)
{
if(((!c) && (c2->win_workspace == ws)) || ((c) && !clientIsTransientFor(c, c2) && (c2->win_workspace == c->win_workspace)))
{
- clientHide(c2, ws, True);
+ clientHide(c2, ws, TRUE);
}
}
}
@@ -3125,17 +3125,17 @@ void clientSetWorkspace(Client * c, int ws, gboolean manage_mapping)
{
if(CLIENT_FLAG_TEST(c2, CLIENT_FLAG_STICKY))
{
- clientShow(c2, False);
+ clientShow(c2, FALSE);
}
else
{
if(ws == workspace)
{
- clientShow(c2, False);
+ clientShow(c2, FALSE);
}
else
{
- clientHide(c2, workspace, False);
+ clientHide(c2, workspace, FALSE);
}
}
}
@@ -3958,25 +3958,25 @@ void clientMove(Client * c, XEvent * e)
if(e->type == KeyPress)
{
- passdata.use_keys = True;
+ passdata.use_keys = TRUE;
timestamp = e->xkey.time;
passdata.mx = e->xkey.x_root;
passdata.my = e->xkey.y_root;
- g1 = XGrabKeyboard(dpy, passdata.tmp_event_window, False, GrabModeAsync, GrabModeAsync, timestamp);
- g2 = XGrabPointer(dpy, passdata.tmp_event_window, False, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, move_cursor, timestamp);
+ g1 = XGrabKeyboard(dpy, passdata.tmp_event_window, FALSE, GrabModeAsync, GrabModeAsync, timestamp);
+ g2 = XGrabPointer(dpy, passdata.tmp_event_window, FALSE, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, move_cursor, timestamp);
}
else if(e->type == ButtonPress)
{
timestamp = e->xbutton.time;
passdata.mx = e->xbutton.x_root;
passdata.my = e->xbutton.y_root;
- g2 = XGrabPointer(dpy, passdata.tmp_event_window, False, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, timestamp);
+ g2 = XGrabPointer(dpy, passdata.tmp_event_window, FALSE, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, timestamp);
}
else
{
timestamp = CurrentTime;
getMouseXY(root, &passdata.mx, &passdata.my);
- g2 = XGrabPointer(dpy, passdata.tmp_event_window, False, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, move_cursor, timestamp);
+ g2 = XGrabPointer(dpy, passdata.tmp_event_window, FALSE, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, move_cursor, timestamp);
}
if(((passdata.use_keys) && (g1 != GrabSuccess)) || (g2 != GrabSuccess))
@@ -4282,11 +4282,11 @@ void clientResize(Client * c, int corner, XEvent * e)
if(e->type == KeyPress)
{
- passdata.use_keys = True;
+ passdata.use_keys = TRUE;
timestamp = e->xkey.time;
passdata.mx = e->xkey.x;
passdata.my = e->xkey.y;
- g1 = XGrabKeyboard(dpy, passdata.tmp_event_window, False, GrabModeAsync, GrabModeAsync, timestamp);
+ g1 = XGrabKeyboard(dpy, passdata.tmp_event_window, FALSE, GrabModeAsync, GrabModeAsync, timestamp);
}
else if(e->type == ButtonPress)
{
@@ -4299,7 +4299,7 @@ void clientResize(Client * c, int corner, XEvent * e)
timestamp = CurrentTime;
getMouseXY(c->frame, &passdata.mx, &passdata.my);
}
- g2 = XGrabPointer(dpy, passdata.tmp_event_window, False, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, resize_cursor[passdata.corner], timestamp);
+ g2 = XGrabPointer(dpy, passdata.tmp_event_window, FALSE, ButtonMotionMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, resize_cursor[passdata.corner], timestamp);
if(((passdata.use_keys) && (g1 != GrabSuccess)) || (g2 != GrabSuccess))
{
@@ -4431,8 +4431,8 @@ void clientCycle(Client * c)
g_return_if_fail(c != NULL);
TRACE("entering clientCycle");
- g1 = XGrabKeyboard(dpy, gnome_win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
- g2 = XGrabPointer(dpy, gnome_win, False, NoEventMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+ g1 = XGrabKeyboard(dpy, gnome_win, FALSE, GrabModeAsync, GrabModeAsync, CurrentTime);
+ g2 = XGrabPointer(dpy, gnome_win, FALSE, NoEventMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
if((g1 != GrabSuccess) || (g2 != GrabSuccess))
{
TRACE("grab failed in clientCycle");
@@ -4474,9 +4474,9 @@ void clientCycle(Client * c)
if(passdata.c)
{
- clientShow(passdata.c, True);
+ clientShow(passdata.c, TRUE);
clientRaise(passdata.c);
- clientSetFocus(passdata.c, True);
+ clientSetFocus(passdata.c, TRUE);
}
}
@@ -4489,22 +4489,22 @@ static GtkToXEventFilterStatus clientButtonPress_event_filter(XEvent * xevent, g
if(xevent->type == EnterNotify)
{
- c->button_pressed[b] = True;
+ c->button_pressed[b] = TRUE;
frameDraw(c, FALSE, FALSE);
}
else if(xevent->type == LeaveNotify)
{
- c->button_pressed[b] = False;
+ c->button_pressed[b] = FALSE;
frameDraw(c, FALSE, FALSE);
}
else if(xevent->type == ButtonRelease)
{
- pressed = False;
+ pressed = FALSE;
}
else if((xevent->type == UnmapNotify) && (xevent->xunmap.window == c->window))
{
- pressed = False;
- c->button_pressed[b] = False;
+ pressed = FALSE;
+ c->button_pressed[b] = FALSE;
}
else if((xevent->type == KeyPress) || (xevent->type == KeyRelease))
{}
@@ -4538,7 +4538,7 @@ void clientButtonPress(Client * c, Window w, XButtonEvent * bev)
}
}
- g1 = XGrabPointer(dpy, w, False, ButtonReleaseMask | EnterWindowMask | LeaveWindowMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+ g1 = XGrabPointer(dpy, w, FALSE, ButtonReleaseMask | EnterWindowMask | LeaveWindowMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
if(g1 != GrabSuccess)
{
@@ -4554,7 +4554,7 @@ void clientButtonPress(Client * c, Window w, XButtonEvent * bev)
passdata.c = c;
passdata.b = b;
- c->button_pressed[b] = True;
+ c->button_pressed[b] = TRUE;
frameDraw(c, FALSE, FALSE);
TRACE("entering button press loop");
@@ -4567,13 +4567,13 @@ void clientButtonPress(Client * c, Window w, XButtonEvent * bev)
if(c->button_pressed[b])
{
- c->button_pressed[b] = False;
+ c->button_pressed[b] = FALSE;
switch (b)
{
case HIDE_BUTTON:
if(CLIENT_CAN_HIDE_WINDOW(c))
{
- clientHide(c, c->win_workspace, True);
+ clientHide(c, c->win_workspace, TRUE);
}
break;
case CLOSE_BUTTON:
diff --git a/src/events.c b/src/events.c
index 645631cc0..0ebe74c33 100644
--- a/src/events.c
+++ b/src/events.c
@@ -893,11 +893,11 @@ static inline void handleEnterNotify(XCrossingEvent * ev)
static inline void handleLeaveNotify(XCrossingEvent * ev)
{
- /* If we leave the root window, then we're really moving
- * to another screen on a multiple screen display, and we
- * need to de-focus and unhighlight to make sure that we
- * don't end up with more than one highlighted window at
- * a time */
+ /*
+ * If we leave the root window, that means the mouse has
+ * moved to another screen on a multiple screen display.
+ * => Reset focus
+ */
TRACE("entering handleLeaveNotify");
@@ -907,7 +907,7 @@ static inline void handleLeaveNotify(XCrossingEvent * ev)
{
reset_timeout();
}
- clientSetFocus(NULL, TRUE);
+ clientSetFocus(NULL, FALSE);
}
}
diff --git a/src/hints.c b/src/hints.c
index d346642f5..0467c6c92 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -121,15 +121,15 @@ void initICCCMHints(Display * dpy)
{
TRACE("entering initICCCMHints");
- sm_client_id = XInternAtom(dpy, "SM_CLIENT_ID", False);
- wm_change_state = XInternAtom(dpy, "WM_CHANGE_STATE", False);
- wm_client_leader = XInternAtom(dpy, "WM_CLIENT_LEADER", False);
- wm_colormap_windows = XInternAtom(dpy, "WM_COLORMAP_WINDOWS", False);
- wm_delete_window = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
- wm_protocols = XInternAtom(dpy, "WM_PROTOCOLS", False);
- wm_state = XInternAtom(dpy, "WM_STATE", False);
- wm_takefocus = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
- wm_window_role = XInternAtom(dpy, "WM_WINDOW_ROLE", False);
+ sm_client_id = XInternAtom(dpy, "SM_CLIENT_ID", FALSE);
+ wm_change_state = XInternAtom(dpy, "WM_CHANGE_STATE", FALSE);
+ wm_client_leader = XInternAtom(dpy, "WM_CLIENT_LEADER", FALSE);
+ wm_colormap_windows = XInternAtom(dpy, "WM_COLORMAP_WINDOWS", FALSE);
+ wm_delete_window = XInternAtom(dpy, "WM_DELETE_WINDOW", FALSE);
+ wm_protocols = XInternAtom(dpy, "WM_PROTOCOLS", FALSE);
+ wm_state = XInternAtom(dpy, "WM_STATE", FALSE);
+ wm_takefocus = XInternAtom(dpy, "WM_TAKE_FOCUS", FALSE);
+ wm_window_role = XInternAtom(dpy, "WM_WINDOW_ROLE", FALSE);
}
unsigned long getWMState(Display * dpy, Window w)
@@ -141,7 +141,7 @@ unsigned long getWMState(Display * dpy, Window w)
TRACE("entering getWmState");
- if((XGetWindowProperty(dpy, w, wm_state, 0, 3L, False, wm_state, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read))
+ if((XGetWindowProperty(dpy, w, wm_state, 0, 3L, FALSE, wm_state, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read))
{
state = *data;
XFree(data);
@@ -165,7 +165,7 @@ void initMotifHints(Display * dpy)
{
TRACE("entering initMotifHints");
- motif_wm_hints = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
+ motif_wm_hints = XInternAtom(dpy, "_MOTIF_WM_HINTS", FALSE);
}
PropMwmHints *getMotifHints(Display * dpy, Window w)
@@ -177,7 +177,7 @@ PropMwmHints *getMotifHints(Display * dpy, Window w)
TRACE("entering getMotifHints");
- if((XGetWindowProperty(dpy, w, motif_wm_hints, 0L, 20L, False, motif_wm_hints, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read))
+ if((XGetWindowProperty(dpy, w, motif_wm_hints, 0L, 20L, FALSE, motif_wm_hints, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read))
{
return data;
}
@@ -214,7 +214,7 @@ unsigned int getWMProtocols(Display * dpy, Window w)
}
else
{
- if((XGetWindowProperty(dpy, w, wm_protocols, 0L, 10L, False, wm_protocols, &atype, &aformat, &nitems, &bytes_remain, (unsigned char **)&protocols)) == Success)
+ if((XGetWindowProperty(dpy, w, wm_protocols, 0L, 10L, FALSE, wm_protocols, &atype, &aformat, &nitems, &bytes_remain, (unsigned char **)&protocols)) == Success)
{
for(i = 0, ap = protocols; i < nitems; i++, ap++)
{
@@ -241,16 +241,16 @@ void initGnomeHints(Display * dpy)
{
TRACE("entering initGnomeHints");
- gnome_panel_desktop_area = XInternAtom(dpy, "GNOME_PANEL_DESKTOP_AREA", False);
- win_client_list = XInternAtom(dpy, "_WIN_CLIENT_LIST", False);
- win_desktop_button_proxy = XInternAtom(dpy, "_WIN_DESKTOP_BUTTON_PROXY", False);
- win_hints = XInternAtom(dpy, "_WIN_HINTS", False);
- win_layer = XInternAtom(dpy, "_WIN_LAYER", False);
- win_protocols = XInternAtom(dpy, "_WIN_PROTOCOLS", False);
- win_state = XInternAtom(dpy, "_WIN_STATE", False);
- win_supporting_wm_check = XInternAtom(dpy, "_WIN_SUPPORTING_WM_CHECK", False);
- win_workspace_count = XInternAtom(dpy, "_WIN_WORKSPACE_COUNT", False);
- win_workspace = XInternAtom(dpy, "_WIN_WORKSPACE", False);
+ gnome_panel_desktop_area = XInternAtom(dpy, "GNOME_PANEL_DESKTOP_AREA", FALSE);
+ win_client_list = XInternAtom(dpy, "_WIN_CLIENT_LIST", FALSE);
+ win_desktop_button_proxy = XInternAtom(dpy, "_WIN_DESKTOP_BUTTON_PROXY", FALSE);
+ win_hints = XInternAtom(dpy, "_WIN_HINTS", FALSE);
+ win_layer = XInternAtom(dpy, "_WIN_LAYER", FALSE);
+ win_protocols = XInternAtom(dpy, "_WIN_PROTOCOLS", FALSE);
+ win_state = XInternAtom(dpy, "_WIN_STATE", FALSE);
+ win_supporting_wm_check = XInternAtom(dpy, "_WIN_SUPPORTING_WM_CHECK", FALSE);
+ win_workspace_count = XInternAtom(dpy, "_WIN_WORKSPACE_COUNT", FALSE);
+ win_workspace = XInternAtom(dpy, "_WIN_WORKSPACE", FALSE);
}
gboolean getGnomeHint(Display * dpy, Window w, Atom a, long *value)
@@ -265,7 +265,7 @@ gboolean getGnomeHint(Display * dpy, Window w, Atom a, long *value)
*value = 0;
- if((XGetWindowProperty(dpy, w, a, 0L, 1L, False, XA_CARDINAL, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read))
+ if((XGetWindowProperty(dpy, w, a, 0L, 1L, FALSE, XA_CARDINAL, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read))
{
*value = *data;
XFree(data);
@@ -290,7 +290,7 @@ void getGnomeDesktopMargins(Display * dpy, int screen, CARD32 * m)
TRACE("entering getGnomeDesktopMargins");
- if((XGetWindowProperty(dpy, RootWindow(dpy, screen), gnome_panel_desktop_area, 0L, 4L, False, XA_CARDINAL, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read >= 4))
+ if((XGetWindowProperty(dpy, RootWindow(dpy, screen), gnome_panel_desktop_area, 0L, 4L, FALSE, XA_CARDINAL, &real_type, &real_format, &items_read, &items_left, (unsigned char **)&data) == Success) && (items_read >= 4))
{
m[0] = data[0];
m[1] = data[1];
@@ -321,56 +321,56 @@ void initNetHints(Display * dpy)
{
TRACE("entering initNetHints");
- net_active_window = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
- net_client_list_stacking = XInternAtom(dpy, "_NET_CLIENT_LIST_STACKING", False);
- net_client_list = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
- net_close_window = XInternAtom(dpy, "_NET_CLOSE_WINDOW", False);
- net_current_desktop = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", False);
- net_desktop_geometry = XInternAtom(dpy, "_NET_DESKTOP_GEOMETRY", False);
- net_desktop_viewport = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", False);
- net_number_of_desktops = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", False);
- net_startup_id = XInternAtom(dpy, "_NET_STARTUP_ID", False);
- net_supported = XInternAtom(dpy, "_NET_SUPPORTED", False);
- net_supporting_wm_check = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
- net_wm_action_change_desktop = XInternAtom(dpy, "_NET_WM_ACTION_CHANGE_DESKTOP", False);
- net_wm_action_close = XInternAtom(dpy, "_NET_WM_ACTION_CLOSE", False);
- net_wm_action_maximize_horz = XInternAtom(dpy, "_NET_WM_ACTION_MAXIMIZE_HORZ", False);
- net_wm_action_maximize_vert = XInternAtom(dpy, "_NET_WM_ACTION_MAXIMIZE_VERT", False);
- net_wm_action_move = XInternAtom(dpy, "_NET_WM_ACTION_MOVE", False);
- net_wm_action_resize = XInternAtom(dpy, "_NET_WM_ACTION_RESIZE", False);
- net_wm_action_shade = XInternAtom(dpy, "_NET_WM_ACTION_SHADE", False);
- net_wm_action_stick = XInternAtom(dpy, "_NET_WM_ACTION_STICK", False);
- net_wm_allowed_actions = XInternAtom(dpy, "_NET_WM_ALLOWED_ACTIONS", False);
- net_wm_desktop = XInternAtom(dpy, "_NET_WM_DESKTOP", False);
- net_wm_icon_geometry = XInternAtom(dpy, "_NET_WM_ICON_GEOMETRY", False);
- net_wm_icon_name = XInternAtom(dpy, "_NET_WM_ICON_NAME", False);
- net_wm_icon = XInternAtom(dpy, "_NET_WM_ICON", False);
- net_wm_moveresize = XInternAtom(dpy, "_NET_WM_MOVERESIZE", False);
- net_wm_name = XInternAtom(dpy, "_NET_WM_NAME", False);
- net_wm_state_above = XInternAtom(dpy, "_NET_WM_STATE_ABOVE", False);
- net_wm_state_below = XInternAtom(dpy, "_NET_WM_STATE_BELOW", False);
- net_wm_state_fullscreen = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
- net_wm_state_hidden = XInternAtom(dpy, "_NET_WM_STATE_HIDDEN", False);
- net_wm_state_maximized_horz = XInternAtom(dpy, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
- net_wm_state_maximized_vert = XInternAtom(dpy, "_NET_WM_STATE_MAXIMIZED_VERT", False);
- net_wm_state_modal = XInternAtom(dpy, "_NET_WM_STATE_MODAL", False);
- net_wm_state_shaded = XInternAtom(dpy, "_NET_WM_STATE_SHADED", False);
- net_wm_state_skip_pager = XInternAtom(dpy, "_NET_WM_STATE_SKIP_PAGER", False);
- net_wm_state_skip_taskbar = XInternAtom(dpy, "_NET_WM_STATE_SKIP_TASKBAR", False);
- net_wm_state_sticky = XInternAtom(dpy, "_NET_WM_STATE_STICKY", False);
- net_wm_state = XInternAtom(dpy, "_NET_WM_STATE", False);
- net_wm_strut = XInternAtom(dpy, "_NET_WM_STRUT", False);
- net_wm_window_type_desktop = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
- net_wm_window_type_dialog = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
- net_wm_window_type_dock = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
- net_wm_window_type_menu = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_MENU", False);
- net_wm_window_type_normal = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_NORMAL", False);
- net_wm_window_type_splashscreen = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_SPLASHSCREEN", False);
- net_wm_window_type_toolbar = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
- net_wm_window_type_utility = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_UTILITY", False);
- net_wm_window_type = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
- net_workarea = XInternAtom(dpy, "_NET_WORKAREA", False);
- utf8_string = XInternAtom(dpy, "UTF8_STRING", False);
+ net_active_window = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", FALSE);
+ net_client_list_stacking = XInternAtom(dpy, "_NET_CLIENT_LIST_STACKING", FALSE);
+ net_client_list = XInternAtom(dpy, "_NET_CLIENT_LIST", FALSE);
+ net_close_window = XInternAtom(dpy, "_NET_CLOSE_WINDOW", FALSE);
+ net_current_desktop = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", FALSE);
+ net_desktop_geometry = XInternAtom(dpy, "_NET_DESKTOP_GEOMETRY", FALSE);
+ net_desktop_viewport = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", FALSE);
+ net_number_of_desktops = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", FALSE);
+ net_startup_id = XInternAtom(dpy, "_NET_STARTUP_ID", FALSE);
+ net_supported = XInternAtom(dpy, "_NET_SUPPORTED", FALSE);
+ net_supporting_wm_check = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", FALSE);
+ net_wm_action_change_desktop = XInternAtom(dpy, "_NET_WM_ACTION_CHANGE_DESKTOP", FALSE);
+ net_wm_action_close = XInternAtom(dpy, "_NET_WM_ACTION_CLOSE", FALSE);
+ net_wm_action_maximize_horz = XInternAtom(dpy, "_NET_WM_ACTION_MAXIMIZE_HORZ", FALSE);
+ net_wm_action_maximize_vert = XInternAtom(dpy, "_NET_WM_ACTION_MAXIMIZE_VERT", FALSE);
+ net_wm_action_move = XInternAtom(dpy, "_NET_WM_ACTION_MOVE", FALSE);
+ net_wm_action_resize = XInternAtom(dpy, "_NET_WM_ACTION_RESIZE", FALSE);
+ net_wm_action_shade = XInternAtom(dpy, "_NET_WM_ACTION_SHADE", FALSE);
+ net_wm_action_stick = XInternAtom(dpy, "_NET_WM_ACTION_STICK", FALSE);
+ net_wm_allowed_actions = XInternAtom(dpy, "_NET_WM_ALLOWED_ACTIONS", FALSE);
+ net_wm_desktop = XInternAtom(dpy, "_NET_WM_DESKTOP", FALSE);
+ net_wm_icon_geometry = XInternAtom(dpy, "_NET_WM_ICON_GEOMETRY", FALSE);
+ net_wm_icon_name = XInternAtom(dpy, "_NET_WM_ICON_NAME", FALSE);
+ net_wm_icon = XInternAtom(dpy, "_NET_WM_ICON", FALSE);
+ net_wm_moveresize = XInternAtom(dpy, "_NET_WM_MOVERESIZE", FALSE);
+ net_wm_name = XInternAtom(dpy, "_NET_WM_NAME", FALSE);
+ net_wm_state_above = XInternAtom(dpy, "_NET_WM_STATE_ABOVE", FALSE);
+ net_wm_state_below = XInternAtom(dpy, "_NET_WM_STATE_BELOW", FALSE);
+ net_wm_state_fullscreen = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", FALSE);
+ net_wm_state_hidden = XInternAtom(dpy, "_NET_WM_STATE_HIDDEN", FALSE);
+ net_wm_state_maximized_horz = XInternAtom(dpy, "_NET_WM_STATE_MAXIMIZED_HORZ", FALSE);
+ net_wm_state_maximized_vert = XInternAtom(dpy, "_NET_WM_STATE_MAXIMIZED_VERT", FALSE);
+ net_wm_state_modal = XInternAtom(dpy, "_NET_WM_STATE_MODAL", FALSE);
+ net_wm_state_shaded = XInternAtom(dpy, "_NET_WM_STATE_SHADED", FALSE);
+ net_wm_state_skip_pager = XInternAtom(dpy, "_NET_WM_STATE_SKIP_PAGER", FALSE);
+ net_wm_state_skip_taskbar = XInternAtom(dpy, "_NET_WM_STATE_SKIP_TASKBAR", FALSE);
+ net_wm_state_sticky = XInternAtom(dpy, "_NET_WM_STATE_STICKY", FALSE);
+ net_wm_state = XInternAtom(dpy, "_NET_WM_STATE", FALSE);
+ net_wm_strut = XInternAtom(dpy, "_NET_WM_STRUT", FALSE);
+ net_wm_window_type_desktop = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DESKTOP", FALSE);
+ net_wm_window_type_dialog = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", FALSE);
+ net_wm_window_type_dock = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", FALSE);
+ net_wm_window_type_menu = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_MENU", FALSE);
+ net_wm_window_type_normal = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_NORMAL", FALSE);
+ net_wm_window_type_splashscreen = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_SPLASHSCREEN", FALSE);
+ net_wm_window_type_toolbar = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", FALSE);
+ net_wm_window_type_utility = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_UTILITY", FALSE);
+ net_wm_window_type = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", FALSE);
+ net_workarea = XInternAtom(dpy, "_NET_WORKAREA", FALSE);
+ utf8_string = XInternAtom(dpy, "UTF8_STRING", FALSE);
}
void set_net_supported_hint(Display * dpy, int screen, Window check_win)
@@ -457,7 +457,7 @@ gboolean get_atom_list(Display * dpy, Window w, Atom a, Atom ** atoms_p, int *n_
*atoms_p = NULL;
*n_atoms_p = 0;
- if((XGetWindowProperty(dpy, w, a, 0, G_MAXLONG, False, XA_ATOM, &type, &format, &n_atoms, &bytes_after, (unsigned char **)&atoms) != Success) || (type == None))
+ if((XGetWindowProperty(dpy, w, a, 0, G_MAXLONG, FALSE, XA_ATOM, &type, &format, &n_atoms, &bytes_after, (unsigned char **)&atoms) != Success) || (type == None))
{
return FALSE;
}
@@ -490,7 +490,7 @@ gboolean get_cardinal_list(Display * dpy, Window w, Atom xatom, unsigned long **
*cardinals_p = NULL;
*n_cardinals_p = 0;
- if((XGetWindowProperty(dpy, w, xatom, 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &n_cardinals, &bytes_after, (unsigned char **)&cardinals) != Success) || (type == None))
+ if((XGetWindowProperty(dpy, w, xatom, 0, G_MAXLONG, FALSE, XA_CARDINAL, &type, &format, &n_cardinals, &bytes_after, (unsigned char **)&cardinals) != Success) || (type == None))
{
return FALSE;
}
@@ -590,7 +590,7 @@ gboolean get_utf8_string(Display * dpy, Window w, Atom xatom, char **str_p)
TRACE("entering get_utf8_string");
*str_p = NULL;
- if((XGetWindowProperty(dpy, w, xatom, 0, G_MAXLONG, False, utf8_string, &type, &format, &n_items, &bytes_after, (unsigned char **)&str) != Success) || (type == None))
+ if((XGetWindowProperty(dpy, w, xatom, 0, G_MAXLONG, FALSE, utf8_string, &type, &format, &n_items, &bytes_after, (unsigned char **)&str) != Success) || (type == None))
{
TRACE("no utf8_string value provided");
return FALSE;
@@ -736,7 +736,7 @@ Window getClientLeader(Display * dpy, Window window)
g_return_val_if_fail(window != None, None);
- if(XGetWindowProperty(dpy, window, wm_client_leader, 0L, 1L, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop) == Success)
+ if(XGetWindowProperty(dpy, window, wm_client_leader, 0L, 1L, FALSE, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop) == Success)
{
if((prop) && (actual_type == XA_WINDOW) && (actual_format == 32) && (nitems == 1) && (bytes_after == 0))
{
diff --git a/src/keyboard.c b/src/keyboard.c
index 73813cd73..a89c59399 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -109,19 +109,19 @@ void grabKey(Display * dpy, MyKey * key, Window w)
{
if((key->modifier == AnyModifier) || (key->modifier == 0))
{
- XGrabKey(dpy, key->keycode, key->modifier, w, False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier, w, FALSE, GrabModeAsync, GrabModeAsync);
}
else
{
/* Here we grab all combinations of well known modifiers */
- XGrabKey(dpy, key->keycode, key->modifier, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | NumLockMask, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | CapsLockMask, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask | NumLockMask, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask | CapsLockMask, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | CapsLockMask | NumLockMask, w, False, GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask | CapsLockMask | NumLockMask, w, False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | NumLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | CapsLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask | NumLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask | CapsLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | CapsLockMask | NumLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, key->keycode, key->modifier | ScrollLockMask | CapsLockMask | NumLockMask, w, FALSE, GrabModeAsync, GrabModeAsync);
}
}
}
diff --git a/src/main.c b/src/main.c
index 7f6ff78ad..7d7ee7ae2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -76,7 +76,7 @@ gboolean use_xinerama;
int xinerama_heads;
CARD32 margins[4];
CARD32 gnome_margins[4];
-int quit = False, reload = False;
+int quit = FALSE, reload = FALSE;
int shape, shape_event;
Cursor resize_cursor[7], move_cursor, busy_cursor, root_cursor;
SessionClient *client_session;
@@ -152,7 +152,7 @@ static void save_phase_2(gpointer data)
static void session_die(gpointer client_data)
{
gtk_main_quit();
- quit = True;
+ quit = TRUE;
}
static void handleSignal(int sig)
@@ -164,10 +164,10 @@ static void handleSignal(int sig)
case SIGINT:
case SIGTERM:
gtk_main_quit();
- quit = True;
+ quit = TRUE;
break;
case SIGHUP:
- reload = True;
+ reload = TRUE;
break;
case SIGSEGV:
cleanUp();
diff --git a/src/misc.c b/src/misc.c
index 615d5b517..cd423810c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -111,7 +111,7 @@ void sendClientMessage(Window w, Atom a, long x, int mask)
ev.xclient.format = 32;
ev.xclient.data.l[0] = x;
ev.xclient.data.l[1] = CurrentTime;
- XSendEvent(dpy, w, False, mask, &ev);
+ XSendEvent(dpy, w, FALSE, mask, &ev);
}
void MyXGrabServer(void)
@@ -147,7 +147,7 @@ Window setTmpEventWin(long eventmask)
XSetWindowAttributes attributes;
attributes.event_mask = eventmask;
- attributes.override_redirect = True;
+ attributes.override_redirect = TRUE;
w = XCreateWindow(dpy, root, 0, 0, XDisplayWidth(dpy, screen), XDisplayHeight(dpy, screen), 0, 0, InputOnly, CopyFromParent, CWEventMask, &attributes);
XMapRaised(dpy, w);
return (w);
diff --git a/src/parserc.c b/src/parserc.c
index 72512be27..82b2873b9 100644
--- a/src/parserc.c
+++ b/src/parserc.c
@@ -77,7 +77,7 @@ gboolean parseRc(const gchar * file, const gchar * dir, Settings rc[])
gboolean checkRc(Settings rc[])
{
gint i;
- gboolean rval = True;
+ gboolean rval = TRUE;
TRACE("entering checkRc");
--
GitLab