[Xfce4-commits] r25698 - in xfwm4/trunk: mcs-plugin src
Olivier Fourdan
olivier at xfce.org
Wed May 9 22:55:21 CEST 2007
Author: olivier
Date: 2007-05-09 20:55:21 +0000 (Wed, 09 May 2007)
New Revision: 25698
Modified:
xfwm4/trunk/mcs-plugin/margins.c
xfwm4/trunk/mcs-plugin/margins.h
xfwm4/trunk/mcs-plugin/wmtweaks_plugin.c
xfwm4/trunk/mcs-plugin/workspaces.c
xfwm4/trunk/mcs-plugin/workspaces.h
xfwm4/trunk/mcs-plugin/workspaces_plugin.c
xfwm4/trunk/mcs-plugin/workspaces_plugin.h
xfwm4/trunk/mcs-plugin/xfwm4_plugin.c
xfwm4/trunk/mcs-plugin/xfwm4_plugin.h
xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c
xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.h
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/compositor.c
xfwm4/trunk/src/compositor.h
xfwm4/trunk/src/display.c
xfwm4/trunk/src/display.h
xfwm4/trunk/src/event_filter.c
xfwm4/trunk/src/event_filter.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/events.h
xfwm4/trunk/src/focus.c
xfwm4/trunk/src/focus.h
xfwm4/trunk/src/frame.c
xfwm4/trunk/src/frame.h
xfwm4/trunk/src/hints.c
xfwm4/trunk/src/hints.h
xfwm4/trunk/src/icons.c
xfwm4/trunk/src/icons.h
xfwm4/trunk/src/keyboard.c
xfwm4/trunk/src/keyboard.h
xfwm4/trunk/src/main.c
xfwm4/trunk/src/menu.c
xfwm4/trunk/src/menu.h
xfwm4/trunk/src/misc.c
xfwm4/trunk/src/misc.h
xfwm4/trunk/src/mypixmap.c
xfwm4/trunk/src/mypixmap.h
xfwm4/trunk/src/mywindow.c
xfwm4/trunk/src/mywindow.h
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/netwm.h
xfwm4/trunk/src/parserc.c
xfwm4/trunk/src/parserc.h
xfwm4/trunk/src/placement.c
xfwm4/trunk/src/placement.h
xfwm4/trunk/src/poswin.c
xfwm4/trunk/src/poswin.h
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/screen.h
xfwm4/trunk/src/session.c
xfwm4/trunk/src/session.h
xfwm4/trunk/src/settings.c
xfwm4/trunk/src/settings.h
xfwm4/trunk/src/spinning_cursor.c
xfwm4/trunk/src/spinning_cursor.h
xfwm4/trunk/src/stacking.c
xfwm4/trunk/src/stacking.h
xfwm4/trunk/src/startup_notification.c
xfwm4/trunk/src/startup_notification.h
xfwm4/trunk/src/tabwin.c
xfwm4/trunk/src/tabwin.h
xfwm4/trunk/src/transients.c
xfwm4/trunk/src/transients.h
xfwm4/trunk/src/ui_style.c
xfwm4/trunk/src/ui_style.h
xfwm4/trunk/src/wireframe.c
xfwm4/trunk/src/wireframe.h
xfwm4/trunk/src/workspaces.c
xfwm4/trunk/src/workspaces.h
Log:
Cleanup
Modified: xfwm4/trunk/mcs-plugin/margins.c
===================================================================
--- xfwm4/trunk/mcs-plugin/margins.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/margins.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,25 +1,25 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
Copyright (C) 2002-2006 Jasper Huijsmans (huysmans at users.sourceforge.net)
Olivier Fourdan (fourdan at xfce.org)
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifdef GDK_MULTIHEAD_SAFE
Modified: xfwm4/trunk/mcs-plugin/margins.h
===================================================================
--- xfwm4/trunk/mcs-plugin/margins.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/margins.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,29 +1,33 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
Copyright (C) 2002-2006 Jasper Huijsmans (huysmans at users.sourceforge.net)
Olivier Fourdan (fourdan at xfce.org)
*/
-#ifndef __MARGINS_H
-#define __MARGINS_H
+#ifndef INC_MARGINS_H
+#define INC_MARGINS_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
void create_margins_channel (McsPlugin * mcs_plugin);
void add_margins_page (GtkBox *box);
-#endif /* __MARGINS_H */
+#endif /* INC_MARGINS_H */
Modified: xfwm4/trunk/mcs-plugin/wmtweaks_plugin.c
===================================================================
--- xfwm4/trunk/mcs-plugin/wmtweaks_plugin.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/wmtweaks_plugin.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,24 +1,24 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
xfce4 mcs plugin - (c) 2005-2006 Olivier Fourdan
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <string.h>
@@ -93,7 +93,7 @@
static char *placement_mode = "center";
-/*
+/*
"Xfwm/ActivateAction"
"Xfwm/BorderlessMaximize"
"Xfwm/CycleHidden"
@@ -353,7 +353,7 @@
}
static GtkWidget *
-create_string_radio_button (McsPlugin * mcs_plugin, const ValuePair values[],
+create_string_radio_button (McsPlugin * mcs_plugin, const ValuePair values[],
const gchar * label, gchar * setting_name, gchar ** value)
{
GtkWidget *vbox1, *vbox2;
@@ -456,7 +456,7 @@
GtkWidget *button;
guint nth = 0;
- static const gchar *const modifier_list[] = {
+ static const gchar *const modifier_list[] = {
"Alt",
"Control",
"Hyper",
@@ -549,8 +549,8 @@
gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, TRUE, 0);
gtk_widget_show (check_button);
- radio_buttons =
- create_string_radio_button (mcs_plugin, activate_list, _("When a window raises itself:"),
+ radio_buttons =
+ create_string_radio_button (mcs_plugin, activate_list, _("When a window raises itself:"),
"Xfwm/ActivateAction", &activate_action);
gtk_box_pack_start (GTK_BOX (vbox), radio_buttons, FALSE, TRUE, 0);
gtk_widget_show (radio_buttons);
@@ -654,8 +654,8 @@
gtk_box_pack_start (GTK_BOX (vbox), range, FALSE, TRUE, 0);
gtk_widget_show (range);
- radio_buttons =
- create_string_radio_button (mcs_plugin, placement_list, _("Default positionning of windows without smart placement:"),
+ radio_buttons =
+ create_string_radio_button (mcs_plugin, placement_list, _("Default positionning of windows without smart placement:"),
"Xfwm/PlacementMode", &placement_mode);
gtk_box_pack_start (GTK_BOX (vbox), radio_buttons, FALSE, TRUE, 0);
gtk_widget_show (radio_buttons);
Modified: xfwm4/trunk/mcs-plugin/workspaces.c
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/workspaces.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,24 +1,24 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
Copyright (C) 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifdef HAVE_MEMORY_H
Modified: xfwm4/trunk/mcs-plugin/workspaces.h
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/workspaces.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,28 +1,32 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
Copyright (C) 2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
*/
-#ifndef __WORKSPACES_H
-#define __WORKSPACES_H
+#ifndef INC_WORKSPACES_H
+#define INC_WORKSPACES_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
void create_workspaces_channel (McsPlugin * mcs_plugin);
void add_workspaces_page (GtkBox *box);
-#endif /* __WORKSPACES_H */
+#endif /* INC_WORKSPACES_H */
Modified: xfwm4/trunk/mcs-plugin/workspaces_plugin.c
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces_plugin.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/workspaces_plugin.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,23 +1,23 @@
-/*
+/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
Copyright (C) 2002 Jasper Huijsmans (huysmans at users.sourceforge.net)
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifdef GDK_MULTIHEAD_SAFE
@@ -96,7 +96,7 @@
McsPluginInitResult
mcs_plugin_init (McsPlugin * mcs_plugin)
{
- /*
+ /*
This is required for UTF-8 at least - Please don't remove it
And it needs to be done here for the label to be properly
localized....
Modified: xfwm4/trunk/mcs-plugin/workspaces_plugin.h
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces_plugin.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/workspaces_plugin.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,24 +1,28 @@
-/*
+/*
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
Copyright (C) 2002 Jasper Huijsmans (huysmans at users.sourceforge.net)
*/
-#ifndef __PLUGIN_H__
-#define __PLUGIN_H__
+#ifndef INC_PLUGIN_H
+#define INC_PLUGIN_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define RCFILE1 "workspaces.xml"
#define RCFILE2 "margins.xml"
#define PLUGIN_NAME "workspaces"
@@ -33,4 +37,4 @@
gboolean ws_save_channel (McsManager * manager, const char *channel,
const char *rcfile);
-#endif /* __PLUGIN_H */
+#endif /* INC_PLUGIN_H */
Modified: xfwm4/trunk/mcs-plugin/xfwm4_plugin.c
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_plugin.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/xfwm4_plugin.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,25 +1,25 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
xfce4 mcs plugin - (c) 2002-2006 Olivier Fourdan
Buttons DnD inspired by Michael Terry's implementation for xpad
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <string.h>
@@ -415,14 +415,14 @@
GtkWidget *title;
gchar *sem;
- /*
- * 1) Block redraw on boxes
+ /*
+ * 1) Block redraw on boxes
*/
gtk_widget_set_app_paintable (layout, FALSE);
gtk_widget_set_app_paintable (hidden, FALSE);
- /*
- * 2) Send all buttons but the title back to the hidden frame
+ /*
+ * 2) Send all buttons but the title back to the hidden frame
*/
children = gtk_container_get_children (GTK_CONTAINER (layout));
title = NULL;
@@ -449,7 +449,7 @@
}
g_list_free (children);
- /*
+ /*
* 3) Move choosen buttons to the layout box in correct order
*/
children = gtk_container_get_children (GTK_CONTAINER (hidden));
@@ -488,8 +488,8 @@
}
g_list_free (children);
- /*
- * 4) Unblock redraw on boxes
+ /*
+ * 4) Unblock redraw on boxes
*/
gtk_widget_set_app_paintable (layout, TRUE);
gtk_widget_set_app_paintable (hidden, TRUE);
@@ -1144,7 +1144,7 @@
click_to_focus = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (itf->click_focus_radio));
gtk_widget_set_sensitive (itf->focus_delay_scale, !click_to_focus);
-
+
mcs_manager_set_int (mcs_plugin->manager, "Xfwm/ClickToFocus", CHANNEL1,
click_to_focus ? 1 : 0);
mcs_manager_notify (mcs_plugin->manager, CHANNEL1);
@@ -1637,19 +1637,19 @@
gtk_radio_button_get_group (GTK_RADIO_BUTTON (dialog->focus_follow_mouse_radio));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->focus_follow_mouse_radio),
!click_to_focus);
-
+
vbox = gtk_vbox_new (FALSE, BORDER);
gtk_widget_show (vbox);
-
+
frame = xfce_create_framebox_with_content (_("Delay before window receives focus"), vbox);
gtk_widget_show (frame);
gtk_box_pack_start (GTK_BOX (vbox_page), frame, TRUE, TRUE, 0);
-
+
table = gtk_table_new (1, 3, FALSE);
gtk_widget_show (table);
gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (table), BORDER);
-
+
label = xfce_create_small_label (_("Slow"));
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL),
@@ -1676,7 +1676,7 @@
gtk_range_set_update_policy (GTK_RANGE (dialog->focus_delay_scale), GTK_UPDATE_DISCONTINUOUS);
gtk_range_set_inverted (GTK_RANGE (dialog->focus_delay_scale), TRUE);
gtk_widget_set_sensitive (dialog->focus_delay_scale, !click_to_focus);
-
+
dialog->focus_new_check =
create_check_button_with_mnemonic (_("Automatically give focus to newly created windows"));
gtk_widget_show (dialog->focus_new_check);
@@ -2212,7 +2212,7 @@
focus_delay = 0;
mcs_manager_set_int (mcs_plugin->manager, "Xfwm/FocusDelay", CHANNEL1, raise_delay);
}
-
+
setting = mcs_manager_setting_lookup (mcs_plugin->manager, "Xfwm/RaiseOnClick", CHANNEL1);
if (setting)
{
@@ -2338,8 +2338,8 @@
dbl_click_action);
}
- /*
- * Second separate channel for keytheme (used as a raw channel from the client)
+ /*
+ * Second separate channel for keytheme (used as a raw channel from the client)
*/
path = g_build_filename ("xfce4", RCDIR, RCFILE2, NULL);
Modified: xfwm4/trunk/mcs-plugin/xfwm4_plugin.h
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_plugin.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/xfwm4_plugin.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,26 +1,30 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
xfce4 mcs plugin - (c) 2005-2006 Olivier Fourdan
-
+
*/
-#ifndef __XFWM4_PLUGIN_H
-#define __XFWM4_PLUGIN_H
+#ifndef INC_XFWM4_PLUGIN_H
+#define INC_XFWM4_PLUGIN_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define RCDIR "mcs_settings"
#define OLDRCDIR "settings"
#define RCFILE1 "xfwm4.xml"
@@ -137,4 +141,5 @@
void xfwm4_plugin_theme_info_free (ThemeInfo *);
ThemeInfo *xfwm4_plugin_find_theme_info_by_name (const gchar *, GList *);
GList *xfwm4_plugin_read_themes (GList *, GtkWidget *, GtkWidget *, ThemeType, gchar *);
-#endif
+
+#endif /* INC_XFWM4_PLUGIN_H */
Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <string.h>
Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.h
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -1,25 +1,29 @@
/* $Id$
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+
shortcut editor - Copyright (C) 2004 Jean-Francois Wauthy
*/
-#ifndef __XFWM4_SHORTCUTEDITOR_H
-#define __XFWM4_SHORTCUTEDITOR_H
+#ifndef INC_XFWM4_SHORTCUTEDITOR_H
+#define INC_XFWM4_SHORTCUTEDITOR_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
void cb_popup_add_menu (GtkWidget *, gpointer);
void cb_popup_del_menu (GtkWidget *, gpointer);
gboolean cb_popup_menu (GtkTreeView *, GdkEventButton *, gpointer);
@@ -28,4 +32,4 @@
void cb_activate_treeview3 (GtkWidget *, GtkTreePath *,
GtkTreeViewColumn *, gpointer);
-#endif
+#endif /* INC_XFWM4_SHORTCUTEDITOR_H */
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/client.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/X.h>
@@ -121,7 +121,7 @@
};
/* Forward decl */
-static void
+static void
clientUpdateIconPix (Client * c);
Display *
@@ -348,8 +348,8 @@
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE))
{
c->blink_timeout_id =
- g_timeout_add_full (G_PRIORITY_DEFAULT,
- CLIENT_BLINK_TIMEOUT,
+ g_timeout_add_full (G_PRIORITY_DEFAULT,
+ CLIENT_BLINK_TIMEOUT,
(GtkFunction) urgent_cb,
(gpointer) c, NULL);
}
@@ -1166,11 +1166,11 @@
values.events = True;
c->xsync_alarm = XSyncCreateAlarm (display_info->dpy,
- XSyncCACounter |
- XSyncCADelta |
- XSyncCAEvents |
- XSyncCATestType |
- XSyncCAValue |
+ XSyncCACounter |
+ XSyncCADelta |
+ XSyncCAEvents |
+ XSyncCATestType |
+ XSyncCAValue |
XSyncCAValueType,
&values);
return (c->xsync_alarm != None);
@@ -1241,9 +1241,9 @@
TRACE ("entering clientXSyncResetTimeout");
clientXSyncClearTimeout (c);
- c->xsync_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT,
- CLIENT_XSYNC_TIMEOUT,
- (GtkFunction) clientXSyncTimeout,
+ c->xsync_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT,
+ CLIENT_XSYNC_TIMEOUT,
+ (GtkFunction) clientXSyncTimeout,
(gpointer) c, NULL);
}
@@ -1621,7 +1621,7 @@
update_icon_idle_cb (gpointer data)
{
Client *c;
-
+
TRACE ("entering update_icon_idle_cb");
c = (Client *) data;
@@ -1646,7 +1646,7 @@
if (c->icon_timeout_id == 0)
{
- c->icon_timeout_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+ c->icon_timeout_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
update_icon_idle_cb, c, NULL);
}
}
@@ -1912,7 +1912,7 @@
}
}
- /*
+ /*
Initialize "old" fields once the position is ensured, to avoid
initially maximized or fullscreen windows being placed offscreen
once de-maximized
@@ -2574,7 +2574,7 @@
for (index = screen_info->windows_stack; index; index = g_list_next (index))
{
Client *c = (Client *) index->data;
- if ((c->type & WINDOW_REGULAR_FOCUSABLE)
+ if ((c->type & WINDOW_REGULAR_FOCUSABLE)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED | CLIENT_FLAG_SKIP_TASKBAR))
{
FLAG_SET (c->xfwm_flags, XFWM_FLAG_WAS_SHOWN);
@@ -2627,7 +2627,7 @@
}
else
{
- TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -2763,7 +2763,7 @@
wc.y = c->y;
mask |= (CWX | CWY);
}
-
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE))
{
c->ignore_unmap++;
@@ -2977,7 +2977,8 @@
TRACE ("entering clientToggleAbove");
TRACE ("toggle above client \"%s\" (0x%lx)", c->name, c->window);
- if (!FLAG_TEST (c->flags, CLIENT_FLAG_BELOW))
+ if (!clientIsValidTransientOrModal (c) &&
+ !FLAG_TEST (c->flags, CLIENT_FLAG_BELOW | CLIENT_FLAG_FULLSCREEN))
{
FLAG_TOGGLE (c->flags, CLIENT_FLAG_ABOVE);
clientUpdateAboveState (c);
@@ -4048,7 +4049,7 @@
g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
g2 = myScreenGrabPointer (screen_info, ButtonMotionMask | ButtonReleaseMask,
- myDisplayGetCursorMove (display_info),
+ myDisplayGetCursorMove (display_info),
myDisplayGetCurrentTime (display_info));
if (!g1 || !g2)
{
@@ -4454,7 +4455,7 @@
|| (!clientCkeckTitle (c) && (frame_y < screen_info->margins [STRUTS_TOP])))
{
temp = c->y + c->height;
- c->y = CLAMP (c->y, screen_info->margins [STRUTS_TOP] + frame_top,
+ c->y = CLAMP (c->y, screen_info->margins [STRUTS_TOP] + frame_top,
MAX (disp_max_y - min_visible, screen_info->height - screen_info->margins [STRUTS_BOTTOM] - min_visible));
clientSetHeight (c, temp - c->y);
c->y = temp - c->height;
Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/client.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <stdlib.h>
@@ -52,7 +52,7 @@
#ifndef INC_CLIENT_H
#define INC_CLIENT_H
-#define APPLY 1
+#define APPLY +1
#define REMOVE -1
#define PLACEMENT_MOUSE 0
@@ -303,48 +303,48 @@
Display *clientGetXDisplay (Client *);
void clientClearLastOpTime (Client *);
-void clientUpdateWinState (Client *,
+void clientUpdateWinState (Client *,
XClientMessageEvent *);
void clientUpdateUrgency (Client *);
-void clientCoordGravitate (Client *,
- int,
- int *,
+void clientCoordGravitate (Client *,
+ int,
+ int *,
int *);
-void clientGravitate (Client *,
+void clientGravitate (Client *,
int);
-void clientConfigure (Client *,
- XWindowChanges *,
- unsigned long,
- unsigned short);
-void clientGetMWMHints (Client *,
+void clientConfigure (Client *,
+ XWindowChanges *,
+ unsigned long,
+ unsigned short);
+void clientGetMWMHints (Client *,
gboolean);
-void clientGetWMNormalHints (Client *,
+void clientGetWMNormalHints (Client *,
gboolean);
void clientGetWMProtocols (Client *);
void clientUpdateIcon (Client * c);
-Client *clientFrame (DisplayInfo *,
- Window,
+Client *clientFrame (DisplayInfo *,
+ Window,
gboolean);
-void clientUnframe (Client *,
+void clientUnframe (Client *,
gboolean);
void clientFrameAll (ScreenInfo *);
void clientUnframeAll (ScreenInfo *);
void clientInstallColormaps (Client *);
void clientUpdateColormaps (Client *);
void clientUpdateName (Client *);
-void clientUpdateAllFrames (ScreenInfo *,
+void clientUpdateAllFrames (ScreenInfo *,
gboolean);
void clientGrabButtons (Client *);
void clientUngrabButtons (Client *);
-Client *clientGetFromWindow (ScreenInfo *,
- Window,
+Client *clientGetFromWindow (ScreenInfo *,
+ Window,
int);
-void clientShow (Client *,
+void clientShow (Client *,
gboolean);
-void clientHide (Client *,
- int,
+void clientHide (Client *,
+ int,
gboolean);
-void clientHideAll (Client *,
+void clientHideAll (Client *,
int);
void clientClearAllShowDesktop (ScreenInfo *);
void clientToggleShowDesktop (ScreenInfo *);
@@ -353,44 +353,44 @@
void clientClose (Client *);
void clientKill (Client *);
void clientEnterContextMenuState (Client *);
-void clientSetLayer (Client *,
+void clientSetLayer (Client *,
int);
-void clientSetWorkspace (Client *,
- int,
+void clientSetWorkspace (Client *,
+ int,
gboolean);
void clientShade (Client *);
void clientUnshade (Client *);
void clientToggleShaded (Client *);
-void clientStick (Client *,
+void clientStick (Client *,
gboolean);
-void clientUnstick (Client *,
+void clientUnstick (Client *,
gboolean);
-void clientToggleSticky (Client *,
+void clientToggleSticky (Client *,
gboolean);
void clientToggleFullscreen (Client *);
void clientToggleAbove (Client *);
void clientToggleBelow (Client *);
void clientRemoveMaximizeFlag (Client *);
-void clientToggleMaximized (Client *,
- int,
+void clientToggleMaximized (Client *,
+ int,
gboolean);
-void clientUpdateOpacity (ScreenInfo *,
+void clientUpdateOpacity (ScreenInfo *,
Client *);
-void clientSetOpacity (Client *,
- guint,
+void clientSetOpacity (Client *,
+ guint,
guint, guint);
void clientIncOpacity (Client *);
void clientDecOpacity (Client *);
void clientScreenResize (ScreenInfo *);
-void clientMove (Client *,
+void clientMove (Client *,
XEvent *);
-void clientResize (Client *,
- int,
+void clientResize (Client *,
+ int,
XEvent *);
-void clientCycle (Client *,
+void clientCycle (Client *,
XEvent *);
-void clientButtonPress (Client *,
- Window,
+void clientButtonPress (Client *,
+ Window,
XButtonEvent *);
Client *clientGetLeader (Client *);
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
Modified: xfwm4/trunk/src/compositor.c
===================================================================
--- xfwm4/trunk/src/compositor.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/compositor.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -21,7 +21,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -1131,11 +1131,11 @@
* screen_info->params->frame_opacity
/ (NET_WM_OPAQUE * 100.0);
- cw->alphaBorderPict = solid_picture (screen_info,
- FALSE,
- frame_opacity,
- 0.0, /* red */
- 0.0, /* green */
+ cw->alphaBorderPict = solid_picture (screen_info,
+ FALSE,
+ frame_opacity,
+ 0.0, /* red */
+ 0.0, /* green */
0.0 /* blue */);
}
@@ -1362,9 +1362,9 @@
if ((cw->opacity != NET_WM_OPAQUE) && !(cw->alphaPict))
{
cw->alphaPict = solid_picture (screen_info, FALSE,
- (double) cw->opacity / NET_WM_OPAQUE,
- 0.0, /* red */
- 0.0, /* green */
+ (double) cw->opacity / NET_WM_OPAQUE,
+ 0.0, /* red */
+ 0.0, /* green */
0.0 /* blue */);
}
XFixesIntersectRegion (dpy, cw->borderClip, cw->borderClip, cw->borderSize);
@@ -2814,11 +2814,11 @@
presum_gaussian (screen_info);
screen_info->rootBuffer = None;
/* Change following argb values to play with shadow colors */
- screen_info->blackPicture = solid_picture (screen_info,
- TRUE,
- 1.0, /* alpha */
- 0.0, /* red */
- 0.0, /* green */
+ screen_info->blackPicture = solid_picture (screen_info,
+ TRUE,
+ 1.0, /* alpha */
+ 0.0, /* red */
+ 0.0, /* green */
0.0 /* blue */);
screen_info->rootTile = None;
screen_info->allDamage = None;
Modified: xfwm4/trunk/src/compositor.h
===================================================================
--- xfwm4/trunk/src/compositor.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/compositor.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_COMPOSITOR_H
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/display.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -61,7 +61,7 @@
char buf[64];
XGetErrorText (dpy, err->error_code, buf, 63);
- g_print ("XError: %s\n", buf);
+ g_print ("XError: %s\n", buf);
g_print ("==> XID 0x%lx, Request %d, Error %d <==\n",
err->resourceid, err->request_code, err->error_code);
#endif
@@ -225,18 +225,18 @@
#ifdef HAVE_XSYNC
display->have_xsync = FALSE;
-
+
display->xsync_error_base = 0;
display->xsync_event_base = 0;
major = SYNC_MAJOR_VERSION;
minor = SYNC_MINOR_VERSION;
-
+
if (XSyncQueryExtension (display->dpy,
&display->xsync_event_base,
&display->xsync_error_base)
- && XSyncInitialize (display->dpy,
- &major,
+ && XSyncInitialize (display->dpy,
+ &major,
&minor))
{
display->have_xsync = TRUE;
@@ -637,7 +637,7 @@
g_return_val_if_fail (alarm != None, NULL);
g_return_val_if_fail (display != NULL, NULL);
-
+
for (index = display->clients; index; index = g_slist_next (index))
{
Client *c = (Client *) index->data;
Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/display.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -22,7 +22,7 @@
#define INC_DISPLAY_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -330,7 +330,7 @@
Time myDisplayUpdateCurrentTime (DisplayInfo *,
XEvent *);
Time myDisplayGetCurrentTime (DisplayInfo *);
-Time myDisplayGetTime (DisplayInfo *,
+Time myDisplayGetTime (DisplayInfo *,
Time);
Time myDisplayGetLastUserTime (DisplayInfo *);
void myDisplaySetLastUserTime (DisplayInfo *,
Modified: xfwm4/trunk/src/event_filter.c
===================================================================
--- xfwm4/trunk/src/event_filter.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/event_filter.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <gtk/gtk.h>
Modified: xfwm4/trunk/src/event_filter.h
===================================================================
--- xfwm4/trunk/src/event_filter.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/event_filter.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,9 +18,13 @@
*/
-#ifndef __EVENT_FILTER_H__
-#define __EVENT_FILTER_H__
+#ifndef INC_EVENT_FILTER_H
+#define INC_EVENT_FILTER_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <X11/Xlib.h>
@@ -59,4 +63,4 @@
eventFilterSetup *eventFilterInit (gpointer);
void eventFilterClose (eventFilterSetup *);
-#endif /* __EVENT_FILTER_H__ */
+#endif /* INC_EVENT_FILTER_H */
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/events.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <string.h>
Modified: xfwm4/trunk/src/events.h
===================================================================
--- xfwm4/trunk/src/events.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/events.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_EVENTS_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -36,7 +36,7 @@
#include "event_filter.h"
void initMenuEventWin (void);
-eventFilterStatus xfwm4_event_filter (XEvent *,
+eventFilterStatus xfwm4_event_filter (XEvent *,
gpointer);
void initGtkCallbacks (ScreenInfo *);
Modified: xfwm4/trunk/src/focus.c
===================================================================
--- xfwm4/trunk/src/focus.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/focus.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/X.h>
@@ -456,7 +456,7 @@
}
if (FLAG_TEST(c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
{
- TRACE ("Un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("Un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -511,7 +511,7 @@
user_focus = c;
if (FLAG_TEST(c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
{
- TRACE ("Un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("Un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -797,9 +797,9 @@
screen_info = c->screen_info;
delayed_focus = c;
- focus_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
- screen_info->params->focus_delay,
- (GSourceFunc) delayed_focus_cb,
+ focus_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
+ screen_info->params->focus_delay,
+ (GSourceFunc) delayed_focus_cb,
NULL, NULL);
}
Modified: xfwm4/trunk/src/focus.h
===================================================================
--- xfwm4/trunk/src/focus.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/focus.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -22,7 +22,7 @@
#define INC_FOCUS_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -37,28 +37,28 @@
#define FOCUS_IGNORE_MODAL (1<<1)
#define FOCUS_FORCE (1<<2)
-void clientFocusTop (ScreenInfo *,
+void clientFocusTop (ScreenInfo *,
int,
Time);
gboolean clientFocusNew (Client *);
-gboolean clientSelectMask (Client *,
- int,
+gboolean clientSelectMask (Client *,
+ int,
int);
-Client *clientGetNext (Client *,
+Client *clientGetNext (Client *,
int);
-Client *clientGetPrevious (Client *,
+Client *clientGetPrevious (Client *,
int);
-void clientPassFocus (ScreenInfo *,
- Client *,
+void clientPassFocus (ScreenInfo *,
+ Client *,
Client *);
gboolean clientAcceptFocus (Client *);
void clientSortRing (Client *);
-void clientUpdateFocus (ScreenInfo *,
- Client *,
+void clientUpdateFocus (ScreenInfo *,
+ Client *,
unsigned short);
-void clientSetFocus (ScreenInfo *,
- Client *,
- Time,
+void clientSetFocus (ScreenInfo *,
+ Client *,
+ Time,
unsigned short);
void clientInitFocusFlag (Client *);
Client *clientGetFocus (void);
@@ -77,6 +77,4 @@
void clientAddDelayedFocus (Client *);
Client *clientGetDelayedFocus (void);
-
-
#endif /* INC_FOCUS_H */
Modified: xfwm4/trunk/src/frame.c
===================================================================
--- xfwm4/trunk/src/frame.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/frame.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <glib.h>
@@ -1153,7 +1153,7 @@
update_frame_idle_cb (gpointer data)
{
Client *c;
-
+
TRACE ("entering update_frame_idle_cb");
c = (Client *) data;
@@ -1188,7 +1188,7 @@
if (c->frame_timeout_id == 0)
{
- c->frame_timeout_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+ c->frame_timeout_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
update_frame_idle_cb, c, NULL);
}
}
Modified: xfwm4/trunk/src/frame.h
===================================================================
--- xfwm4/trunk/src/frame.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/frame.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_FRAME_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include "screen.h"
@@ -49,10 +49,9 @@
int frameY (Client *);
int frameWidth (Client *);
int frameHeight (Client *);
-void frameDraw (Client *,
+void frameDraw (Client *,
gboolean);
void frameClearQueueDraw (Client *);
void frameQueueDraw (Client *);
-
#endif /* INC_FRAME_H */
Modified: xfwm4/trunk/src/hints.c
===================================================================
--- xfwm4/trunk/src/hints.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/hints.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -21,7 +21,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/X.h>
@@ -1206,7 +1206,7 @@
g_return_val_if_fail (screen_info, (Time) CurrentTime);
TRACE ("getXServerTime: Using X server roundtrip");
- XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
+ XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
display_info->atoms[XFWM4_TIMESTAMP_PROP],
display_info->atoms[XFWM4_TIMESTAMP_PROP],
8, PropModeReplace, (unsigned char *) &c, 1);
Modified: xfwm4/trunk/src/hints.h
===================================================================
--- xfwm4/trunk/src/hints.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/hints.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -24,7 +24,7 @@
#define INC_HINTS_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -149,150 +149,150 @@
}
PropMwmHints;
-unsigned long getWMState (DisplayInfo *,
+unsigned long getWMState (DisplayInfo *,
Window);
-void setWMState (DisplayInfo *,
- Window,
+void setWMState (DisplayInfo *,
+ Window,
unsigned long);
-PropMwmHints *getMotifHints (DisplayInfo *,
+PropMwmHints *getMotifHints (DisplayInfo *,
Window);
-unsigned int getWMProtocols (DisplayInfo *,
+unsigned int getWMProtocols (DisplayInfo *,
Window);
-gboolean getHint (DisplayInfo *,
- Window,
- int,
+gboolean getHint (DisplayInfo *,
+ Window,
+ int,
long *);
-void setHint (DisplayInfo *,
- Window,
- int,
+void setHint (DisplayInfo *,
+ Window,
+ int,
long);
-void getDesktopLayout (DisplayInfo *,
- Window,
- int,
+void getDesktopLayout (DisplayInfo *,
+ Window,
+ int,
NetWmDesktopLayout *);
-void getGnomeDesktopMargins (DisplayInfo *,
- Window,
+void getGnomeDesktopMargins (DisplayInfo *,
+ Window,
int *);
-void setGnomeProtocols (DisplayInfo *,
- Window,
+void setGnomeProtocols (DisplayInfo *,
+ Window,
Window);
-void setNetSupportedHint (DisplayInfo *,
- Window,
+void setNetSupportedHint (DisplayInfo *,
+ Window,
Window);
-gboolean getAtomList (DisplayInfo *,
- Window,
- int,
- Atom **,
+gboolean getAtomList (DisplayInfo *,
+ Window,
+ int,
+ Atom **,
int *);
-gboolean getCardinalList (DisplayInfo *,
- Window,
- int,
- unsigned long **,
+gboolean getCardinalList (DisplayInfo *,
+ Window,
+ int,
+ unsigned long **,
int *);
-void setNetWorkarea (DisplayInfo *,
- Window,
- int,
- int,
- int,
+void setNetWorkarea (DisplayInfo *,
+ Window,
+ int,
+ int,
+ int,
int *);
-void setNetFrameExtents (DisplayInfo *,
- Window,
- int,
- int,
- int,
+void setNetFrameExtents (DisplayInfo *,
+ Window,
+ int,
+ int,
+ int,
int);
-void initNetDesktopInfo (DisplayInfo *,
- Window,
- int,
- int,
+void initNetDesktopInfo (DisplayInfo *,
+ Window,
+ int,
+ int,
int);
-void setUTF8StringHint (DisplayInfo *,
- Window,
- int,
+void setUTF8StringHint (DisplayInfo *,
+ Window,
+ int,
const gchar *);
-void getTransientFor (DisplayInfo *,
- Window,
- Window,
+void getTransientFor (DisplayInfo *,
+ Window,
+ Window,
Window *);
-gboolean getWindowName (DisplayInfo *,
- Window,
+gboolean getWindowName (DisplayInfo *,
+ Window,
gchar **);
-gboolean getUTF8String (DisplayInfo *,
- Window,
- int,
- gchar **,
+gboolean getUTF8String (DisplayInfo *,
+ Window,
+ int,
+ gchar **,
int *);
-gboolean getUTF8StringList (DisplayInfo *,
- Window,
- int,
- gchar ***,
+gboolean getUTF8StringList (DisplayInfo *,
+ Window,
+ int,
+ gchar ***,
int *);
-gboolean getClientMachine (DisplayInfo *,
- Window,
+gboolean getClientMachine (DisplayInfo *,
+ Window,
gchar **);
-gboolean getClientMachine (DisplayInfo *,
- Window,
+gboolean getClientMachine (DisplayInfo *,
+ Window,
gchar **);
-gboolean getWindowRole (DisplayInfo *,
- Window,
+gboolean getWindowRole (DisplayInfo *,
+ Window,
gchar **);
-Window getClientLeader (DisplayInfo *,
+Window getClientLeader (DisplayInfo *,
Window);
-gboolean getNetWMUserTime (DisplayInfo *,
- Window,
+gboolean getNetWMUserTime (DisplayInfo *,
+ Window,
Time *);
-gboolean getClientID (DisplayInfo *,
- Window,
+gboolean getClientID (DisplayInfo *,
+ Window,
gchar **);
-gboolean getWindowCommand (DisplayInfo *,
- Window,
- char ***,
+gboolean getWindowCommand (DisplayInfo *,
+ Window,
+ char ***,
int *);
-gboolean getKDEIcon (DisplayInfo *,
- Window,
- Pixmap *,
+gboolean getKDEIcon (DisplayInfo *,
+ Window,
+ Pixmap *,
Pixmap *);
-gboolean getRGBIconData (DisplayInfo *,
- Window,
- unsigned long **,
+gboolean getRGBIconData (DisplayInfo *,
+ Window,
+ unsigned long **,
unsigned long *);
-gboolean getOpacity (DisplayInfo *,
- Window,
+gboolean getOpacity (DisplayInfo *,
+ Window,
guint *);
-gboolean getOpacityLock (DisplayInfo *,
+gboolean getOpacityLock (DisplayInfo *,
Window);
-gboolean setXAtomManagerOwner (DisplayInfo *,
- Atom,
- Window,
+gboolean setXAtomManagerOwner (DisplayInfo *,
+ Atom,
+ Window,
Window);
-gboolean setAtomIdManagerOwner (DisplayInfo *,
- int,
- Window ,
+gboolean setAtomIdManagerOwner (DisplayInfo *,
+ int,
+ Window ,
Window);
Time getXServerTime (DisplayInfo *);
#ifdef ENABLE_KDE_SYSTRAY_PROXY
-gboolean checkKdeSystrayWindow (DisplayInfo *,
+gboolean checkKdeSystrayWindow (DisplayInfo *,
Window);
-void sendSystrayReqDock (DisplayInfo *,
- Window,
+void sendSystrayReqDock (DisplayInfo *,
+ Window,
Window);
-Window getSystrayWindow (DisplayInfo *,
+Window getSystrayWindow (DisplayInfo *,
Atom);
#endif
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
-gboolean getWindowStartupId (DisplayInfo *,
- Window,
+gboolean getWindowStartupId (DisplayInfo *,
+ Window,
char **);
#endif
#ifdef HAVE_XSYNC
-gboolean getXSyncCounter (DisplayInfo *,
- Window,
+gboolean getXSyncCounter (DisplayInfo *,
+ Window,
XSyncCounter *);
-void sendXSyncRequest (DisplayInfo *,
- Window,
+void sendXSyncRequest (DisplayInfo *,
+ Window,
XSyncValue);
#endif /* HAVE_XSYNC */
Modified: xfwm4/trunk/src/icons.c
===================================================================
--- xfwm4/trunk/src/icons.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/icons.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/icons.h
===================================================================
--- xfwm4/trunk/src/icons.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/icons.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,13 +19,13 @@
xfwm4 - (c) 2002-2006 Olivier Fourdan
*/
+#ifndef INC_ICONS_H
+#define INC_ICONS_H
+
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
-#ifndef INC_ICONS_H
-#define INC_ICONS_H
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
Modified: xfwm4/trunk/src/keyboard.c
===================================================================
--- xfwm4/trunk/src/keyboard.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/keyboard.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -165,42 +165,42 @@
{
if (key->modifier == 0)
{
- status |=
+ status |=
XGrabKey (dpy, key->keycode, AnyModifier, w, FALSE,
GrabModeAsync, GrabModeSync);
}
else
{
/* Here we grab all combinations of well known modifiers */
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier, w, FALSE,
GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | ScrollLockMask, w,
FALSE, GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | NumLockMask, w,
FALSE, GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | LockMask, w,
FALSE, GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | ScrollLockMask | NumLockMask, w, FALSE,
GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | ScrollLockMask | LockMask, w, FALSE,
GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | LockMask | NumLockMask, w, FALSE,
GrabModeAsync, GrabModeSync);
- status |=
+ status |=
XGrabKey (dpy, key->keycode,
key->modifier | ScrollLockMask | LockMask | NumLockMask,
w, FALSE, GrabModeAsync, GrabModeSync);
@@ -228,7 +228,7 @@
status=GrabSuccess;
if (modifier == AnyModifier)
{
- status |=
+ status |=
XGrabButton (dpy, button, AnyModifier, w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
@@ -236,41 +236,41 @@
else
{
/* Here we grab all combinations of well known modifiers */
- status |=
+ status |=
XGrabButton (dpy, button, modifier,
w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button, modifier | ScrollLockMask,
w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button, modifier | NumLockMask,
w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button, modifier | LockMask, w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button, modifier | ScrollLockMask | NumLockMask,
w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button, modifier | ScrollLockMask | LockMask,
w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button, modifier | LockMask | NumLockMask,
w, FALSE,
ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync,
None, None);
- status |=
+ status |=
XGrabButton (dpy, button,
modifier | ScrollLockMask | LockMask | NumLockMask,
w, FALSE,
@@ -332,7 +332,7 @@
keymap = XGetKeyboardMapping (dpy, min_keycode, max_keycode - min_keycode + 1, &keysyms_per_keycode);
if (modmap && keymap)
- {
+ {
for (i = 3 * modmap->max_keypermod; i < 8 * modmap->max_keypermod; i++)
{
keycode = modmap->modifiermap[i];
@@ -362,7 +362,7 @@
else if (!HyperMask && ((syms[j] == XK_Hyper_L) || (syms[j] == XK_Hyper_R)))
{
HyperMask = (1 << (i / modmap->max_keypermod));
- }
+ }
else if (!MetaMask && ((syms[j] == XK_Meta_L) || (syms[j] == XK_Meta_R)))
{
MetaMask = (1 << (i / modmap->max_keypermod));
Modified: xfwm4/trunk/src/keyboard.h
===================================================================
--- xfwm4/trunk/src/keyboard.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/keyboard.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_KEYBOARD_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/keysym.h>
@@ -43,21 +43,21 @@
extern unsigned int HyperMask;
int getModifierMap (char *);
-void parseKeyString (Display *,
- MyKey *,
+void parseKeyString (Display *,
+ MyKey *,
char *);
-gboolean grabKey (Display *,
- MyKey *,
+gboolean grabKey (Display *,
+ MyKey *,
Window);
-void ungrabKeys (Display *,
+void ungrabKeys (Display *,
Window);
-gboolean grabButton (Display *,
- int,
- int,
+gboolean grabButton (Display *,
+ int,
+ int,
Window);
-void ungrabButton (Display *,
- int,
- int,
+void ungrabButton (Display *,
+ int,
+ int,
Window);
void initModifiers (Display *);
Modified: xfwm4/trunk/src/main.c
===================================================================
--- xfwm4/trunk/src/main.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/main.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/X.h>
@@ -189,7 +189,7 @@
if (w && r)
{
int c;
-
+
while ((c = getc (r)) != EOF)
{
putc (c, w);
@@ -238,7 +238,7 @@
if (w && r)
{
int c;
-
+
while ((c = getc (r)) != EOF)
putc (c, w);
}
@@ -473,7 +473,7 @@
/* Enable compositor if "use compositing" is enabled */
xfwm4_compositor = compositorManageScreen (screen_info);
}
- /*
+ /*
The user may want to use the manual compositing, but the installed
system may not support it, so we need to double check, to see if
initialization of the compositor was successful.
Modified: xfwm4/trunk/src/menu.c
===================================================================
--- xfwm4/trunk/src/menu.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/menu.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/menu.h
===================================================================
--- xfwm4/trunk/src/menu.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/menu.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_MENU_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/misc.c
===================================================================
--- xfwm4/trunk/src/misc.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/misc.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/misc.h
===================================================================
--- xfwm4/trunk/src/misc.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/misc.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,8 +19,11 @@
*/
+#ifndef INC_MISC_H
+#define INC_MISC_H
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -28,13 +31,11 @@
#include <glib.h>
#include "screen.h"
-#ifndef INC_MISC_H
-#define INC_MISC_H
-
/*
Just for completion, being a bit pedantic, X seems to be missing
those so far, so create them for now.
*/
+
#ifndef Button6
#define Button6 6
#endif
@@ -43,32 +44,32 @@
#define Button7 7
#endif
-unsigned int getMouseXY (ScreenInfo *,
- Window,
- int *,
+unsigned int getMouseXY (ScreenInfo *,
+ Window,
+ int *,
int *);
-Window getMouseWindow (ScreenInfo *,
+Window getMouseWindow (ScreenInfo *,
Window);
-GC createGC (ScreenInfo *,
- char *,
- int,
- XFontStruct *,
- int,
+GC createGC (ScreenInfo *,
+ char *,
+ int,
+ XFontStruct *,
+ int,
gboolean);
-void sendClientMessage (ScreenInfo *,
- Window,
- int,
+void sendClientMessage (ScreenInfo *,
+ Window,
+ int,
Time);
-void sendRootMessage (ScreenInfo *,
- int,
- long,
+void sendRootMessage (ScreenInfo *,
+ int,
+ long,
Time);
-gboolean checkWindowOnRoot (ScreenInfo *,
+gboolean checkWindowOnRoot (ScreenInfo *,
Window);
-void placeSidewalks (ScreenInfo *,
+void placeSidewalks (ScreenInfo *,
gboolean);
-gint find_monitor_at_point (GdkScreen *,
- gint,
+gint find_monitor_at_point (GdkScreen *,
+ gint,
gint);
#endif /* INC_MISC_H */
Modified: xfwm4/trunk/src/mypixmap.c
===================================================================
--- xfwm4/trunk/src/mypixmap.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/mypixmap.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -375,7 +375,7 @@
{
if (color[0] == '\0') /* incomplete colormap entry */
{
- return NULL;
+ return NULL;
}
else /* end of entry, still store the last color */
{
Modified: xfwm4/trunk/src/mypixmap.h
===================================================================
--- xfwm4/trunk/src/mypixmap.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/mypixmap.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <glib.h>
Modified: xfwm4/trunk/src/mywindow.c
===================================================================
--- xfwm4/trunk/src/mywindow.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/mywindow.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -199,7 +199,7 @@
g_return_val_if_fail (win, FALSE);
return win->map;
-}
+}
gboolean
xfwmWindowDeleted (xfwmWindow *win)
@@ -207,7 +207,7 @@
g_return_val_if_fail (win, TRUE);
return (win->window == None);
-}
+}
void
xfwmWindowTemp (ScreenInfo *screen_info, Visual *visual,
Modified: xfwm4/trunk/src/mywindow.h
===================================================================
--- xfwm4/trunk/src/mywindow.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/mywindow.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_MYWINDOW_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -80,7 +80,7 @@
void xfwmWindowHide (xfwmWindow *);
gboolean xfwmWindowVisible (xfwmWindow *);
gboolean xfwmWindowDeleted (xfwmWindow *);
-void xfwmWindowSetBG (xfwmWindow *,
+void xfwmWindowSetBG (xfwmWindow *,
xfwmPixmap *);
#endif /* INC_MYWINDOW_H */
Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/netwm.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -672,7 +672,7 @@
resize = FALSE; /* Move */
break;
}
-
+
if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
if (resize && FLAG_TEST_ALL (c->xfwm_flags, XFWM_FLAG_HAS_RESIZE | XFWM_FLAG_IS_RESIZABLE))
Modified: xfwm4/trunk/src/netwm.h
===================================================================
--- xfwm4/trunk/src/netwm.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/netwm.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -22,7 +22,7 @@
#define INC_NETWM_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -33,15 +33,15 @@
void clientSetNetState (Client *);
void clientGetNetState (Client *);
-void clientUpdateNetState (Client *,
+void clientUpdateNetState (Client *,
XClientMessageEvent *);
-void clientNetMoveResize (Client *,
+void clientNetMoveResize (Client *,
XClientMessageEvent *);
void clientUpdateFullscreenState (Client *);
void clientGetNetWmType (Client *);
void clientGetInitialNetWmDesktop (Client *);
-void clientSetNetClientList (ScreenInfo *,
- Atom,
+void clientSetNetClientList (ScreenInfo *,
+ Atom,
GList *);
gboolean clientValidateNetStrut (Client *);
gboolean clientGetNetStruts (Client *);
Modified: xfwm4/trunk/src/parserc.c
===================================================================
--- xfwm4/trunk/src/parserc.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/parserc.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/parserc.h
===================================================================
--- xfwm4/trunk/src/parserc.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/parserc.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,29 +23,29 @@
#define INC_PARSERC_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <glib.h>
#include "settings.h"
-gboolean parseRc (const gchar *,
- const gchar *,
+gboolean parseRc (const gchar *,
+ const gchar *,
Settings *);
gboolean checkRc (Settings *);
-gchar *getValue (const gchar *,
+gchar *getValue (const gchar *,
Settings *);
-gboolean setValue (const gchar *,
- const gchar *,
+gboolean setValue (const gchar *,
+ const gchar *,
Settings *);
-gboolean setBooleanValueFromInt (const gchar *,
- int,
+gboolean setBooleanValueFromInt (const gchar *,
+ int,
Settings *);
-gboolean setIntValueFromInt (const gchar *,
- int,
+gboolean setIntValueFromInt (const gchar *,
+ int,
Settings *);
gchar *getSystemThemeDir (void);
-gchar *getThemeDir (const gchar *,
+gchar *getThemeDir (const gchar *,
const gchar *);
void freeRc (Settings *);
Modified: xfwm4/trunk/src/placement.c
===================================================================
--- xfwm4/trunk/src/placement.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/placement.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/placement.h
===================================================================
--- xfwm4/trunk/src/placement.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/placement.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,12 +18,11 @@
*/
-
#ifndef INC_PLACEMENT_H
#define INC_PLACEMENT_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <glib.h>
@@ -34,13 +33,13 @@
#define CLIENT_CONSTRAINED_LEFT 1<<2
#define CLIENT_CONSTRAINED_RIGHT 1<<3
-void clientMaxSpace (ScreenInfo *,
- int *,
- int *,
- int *,
+void clientMaxSpace (ScreenInfo *,
+ int *,
+ int *,
+ int *,
int *);
gboolean clientCkeckTitle (Client *);
-unsigned int clientConstrainPos (Client *,
+unsigned int clientConstrainPos (Client *,
gboolean);
void clientKeepVisible (Client *);
void clientInitPosition (Client *);
Modified: xfwm4/trunk/src/poswin.c
===================================================================
--- xfwm4/trunk/src/poswin.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/poswin.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <glib.h>
Modified: xfwm4/trunk/src/poswin.h
===================================================================
--- xfwm4/trunk/src/poswin.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/poswin.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,13 +18,13 @@
based on a patch from Joshua Blanton <jblanton at irg.cs.ohiou.edu>
*/
+#ifndef INC_POSWIN_H
+#define INC_POSWIN_H
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
-#ifndef INC_POSWIN_H
-#define INC_POSWIN_H
-
#include <glib.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -39,7 +39,7 @@
};
Poswin *poswinCreate (GdkScreen *);
-void poswinSetPosition (Poswin *,
+void poswinSetPosition (Poswin *,
Client *);
void poswinDestroy (Poswin *);
void poswinShow (Poswin *);
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/screen.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,9 +18,8 @@
*/
-
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/screen.h
===================================================================
--- xfwm4/trunk/src/screen.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/screen.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/Xlib.h>
@@ -172,4 +172,5 @@
unsigned int myScreenUngrabPointer (ScreenInfo *);
void myScreenGrabKeys (ScreenInfo *);
void myScreenUngrabKeys (ScreenInfo *);
+
#endif /* INC_SCREEN_H */
Modified: xfwm4/trunk/src/session.c
===================================================================
--- xfwm4/trunk/src/session.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/session.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
/* Initially inspired by xfwm, fvwm2, enlightment and twm implementations */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xatom.h>
@@ -284,7 +284,7 @@
{
continue;
}
-
+
if (c->client_leader != None)
{
getWindowRole (display_info, c->window, &window_role);
Modified: xfwm4/trunk/src/session.h
===================================================================
--- xfwm4/trunk/src/session.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/session.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -21,6 +21,10 @@
#ifndef INC_SESSION_H
#define INC_SESSION_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <glib.h>
#include "client.h"
#include "display.h"
Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/settings.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <glib.h>
Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/settings.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <glib.h>
Modified: xfwm4/trunk/src/spinning_cursor.c
===================================================================
--- xfwm4/trunk/src/spinning_cursor.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/spinning_cursor.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/spinning_cursor.h
===================================================================
--- xfwm4/trunk/src/spinning_cursor.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/spinning_cursor.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,13 +19,13 @@
*/
+#ifndef INC_SPINNING_CURSOR_H
+#define INC_SPINNING_CURSOR_H
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
-#ifndef INC_SPINNING_CURSOR_H
-#define INC_SPINNING_CURSOR_H
-
#include <X11/Xlib.h>
Cursor cursorCreateSpinning (Display *);
Modified: xfwm4/trunk/src/stacking.c
===================================================================
--- xfwm4/trunk/src/stacking.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/stacking.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,6 +18,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@@ -719,9 +723,9 @@
{
g_source_remove (raise_timeout);
}
- raise_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
- screen_info->params->raise_delay,
- (GSourceFunc) delayed_raise_cb,
+ raise_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
+ screen_info->params->raise_delay,
+ (GSourceFunc) delayed_raise_cb,
NULL, NULL);
}
Modified: xfwm4/trunk/src/stacking.h
===================================================================
--- xfwm4/trunk/src/stacking.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/stacking.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -22,7 +22,7 @@
#define INC_STACKING_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <glib.h>
@@ -34,21 +34,21 @@
Client *clientGetHighestTransientOrModalFor (Client *);
gboolean clientIsTopMost (Client *);
Client *clientGetTopMostForGroup (Client *);
-Client *clientGetNextTopMost (ScreenInfo *,
- int,
+Client *clientGetNextTopMost (ScreenInfo *,
+ int,
Client *);
-Client *clientGetBottomMost (ScreenInfo *,
- int,
+Client *clientGetBottomMost (ScreenInfo *,
+ int,
Client *);
-Client *clientAtPosition (ScreenInfo *,
- int,
- int,
+Client *clientAtPosition (ScreenInfo *,
+ int,
+ int,
Client *);
-void clientRaise (Client *,
+void clientRaise (Client *,
Window);
-void clientLower (Client *,
+void clientLower (Client *,
Window);
-gboolean clientAdjustFullscreenLayer (Client *,
+gboolean clientAdjustFullscreenLayer (Client *,
gboolean);
void clientAddToList (Client *);
void clientRemoveFromList (Client *);
@@ -59,5 +59,4 @@
void clientClearDelayedRaise (void);
void clientResetDelayedRaise (ScreenInfo *);
-
#endif /* INC_STACKING_H */
Modified: xfwm4/trunk/src/startup_notification.c
===================================================================
--- xfwm4/trunk/src/startup_notification.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/startup_notification.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
Modified: xfwm4/trunk/src/startup_notification.h
===================================================================
--- xfwm4/trunk/src/startup_notification.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/startup_notification.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_STARTUP_NOTIFICATION_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
@@ -47,4 +47,5 @@
#define sn_process_event(e) ;
#endif /* HAVE_LIBSTARTUP_NOTIFICATION */
+
#endif /* INC_STARTUP_NOTIFICATION_H */
Modified: xfwm4/trunk/src/tabwin.c
===================================================================
--- xfwm4/trunk/src/tabwin.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/tabwin.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifndef WIN_ICON_SIZE
Modified: xfwm4/trunk/src/tabwin.h
===================================================================
--- xfwm4/trunk/src/tabwin.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/tabwin.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,13 +18,13 @@
*/
+#ifndef INC_TABWIN_H
+#define INC_TABWIN_H
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
-#ifndef INC_TABWIN_H
-#define INC_TABWIN_H
-
#include <glib.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
Modified: xfwm4/trunk/src/transients.c
===================================================================
--- xfwm4/trunk/src/transients.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/transients.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <glib.h>
@@ -61,9 +61,9 @@
g_return_val_if_fail (c != NULL, FALSE);
TRACE ("entering clientIsModal");
- /*
- If the WM_TRANSIENT_FOR hint is set to another toplevel window, the dialog is modal for that window;
- if WM_TRANSIENT_FOR is not set or set to the root window the dialog is modal for its window group.
+ /*
+ If the WM_TRANSIENT_FOR hint is set to another toplevel window, the dialog is modal for that window;
+ if WM_TRANSIENT_FOR is not set or set to the root window the dialog is modal for its window group.
*/
return (FLAG_TEST (c->flags, CLIENT_FLAG_STATE_MODAL) && (c->type & WINDOW_REGULAR_FOCUSABLE) &&
(((c->transient_for != c->screen_info->xroot) && (c->transient_for != None) && (c->transient_for != c->window)) ||
@@ -110,8 +110,8 @@
return (c1->transient_for == c2->window);
}
/*
- * Transients for group shouldn't apply to other transients, or
- * it breaks stacking for some apps, noticeably mozilla "save as"
+ * Transients for group shouldn't apply to other transients, or
+ * it breaks stacking for some apps, noticeably mozilla "save as"
* dialog...
*/
else if (c2->transient_for == None)
Modified: xfwm4/trunk/src/transients.h
===================================================================
--- xfwm4/trunk/src/transients.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/transients.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -22,7 +22,7 @@
#define INC_TRANSIENTS_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <glib.h>
@@ -33,24 +33,22 @@
gboolean clientIsModal (Client *);
gboolean clientIsTransientOrModal (Client *);
gboolean clientIsValidTransientOrModal (Client *);
-gboolean clientSameGroup (Client *,
+gboolean clientSameGroup (Client *,
Client *);
-gboolean clientIsTransientFor (Client *,
+gboolean clientIsTransientFor (Client *,
Client *);
-gboolean clientIsModalFor (Client *,
+gboolean clientIsModalFor (Client *,
Client *);
-gboolean clientIsTransientOrModalFor (Client *,
+gboolean clientIsTransientOrModalFor (Client *,
Client *);
gboolean clientIsTransientForGroup (Client *);
gboolean clientIsModalForGroup (Client *);
gboolean clientIsTransientOrModalForGroup (Client *);
-gboolean clientTransientOrModalHasAncestor (Client *,
+gboolean clientTransientOrModalHasAncestor (Client *,
int);
Client *clientGetModalFor (Client *);
GList *clientListTransient (Client *);
GList *clientListTransientOrModal (Client *);
-gboolean clientCheckTransientWindow (Client *,
+gboolean clientCheckTransientWindow (Client *,
Window);
-
-
#endif /* INC_TRANSIENTS_H */
Modified: xfwm4/trunk/src/ui_style.c
===================================================================
--- xfwm4/trunk/src/ui_style.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/ui_style.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,7 +19,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifdef HAVE_MEMORY_H
Modified: xfwm4/trunk/src/ui_style.h
===================================================================
--- xfwm4/trunk/src/ui_style.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/ui_style.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -18,9 +18,13 @@
*/
-#ifndef __UI_STYLE_H__
-#define __UI_STYLE_H__
+#ifndef INC_UI_STYLE_H
+#define INC_UI_STYLE_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <glib.h>
#include <gtk/gtk.h>
#include <pango/pango-font.h>
@@ -34,4 +38,4 @@
PangoFontDescription *getUIPangoFontDesc (GtkWidget *);
PangoContext *getUIPangoContext (GtkWidget *);
-#endif /* __UI_STYLE_H__ */
+#endif /* INC_UI_STYLE_H */
Modified: xfwm4/trunk/src/wireframe.c
===================================================================
--- xfwm4/trunk/src/wireframe.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/wireframe.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/Xlib.h>
Modified: xfwm4/trunk/src/wireframe.h
===================================================================
--- xfwm4/trunk/src/wireframe.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/wireframe.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -19,21 +19,21 @@
*/
+#ifndef INC_WIREFRAME_H
+#define INC_WIREFRAME_H
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#ifndef INC_WIREFRAME_H
-#define INC_WIREFRAME_H
-
#include <X11/Xlib.h>
#include "screen.h"
#include "client.h"
-void wireframeUpdate (Client *c,
+void wireframeUpdate (Client *c,
Window);
Window wireframeCreate (Client *c);
-void wireframeDelete (ScreenInfo *,
+void wireframeDelete (ScreenInfo *,
Window);
#endif /* INC_WIREFRAME_H */
Modified: xfwm4/trunk/src/workspaces.c
===================================================================
--- xfwm4/trunk/src/workspaces.c 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/workspaces.c 2007-05-09 20:55:21 UTC (rev 25698)
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <X11/X.h>
@@ -321,7 +321,7 @@
for (index = screen_info->windows_stack; index; index = g_list_next (index))
{
c = (Client *) index->data;
-
+
if (c->win_workspace != new_ws)
{
if (c == previous)
@@ -343,7 +343,7 @@
for (index = g_list_last(screen_info->windows_stack); index; index = g_list_previous (index))
{
c = (Client *) index->data;
-
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
{
if ((!new_focus) && (c == previous) && clientSelectMask (c, 0, WINDOW_REGULAR_FOCUSABLE))
Modified: xfwm4/trunk/src/workspaces.h
===================================================================
--- xfwm4/trunk/src/workspaces.h 2007-05-09 19:55:38 UTC (rev 25697)
+++ xfwm4/trunk/src/workspaces.h 2007-05-09 20:55:21 UTC (rev 25698)
@@ -23,7 +23,7 @@
#define INC_WORKSPACES_H
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <X11/X.h>
@@ -35,20 +35,20 @@
#include "screen.h"
#include "client.h"
-gboolean workspaceMove (ScreenInfo *,
- int,
- int,
+gboolean workspaceMove (ScreenInfo *,
+ int,
+ int,
Client *,
Time);
-void workspaceSwitch (ScreenInfo *,
- int,
- Client *,
+void workspaceSwitch (ScreenInfo *,
+ int,
+ Client *,
gboolean,
Time);
-void workspaceSetNames (ScreenInfo *,
- gchar **,
+void workspaceSetNames (ScreenInfo *,
+ gchar **,
int);
-void workspaceSetCount (ScreenInfo *,
+void workspaceSetCount (ScreenInfo *,
int);
void workspaceUpdateArea (ScreenInfo *);
More information about the Xfce4-commits
mailing list