#include <util.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
-#include <X11/Xatom.h>
-#include <X11/XKBlib.h>
-#include <X11/Xlib-xcb.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
+#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
#include <X11/extensions/XTest.h>
-#include <xcb/randr.h>
+#include <xcb/xcb.h>
#include <xcb/xcb_atom.h>
#include <xcb/xcb_aux.h>
#include <xcb/xcb_event.h>
#include <xcb/xcb_icccm.h>
#include <xcb/xcb_keysyms.h>
#include <xcb/xtest.h>
+#include <xcb/randr.h>
/* local includes */
#include "version.h"
volatile sig_atomic_t restart_wm = 0;
int outputs = 0;
/*int last_focus_event = FocusOut;*/
-int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm;
int ss_enabled = 0;
int xrandr_support;
int xrandr_eventbase;
unsigned int numlockmask = 0;
-Display *display;
xcb_connection_t *conn;
xcb_key_symbols_t *syms;
int verbose_layout = 0;
time_t time_started;
pid_t bar_pid;
+#if 0
XFontSet bar_fs;
XFontSetExtents *bar_fs_extents;
+#endif
char *bar_fonts;
struct passwd *pwd;
-#define SWM_MENU_FN (2)
-#define SWM_MENU_NB (4)
-#define SWM_MENU_NF (6)
-#define SWM_MENU_SB (8)
-#define SWM_MENU_SF (10)
-
/* layout manager data */
struct swm_geometry {
int x;
void
custom_region(char *val)
{
- unsigned int sidx, x, y, w, h;
- int num_screens;
+ unsigned int x, y, w, h;
+ int sidx, num_screens;
xcb_screen_t *screen;
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
+ if (sscanf(val, "screen[%d]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
errx(1, "invalid custom region, "
"should be 'screen[<n>]:<n>x<n>+<n>+<n>");
if (sidx < 1 || sidx > num_screens)
XRectangle ibox, lbox;
len = strlen(s);
+ /* FIXME fix bar font position calculations */
+#if 0
XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
switch (bar_justify) {
if (x < SWM_BAR_OFFSET)
x = SWM_BAR_OFFSET;
+#endif
rect.x = 0;
rect.y = 0;
xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv);
gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color;
xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
+#if 0
xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x,
(bar_fs_extents->max_logical_extent.height - lbox.height) / 2 -
lbox.y, s);
+#else
+ /* workaround */
+ xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, 4, 14, s);
+#endif
/* blt */
xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
xcb_screen_t *screen = get_screen(r->s->idx);
uint32_t wa[3];
+#if 0
if (bar_fs) {
XFreeFontSet(display, bar_fs);
bar_fs = NULL;
}
+#endif
if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL)
err(1, "bar_setup: calloc: failed to allocate memory.");
-
+#if 0
DNPRINTF(SWM_D_BAR, "bar_setup: loading bar_fonts: %s\n", bar_fonts);
bar_fs = XCreateFontSet(display, bar_fonts, &missing_charsets,
- &num_missing_charsets, &default_string);
+ &num_missing_charsets, &default_string);*/
if (num_missing_charsets > 0) {
warnx("Unable to load charset(s):");
if (bar_height < 1)
bar_height = 1;
-
+#else
+ /* workaround */
+ bar_height = 24;
+#endif
X(r->bar) = X(r);
Y(r->bar) = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r);
WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width;
wa[0] = r->s->c[SWM_S_COLOR_BAR].color;
wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER].color;
wa[2] = XCB_EVENT_MASK_EXPOSURE;
+ DNPRINTF(SWM_D_BAR, "bar_setup: create_window: (x,y) w x h: (%d,%d) "
+ "%d x %d\n", X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar));
xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->bar->id, r->s->root,
X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar),
bar_border_width, XCB_WINDOW_CLASS_INPUT_OUTPUT,
DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
- if (display)
- close(xcb_get_file_descriptor(conn));
+ close(xcb_get_file_descriptor(conn));
setenv("LD_PRELOAD", SWM_LIB, 1);
FILE *lfile;
size_t len;
XRectangle ibox, lbox;
+
DNPRINTF(SWM_D_MISC, "search_win\n");
search_r = r;
snprintf(s, sizeof s, "%d", i);
len = strlen(s);
+ /* FIXME fix calculations */
+#if 0
XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
+#endif
w = xcb_generate_id(conn);
wa[0] = r->s->c[SWM_S_COLOR_FOCUS].color;
wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].color;
+#if 0
xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
lbox.width + 4, bar_fs_extents->max_logical_extent.height,
1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
+#else
+ /* workaround */
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
+ 22, 20, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL |
+ XCB_CW_BORDER_PIXEL, wa);
+#endif
sw->indicator = w;
TAILQ_INSERT_TAIL(&search_wl, sw, entry);
XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
map_window_raised(w);
+#if 0
xcb_image_text_8(conn, len, w, sw->gc, 2,
(bar_fs_extents->max_logical_extent.height -
lbox.height) / 2 - lbox.y, s);
+#else
+ /* workaround */
+ xcb_image_text_8(conn, len, w, sw->gc, 6, 14, s);
+#endif
DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
xcb_flush(conn);
resizing = 1;
while ((evt = xcb_wait_for_event(conn)) && resizing) {
- /*
- XMaskEvent(display, MOUSEMASK | ExposureMask |
- SubstructureRedirectMask, &ev);
- */
switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
case XCB_BUTTON_RELEASE:
DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n");
return (1);
}
cp = keystr;
- *ks = NoSymbol;
+ *ks = XCB_NO_SYMBOL;
*mod = 0;
while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
DNPRINTF(SWM_D_KEY, "parsekeys: key [%s]\n", name);
else {
*ks = XStringToKeysym(name);
XConvertCase(*ks, ks, &uks);
- if (ks == NoSymbol) {
+ if (ks == XCB_NO_SYMBOL) {
DNPRINTF(SWM_D_KEY,
"parsekeys: invalid key %s\n",
name);
void
grabkeys(void)
{
- int num_screens;
- unsigned int j, k;
+ int num_screens, k;
+ unsigned int j;
xcb_keycode_t *code;
unsigned int modifiers[] =
{ 0, LockMask, numlockmask, numlockmask | LockMask };
xcb_window_t trans = XCB_WINDOW_NONE;
struct workspace *ws;
struct ws_win *win, *ww;
- int i, ws_idx, border_me = 0;
+ int ws_idx, border_me = 0;
xcb_atom_t ws_idx_atom = XCB_ATOM_NONE;
char ws_idx_str[SWM_PROPLEN], *prop = NULL;
size_t proplen;
const char *errstr;
struct pid_e *p;
struct quirk *qp;
- uint32_t event_mask;
+ uint32_t event_mask, i;
xcb_atom_t prot;
xcb_get_property_reply_t *gpr;
xcb_icccm_get_wm_protocols_reply_t wpr;
void
keypress(xcb_key_press_event_t *e)
{
- KeySym keysym;
+ xcb_keysym_t keysym;
struct key *kp;
- keysym = XkbKeycodeToKeysym(display, (KeyCode)e->detail, 0, 0);
+ keysym = xcb_key_press_lookup_keysym(syms, e, 0);
- DNPRINTF(SWM_D_EVENT, "keypress: %u\n", e->detail);
+ DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym);
if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL)
return;
buttonpress(xcb_button_press_event_t *e)
{
struct ws_win *win;
- int i, action;
+ int i;
+ unsigned int action;
DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
e->event, e->detail);
xcb_flush(conn);
}
-int
-xerror_start(Display *d, XErrorEvent *ee)
-{
- other_wm = 1;
- return (-1);
-}
-
-int
-xerror(Display *d, XErrorEvent *ee)
-{
- /* warnx("error: %p %p", display, ee); */
- return (-1);
-}
-
-int
+void
active_wm(void)
{
- other_wm = 0;
- xerrorxlib = XSetErrorHandler(xerror_start);
+ int num_screens, i;
+ const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
+ xcb_screen_t *sc;
/* this causes an error if some other window manager is running */
- XSelectInput(display, DefaultRootWindow(display),
- SubstructureRedirectMask);
- do_sync();
- if (other_wm)
- return (1);
-
- XSetErrorHandler(xerror);
- do_sync();
- return (0);
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; i++) {
+ sc = get_screen(i);
+ xcb_change_window_attributes(conn, sc->root,
+ XCB_CW_EVENT_MASK, &val);
+ }
}
void
start_argv = argv;
warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr);
- if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") ||
- !XSupportsLocale())
+ if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, ""))
warnx("no locale support");
- if (!X_HAVE_UTF8_STRING)
- warnx("no UTF-8 support");
-
- if (!(display = XOpenDisplay(0)))
- errx(1, "can not open display");
-
/* handle some signals */
bzero(&sact, sizeof(sact));
sigemptyset(&sact.sa_mask);
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
- conn = XGetXCBConnection(display);
+ conn = xcb_connect(NULL, NULL);
if (xcb_connection_has_error(conn))
errx(1, "can not get XCB connection");
+ xcb_prefetch_extension_data(conn, &xcb_randr_id);
xfd = xcb_get_file_descriptor(conn);
/* look for local and global conf file */
free(evt);
}
- if (active_wm())
- errx(1, "other wm running");
-
+ active_wm();
xcb_aux_sync(conn);
+ if (xcb_poll_for_event(conn) != NULL)
+ errx(1, "another window manager is currently running");
+
setup_globals();
setup_screens();
setup_keys();
for (i = 0; i < num_screens; ++i)
if (screens[i].bar_gc != 0)
xcb_free_gc(conn, screens[i].bar_gc);
+#if 0
XFreeFontSet(display, bar_fs);
-
+#endif
xcb_key_symbols_free(syms);
xcb_disconnect(conn);
Got questions, comments, patches, etc.? Contact Jason Woofenden