sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sizehints', fixed issue #78

This commit is contained in:
Bert Münnich 2013-02-09 19:07:29 +01:00
parent a527025314 1e2ddc44d8
commit c6bfac1566
4 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION = git-20130208 VERSION = git-20130209
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man MANPREFIX = $(PREFIX)/share/man

1
main.c
View File

@ -26,7 +26,6 @@
#include <sys/select.h> #include <sys/select.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "types.h" #include "types.h"

73
window.c
View File

@ -21,7 +21,6 @@
#include <string.h> #include <string.h>
#include <locale.h> #include <locale.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include "options.h" #include "options.h"
@ -127,6 +126,12 @@ void win_init(win_t *win)
win->bar.bgcol = win_alloc_color(win, BAR_BG_COLOR); win->bar.bgcol = win_alloc_color(win, BAR_BG_COLOR);
win->bar.fgcol = win_alloc_color(win, BAR_FG_COLOR); win->bar.fgcol = win_alloc_color(win, BAR_FG_COLOR);
win->sizehints.flags = PWinGravity;
win->sizehints.win_gravity = NorthWestGravity;
if (options->fixed_win)
/* actual min/max values set in win_update_sizehints() */
win->sizehints.flags |= PMinSize | PMaxSize;
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0) if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
warn("no locale support"); warn("no locale support");
@ -135,19 +140,24 @@ void win_init(win_t *win)
wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False); wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False);
} }
void win_set_sizehints(win_t *win) void win_update_sizehints(win_t *win)
{ {
XSizeHints sizehints;
if (win == NULL || win->xwin == None) if (win == NULL || win->xwin == None)
return; return;
sizehints.flags = PMinSize | PMaxSize; if ((win->sizehints.flags & USSize) != 0) {
sizehints.min_width = win->w; win->sizehints.width = win->w;
sizehints.max_width = win->w; win->sizehints.height = win->h;
sizehints.min_height = win->h + win->bar.h; }
sizehints.max_height = win->h + win->bar.h; if ((win->sizehints.flags & USPosition) != 0) {
XSetWMNormalHints(win->env.dpy, win->xwin, &sizehints); win->sizehints.x = win->x;
win->sizehints.y = win->y;
}
if (options->fixed_win) {
win->sizehints.min_width = win->sizehints.max_width = win->w;
win->sizehints.min_height = win->sizehints.max_height = win->h + win->bar.h;
}
XSetWMNormalHints(win->env.dpy, win->xwin, &win->sizehints);
} }
void win_open(win_t *win) void win_open(win_t *win)
@ -170,22 +180,35 @@ void win_open(win_t *win)
else else
gmask = XParseGeometry(options->geometry, &win->x, &win->y, gmask = XParseGeometry(options->geometry, &win->x, &win->y,
&win->w, &win->h); &win->w, &win->h);
if ((gmask & WidthValue) == 0) if ((gmask & WidthValue) != 0)
win->sizehints.flags |= USSize;
else
win->w = WIN_WIDTH; win->w = WIN_WIDTH;
if (win->w > e->scrw) if ((gmask & HeightValue) != 0)
win->w = e->scrw; win->sizehints.flags |= USSize;
if ((gmask & HeightValue) == 0) else
win->h = WIN_HEIGHT; win->h = WIN_HEIGHT;
if (win->h > e->scrh) if ((gmask & XValue) != 0) {
win->h = e->scrh; if ((gmask & XNegative) != 0) {
if ((gmask & XValue) == 0)
win->x = (e->scrw - win->w) / 2;
else if ((gmask & XNegative) != 0)
win->x += e->scrw - win->w; win->x += e->scrw - win->w;
if ((gmask & YValue) == 0) win->sizehints.win_gravity = NorthEastGravity;
win->y = (e->scrh - win->h) / 2; }
else if ((gmask & YNegative) != 0) win->sizehints.flags |= USPosition;
} else {
win->x = (e->scrw - win->w) / 2;
}
if ((gmask & YValue) != 0) {
if ((gmask & YNegative) != 0) {
win->y += e->scrh - win->h; win->y += e->scrh - win->h;
if (win->sizehints.win_gravity == NorthEastGravity)
win->sizehints.win_gravity = SouthEastGravity;
else
win->sizehints.win_gravity = SouthWestGravity;
}
win->sizehints.flags |= USPosition;
} else {
win->y = (e->scrh - win->h) / 2;
}
win->xwin = XCreateWindow(e->dpy, RootWindow(e->dpy, e->scr), win->xwin = XCreateWindow(e->dpy, RootWindow(e->dpy, e->scr),
win->x, win->y, win->w, win->h, 0, win->x, win->y, win->w, win->h, 0,
@ -224,8 +247,7 @@ void win_open(win_t *win)
win->h -= win->bar.h; win->h -= win->bar.h;
} }
if (options->fixed_win) win_update_sizehints(win);
win_set_sizehints(win);
XMapWindow(e->dpy, win->xwin); XMapWindow(e->dpy, win->xwin);
XFlush(e->dpy); XFlush(e->dpy);
@ -303,8 +325,7 @@ bool win_moveresize(win_t *win, int x, int y, unsigned int w, unsigned int h)
win->w = w; win->w = w;
win->h = h - win->bar.h; win->h = h - win->bar.h;
if (options->fixed_win) win_update_sizehints(win);
win_set_sizehints(win);
XMoveResizeWindow(win->env.dpy, win->xwin, x, y, w, h); XMoveResizeWindow(win->env.dpy, win->xwin, x, y, w, h);

3
window.h
View File

@ -20,6 +20,7 @@
#define WINDOW_H #define WINDOW_H
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "types.h" #include "types.h"
@ -48,6 +49,8 @@ typedef struct {
unsigned int h; /* = win height - bar height */ unsigned int h; /* = win height - bar height */
unsigned int bw; unsigned int bw;
XSizeHints sizehints;
bool fullscreen; bool fullscreen;
struct { struct {