Skip to content

Commit

Permalink
Revert some gdk convertion ideas
Browse files Browse the repository at this point in the history
  • Loading branch information
sargon committed May 1, 2011
1 parent 3212c78 commit 82d5d05
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 92 deletions.
46 changes: 0 additions & 46 deletions gdk-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,3 @@
Display* gdk_helper_display() {
return gdk_x11_display_get_xdisplay(gdk_display_get_default());
}

GdkAtom gdk_helper_atom_from_name(const gchar *atom_name){
return gdk_x11_xatom_to_atom(gdk_x11_get_xatom_by_name(atom_name));
}

void gdk_helper_resolve_atoms() {


G_UTF8_STRING = gdk_helper_atom_from_name("_UTF8_STRING");;
G_XROOTPMAP_ID = gdk_helper_atom_from_name("_XROOTPMAP_ID");;

G_WM_STATE = gdk_helper_atom_from_name("_WM_STATE");;
G_WM_CLASS = gdk_helper_atom_from_name("_WM_CLASS");;

G_NET_WORKAREA = gdk_helper_atom_from_name("_NET_WORKAREA");;
G_NET_CLIENT_LIST = gdk_helper_atom_from_name("_NET_CLIENT_LIST");;
G_NET_CLIENT_LIST_STACKING = gdk_helper_atom_from_name("_NET_CLIENT_LIST_STACKING");;
G_NET_NUMBER_OF_DESKTOPS = gdk_helper_atom_from_name("_NET_NUMBER_OF_DESKTOPS");;
G_NET_CURRENT_DESKTOP = gdk_helper_atom_from_name("_NET_CURRENT_DESKTOP");;
G_NET_DESKTOP_NAMES = gdk_helper_atom_from_name("_NET_DESKTOP_NAMES");;
G_NET_ACTIVE_WINDOW = gdk_helper_atom_from_name("_NET_ACTIVE_WINDOW");;
G_NET_WM_STATE = gdk_helper_atom_from_name("_NET_WM_STATE");;
G_NET_WM_STATE_SKIP_TASKBAR = gdk_helper_atom_from_name("_NET_WM_STATE_SKIP_TASKBAR");;
G_NET_WM_STATE_SKIP_PAGER = gdk_helper_atom_from_name("_NET_WM_STATE_SKIP_PAGER");;
G_NET_WM_STATE_STICKY = gdk_helper_atom_from_name("_NET_WM_STATE_STICKY");;
G_NET_WM_STATE_HIDDEN = gdk_helper_atom_from_name("_NET_WM_STATE_HIDDEN");;
G_NET_WM_STATE_SHADED = gdk_helper_atom_from_name("_NET_WM_STATE_SHADED");;

G_NET_WM_WINDOW_TYPE = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE");;
G_NET_WM_WINDOW_TYPE_DESKTOP = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_DESKTOP");;
G_NET_WM_WINDOW_TYPE_DOCK = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_DOCK");
G_NET_WM_WINDOW_TYPE_TOOLBAR = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_TOOLBAR");;
G_NET_WM_WINDOW_TYPE_MENU = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_MENU");;
G_NET_WM_WINDOW_TYPE_UTILITY = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_UTILITY");;
G_NET_WM_WINDOW_TYPE_SPLASH = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_SPLASH");;
G_NET_WM_WINDOW_TYPE_DIALOG = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_DIALOG");;
G_NET_WM_WINDOW_TYPE_NORMAL = gdk_helper_atom_from_name("_NET_WM_WINDOW_TYPE_NORMAL");;

G_NET_WM_DESKTOP = gdk_helper_atom_from_name("_NET_WM_DESKTOP");;
G_NET_WM_NAME = gdk_helper_atom_from_name("_NET_WM_NAME");;
G_NET_WM_STRUT = gdk_helper_atom_from_name("_NET_WM_STRUT");;
G_NET_WM_STRUT_PARTIAL = gdk_helper_atom_from_name("_NET_WM_STRUT_PARTIAL");;

G_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR = gdk_helper_atom_from_name("_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR");;
}

44 changes: 0 additions & 44 deletions gdk-helper.h
Original file line number Diff line number Diff line change
@@ -1,48 +1,4 @@
#include <gdk/gdkx.h>
#include <gdk/gdk.h>


#define G_NET_WM_STATE_REMOVE 0 /* remove/unset property */
#define G_NET_WM_STATE_ADD 1 /* add/set property */
#define G_NET_WM_STATE_TOGGLE 2 /* toggle property */

#define TYPE_ATOM _GDK_MAKE_ATOM(4)
#define TYPE_CARDINAL _GDK_MAKE_ATOM(6)
#define TYPE_PIXMAP _GDK_MAKE_ATOM(20)


GdkAtom G_UTF8_STRING;
GdkAtom G_XROOTPMAP_ID;
GdkAtom G_WM_STATE;
GdkAtom G_WM_CLASS;
GdkAtom G_NET_WORKAREA;
GdkAtom G_NET_CLIENT_LIST;
GdkAtom G_NET_CLIENT_LIST_STACKING;
GdkAtom G_NET_NUMBER_OF_DESKTOPS;
GdkAtom G_NET_CURRENT_DESKTOP;
GdkAtom G_NET_DESKTOP_NAMES;
GdkAtom G_NET_ACTIVE_WINDOW;
GdkAtom G_NET_WM_STATE;
GdkAtom G_NET_WM_STATE_SKIP_TASKBAR;
GdkAtom G_NET_WM_STATE_SKIP_PAGER;
GdkAtom G_NET_WM_STATE_STICKY;
GdkAtom G_NET_WM_STATE_HIDDEN;
GdkAtom G_NET_WM_STATE_SHADED;
GdkAtom G_NET_WM_WINDOW_TYPE;
GdkAtom G_NET_WM_WINDOW_TYPE_DESKTOP;
GdkAtom G_NET_WM_WINDOW_TYPE_DOCK;
GdkAtom G_NET_WM_WINDOW_TYPE_TOOLBAR;
GdkAtom G_NET_WM_WINDOW_TYPE_MENU;
GdkAtom G_NET_WM_WINDOW_TYPE_UTILITY;
GdkAtom G_NET_WM_WINDOW_TYPE_SPLASH;
GdkAtom G_NET_WM_WINDOW_TYPE_DIALOG;
GdkAtom G_NET_WM_WINDOW_TYPE_NORMAL;
GdkAtom G_NET_WM_DESKTOP;
GdkAtom G_NET_WM_NAME;
GdkAtom G_NET_WM_STRUT;
GdkAtom G_NET_WM_STRUT_PARTIAL;
GdkAtom G_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR;

Display* gdk_helper_display();
GdkAtom gdk_helper_atom_from_name(const gchar *atom_name);
void gdk_helper_resolve_atoms();
2 changes: 0 additions & 2 deletions panel.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,6 @@ main(int argc, char *argv[], char *env[])
XSetErrorHandler((XErrorHandler) handle_error);
// resolve xatoms
resolve_atoms();
// resolve GdkAtoms
gdk_helper_resolve_atoms();

p = g_new0(panel, 1);
memset(p, 0, sizeof(panel));
Expand Down

0 comments on commit 82d5d05

Please sign in to comment.