kde systray applications no longer need the tray proxy, so let's remove it from svn
This commit is contained in:
Dana Jansens
parent
5697404dd6
commit
e6fba91476
3 changed files with 0 additions and 255 deletions
11
Makefile.am
11
Makefile.am
|
|
@ -28,7 +28,6 @@ lib_LTLIBRARIES = \
|
|||
|
||||
bin_PROGRAMS = \
|
||||
openbox/openbox \
|
||||
tools/kdetrayproxy/kdetrayproxy \
|
||||
tools/themetoxml/themetoxml \
|
||||
tools/gnome-panel-control/gnome-panel-control
|
||||
|
||||
|
|
@ -203,16 +202,6 @@ openbox_openbox_SOURCES = \
|
|||
openbox/xerror.h
|
||||
|
||||
|
||||
## kdetrayproxy ##
|
||||
|
||||
tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \
|
||||
$(X_CFLAGS)
|
||||
tools_kdetrayproxy_kdetrayproxy_LDADD = \
|
||||
$(X_LIBS)
|
||||
tools_kdetrayproxy_kdetrayproxy_SOURCES = \
|
||||
tools/kdetrayproxy/kdetrayproxy.c
|
||||
|
||||
|
||||
## themetoxml ##
|
||||
|
||||
tools_themetoxml_themetoxml_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
all clean install:
|
||||
$(MAKE) -C ../.. -$(MAKEFLAGS) $@
|
||||
|
||||
.PHONY: all clean install
|
||||
|
|
@ -1,240 +0,0 @@
|
|||
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
|
||||
|
||||
kdetrayproxy.c for the Openbox window manager
|
||||
Copyright (c) 2003 Ben Jansens
|
||||
|
||||
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 of the License, 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.
|
||||
|
||||
See the COPYING file for a copy of the GNU General Public License.
|
||||
*/
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/select.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
typedef struct IList {
|
||||
Window win;
|
||||
int ignore_unmaps;
|
||||
|
||||
struct IList *next;
|
||||
} IList;
|
||||
|
||||
Display *display;
|
||||
Window root;
|
||||
Atom winhint;
|
||||
Atom roothint;
|
||||
int xfd;
|
||||
IList *list;
|
||||
|
||||
void init();
|
||||
void eventloop();
|
||||
void handleevent(XEvent *e);
|
||||
void addicon(Window win);
|
||||
void removeicon(Window win, int unmap);
|
||||
int issystray(Atom *a, int n);
|
||||
void updatehint();
|
||||
Window findclient(Window win);
|
||||
int ignore_errors(Display *d, XErrorEvent *e);
|
||||
void wait_time(unsigned int t);
|
||||
|
||||
int main()
|
||||
{
|
||||
init();
|
||||
updatehint();
|
||||
eventloop();
|
||||
return 0;
|
||||
}
|
||||
|
||||
void init()
|
||||
{
|
||||
display = XOpenDisplay(NULL);
|
||||
if (!display) {
|
||||
fprintf(stderr, "Could not open display\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
xfd = ConnectionNumber(display);
|
||||
|
||||
root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
|
||||
|
||||
winhint = XInternAtom(display, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", 0);
|
||||
roothint = XInternAtom(display, "_KDE_NET_SYSTEM_TRAY_WINDOWS", 0);
|
||||
|
||||
XSelectInput(display, root, SubstructureNotifyMask);
|
||||
}
|
||||
|
||||
void eventloop()
|
||||
{
|
||||
XEvent e;
|
||||
fd_set set;
|
||||
|
||||
while (1) {
|
||||
int event = False;
|
||||
while (XPending(display)) {
|
||||
event = True;
|
||||
XNextEvent(display, &e);
|
||||
handleevent(&e);
|
||||
}
|
||||
if (!event) {
|
||||
FD_ZERO(&set);
|
||||
FD_SET(xfd, &set);
|
||||
select(xfd + 1, &set, NULL, NULL, NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void handleevent(XEvent *e)
|
||||
{
|
||||
switch (e->type) {
|
||||
case MapNotify:
|
||||
{
|
||||
Atom *a;
|
||||
int n;
|
||||
Window w;
|
||||
|
||||
w = findclient(e->xmap.window);
|
||||
if (w) {
|
||||
a = XListProperties(display, w, &n);
|
||||
if (issystray(a, n))
|
||||
addicon(w);
|
||||
XFree(a);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case UnmapNotify:
|
||||
removeicon(e->xunmap.window, True);
|
||||
break;
|
||||
case DestroyNotify:
|
||||
removeicon(e->xdestroywindow.window, False);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int ignore_errors(Display *d, XErrorEvent *e)
|
||||
{
|
||||
(void)d; (void)e;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void addicon(Window win)
|
||||
{
|
||||
IList *it;
|
||||
|
||||
for (it = list; it; it = it->next)
|
||||
if (it->win == win) return; /* duplicate */
|
||||
|
||||
it = list;
|
||||
list = malloc(sizeof(IList));
|
||||
list->win = win;
|
||||
list->ignore_unmaps = 2;
|
||||
list->next = it;
|
||||
|
||||
XSelectInput(display, win, StructureNotifyMask);
|
||||
/* if i set the root hint too fast the dock app can fuck itself up */
|
||||
wait_time(1000000 / 8);
|
||||
updatehint();
|
||||
}
|
||||
|
||||
void removeicon(Window win, int unmap)
|
||||
{
|
||||
IList *it, *last = NULL;
|
||||
int (*old)(Display *, XErrorEvent *);
|
||||
|
||||
for (it = list; it; last = it, it = it->next)
|
||||
if (it->win == win) {
|
||||
if (it->ignore_unmaps && unmap) {
|
||||
it->ignore_unmaps--;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!last)
|
||||
list = it->next;
|
||||
else
|
||||
last->next = it->next;
|
||||
|
||||
XSync(display, False);
|
||||
old = XSetErrorHandler(ignore_errors);
|
||||
XSelectInput(display, win, NoEventMask);
|
||||
XSync(display, False);
|
||||
XSetErrorHandler(old);
|
||||
free(it);
|
||||
|
||||
updatehint();
|
||||
}
|
||||
}
|
||||
|
||||
int issystray(Atom *a, int n)
|
||||
{
|
||||
int i, r = False;
|
||||
|
||||
for (i = 0; i < n; ++i) {
|
||||
if (a[i] == winhint) {
|
||||
r = True;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
void updatehint()
|
||||
{
|
||||
IList *it;
|
||||
int *wins, n, i;
|
||||
|
||||
for (it = list, n = 0; it; it = it->next, ++n) ;
|
||||
if (n) {
|
||||
wins = malloc(sizeof(int) * n);
|
||||
for (it = list, i = 0; it; it = it->next, ++i)
|
||||
wins[i] = it->win;
|
||||
} else
|
||||
wins = NULL;
|
||||
XChangeProperty(display, root, roothint, XA_WINDOW, 32, PropModeReplace,
|
||||
(unsigned char*) wins, n);
|
||||
}
|
||||
|
||||
Window findclient(Window win)
|
||||
{
|
||||
Window r, *children;
|
||||
unsigned int n, i;
|
||||
Atom state = XInternAtom(display, "WM_STATE", True);
|
||||
Atom ret_type;
|
||||
int ret_format;
|
||||
unsigned long ret_items, ret_bytesleft;
|
||||
unsigned long *prop_return;
|
||||
|
||||
XQueryTree(display, win, &r, &r, &children, &n);
|
||||
for (i = 0; i < n; ++i) {
|
||||
Window w = findclient(children[i]);
|
||||
if (w) return w;
|
||||
}
|
||||
|
||||
/* try me */
|
||||
XGetWindowProperty(display, win, state, 0, 1,
|
||||
False, state, &ret_type, &ret_format,
|
||||
&ret_items, &ret_bytesleft,
|
||||
(unsigned char**) &prop_return);
|
||||
if (ret_type == None || ret_items < 1)
|
||||
return None;
|
||||
return win; /* found it! */
|
||||
}
|
||||
|
||||
void wait_time(unsigned int t)
|
||||
{
|
||||
struct timeval time;
|
||||
time.tv_sec = 0;
|
||||
time.tv_usec = t;
|
||||
select(1, NULL, NULL, NULL, &time);
|
||||
}
|
||||
Loading…
Reference in a new issue