#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "util.h"
#include "conf.h"
struct win_wm { };
typedef struct {
- win_t *win; // the window
- int height; // win height in _this_ tag
- state_t state; // state of window
+ win_t *win; // the window
+ int height; // win height in _this_ tag
+ state_t state; // state of window
} row_t;
typedef struct {
- list_t *rows; // of row_t
- row_t *row; // focused row
- int width; // column width
- layout_t layout; // column layout
+ list_t *rows; // of row_t
+ row_t *row; // focused row
+ int width; // column width
+ layout_t layout; // column layout
} col_t;
typedef struct {
- win_t *win; // the window
- int x, y, w, h; // position of window (in this tag)
- state_t state; // state of window
+ win_t *win; // the window
+ int x, y, w, h; // position of window (in this tag)
+ state_t state; // state of window
} flt_t;
typedef struct {
- list_t *cols; // of col_t
- col_t *col; // focused col
- list_t *flts; // of flt_t
- flt_t *flt; // focused flt
- layer_t layer; // focused layer
- win_t *geom; // display size and position
+ list_t *cols; // of col_t
+ col_t *col; // focused col
+ list_t *flts; // of flt_t
+ flt_t *flt; // focused flt
+ layer_t layer; // focused layer
+ win_t *geom; // display size and position
} dpy_t;
typedef struct {
- list_t *dpys; // of dpy_t
- dpy_t *dpy; // focused dpy
- int name; // tag name
+ list_t *dpys; // of dpy_t
+ dpy_t *dpy; // focused dpy
+ char name[64]; // tag name
} tag_t;
typedef struct {
- list_t *tags; // of tag_t
- tag_t *tag; // focused tag
- win_t *root; // root/background window
- list_t *screens; // display geometry
+ list_t *tags; // of tag_t
+ tag_t *tag; // focused tag
+ win_t *root; // root/background window
+ list_t *screens; // display geometry
} wm_t;
#define WIN(node) ((win_t*)(node)->data)
static layer_t move_layer;
static struct { int v, h; } move_dir;
+/* Prototypes */
+void wm_update(void);
+
/********************
* Helper functions *
********************/
{
for (list_t *ltag = wm->tags; ltag; ltag = ltag->next) {
tag_t *tag = ltag->data;
- printf("tag: <%-9p [%p->%p] >%-9p d=%-9p - %d\n",
+ printf("tag: <%-9p [%p->%p] >%-9p d=%-9p - %s\n",
ltag->prev, ltag, ltag->data, ltag->next,
tag->dpy, tag->name);
for (list_t *ldpy = tag->dpys; ldpy; ldpy = ldpy->next) {
}
/* Allocate a new tag */
-static tag_t *tag_new(list_t *screens, int name)
+static tag_t *tag_new(list_t *screens, const char *name)
{
tag_t *tag = new0(tag_t);
- tag->name = name;
+ strncpy(tag->name, name, sizeof(tag->name));
for (list_t *cur = screens; cur; cur = cur->next) {
dpy_t *dpy = new0(dpy_t);
dpy->geom = cur->data;
/* Search for a tag
* If it does not exist it is based on the
* display geometry in wm->screens */
-static tag_t *tag_find(int name)
+static tag_t *tag_find(const char *name)
{
tag_t *tag = NULL;
for (list_t *cur = wm->tags; cur; cur = cur->next)
- if (name == TAG(cur)->name) {
+ if (!strcmp(name, TAG(cur)->name)) {
tag = cur->data;
break;
}
/* Move the window from the current tag to the new tag
* Unlike wmii, only remove the current tag, not all tags */
-static void tag_set(win_t *win, int name)
+static void tag_set(win_t *win, const char *name)
{
- printf("tag_set: %p %d\n", win, name);
- if (wm_tag->name == name)
+ printf("tag_set: %p %s\n", win, name);
+ if (!strcmp(wm_tag->name, name))
return;
tag_t *tag = tag_find(name);
layer_t layer = cut_win(win, wm_tag);
}
/* Switch to a different tag */
-static void tag_switch(int name)
+static void tag_switch(const char *name)
{
- printf("tag_switch: %d\n", name);
+ printf("tag_switch: %s\n", name);
tag_t *old = wm_tag;
if ((wm_col == NULL || wm_row == NULL) && wm_flt == NULL) {
while (old->dpys) {
}
}
-/*******************************
- * Window management functions *
- *******************************/
+/* Refresh the window layout */
void wm_update(void)
{
/* Updates window sizes */
set_focus(wm_focus);
}
+/*******************************
+ * Window management functions *
+ *******************************/
int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr)
{
if (!win || win == wm_dpy->geom) return 0;
if (EV_MOUSE0 <= ev && ev <= EV_MOUSE7) {
if (ev == EV_MOUSE1 && !mod.MODKEY && !mod.up)
return raise_float(win), 0;
+ if ((ev == EV_MOUSE3 && mod.MODKEY && !mod.up) ||
+ (ev == EV_MOUSE1 && mod.MODKEY && !mod.up && mod.shift))
+ return set_move(win,ptr,RESIZE), 1;
if (ev == EV_MOUSE1 && mod.MODKEY && !mod.up)
return set_move(win,ptr,MOVE), 1;
- if (ev == EV_MOUSE3 && mod.MODKEY && !mod.up)
- return set_move(win,ptr,RESIZE), 1;
if (move_mode != NONE && mod.up)
return set_move(win,ptr,NONE), 1;
if (ev == EV_MOUSE1 && !mod.up && win->state == ST_SHADE)
/* Tag switching */
if (mod.MODKEY && '0' <= ev && ev <= '9') {
- int name = ev - '0';
+ char name[] = {ev, '\0'};
if (mod.shift)
tag_set(win, name);
else
printf("wm_insert: %p\n", win);
print_txt();
+ /* Check for toolbars */
+ if (win->type == TYPE_TOOLBAR)
+ return wm_update();
+
/* Initialize window */
win->wm = new0(win_wm_t);
sys_watch(win, EV_ENTER, MOD());
sys_watch(win, EV_FOCUS, MOD());
/* Add to screen */
+ if (win->type == TYPE_DIALOG || win->parent)
+ wm_dpy->layer = FLOATING;
put_win(win, wm_tag, wm_dpy->layer);
/* Arrange */
{
printf("wm_remove: %p\n", win);
print_txt();
+ if (win->type == TYPE_TOOLBAR)
+ return wm_update();
for (list_t *tag = wm->tags; tag; tag = tag->next)
cut_win(win, tag->data);
free(win->wm);
wm = new0(wm_t);
wm->root = root;
wm->screens = list_sort(sys_info(root), 0, sort_win);
- wm->tag = tag_new(wm->screens, 1);
+ wm->tag = tag_new(wm->screens, "1");
wm->tags = list_insert(NULL, wm->tag);
event_t ev_e[] = {EV_ENTER, EV_FOCUS};
event_t ev_s[] = {'h', 'j', 'k', 'l', 'c', 'q', ' ',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ EV_MOUSE1, EV_MOUSE3};
event_t ev_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't', 'f', ' ',
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
EV_F1, EV_F2, EV_F3, EV_F4, EV_F5, EV_F6,
projects / wmpus / blobdiff