瀏覽代碼

Do not keep track of fullscreen state

There is no more need for this after the removal of the special color handling
for fullscreen mode in commit 2886876.
master
Bert Münnich 5 年之前
父節點
當前提交
07300da7df
共有 3 個檔案被更改,包括 3 行新增53 行删除
  1. +1
    -1
      main.c
  2. +0
    -3
      sxiv.h
  3. +2
    -49
      window.c

+ 1
- 1
main.c 查看文件

@@ -774,7 +774,7 @@ void run(void)
} else {
tns.dirty = true;
}
if (!resized || win.fullscreen) {
if (!resized) {
redraw();
set_timeout(clear_resize, TO_REDRAW_RESIZE, false);
resized = true;


+ 0
- 3
sxiv.h 查看文件

@@ -385,7 +385,6 @@ enum {
ATOM__NET_WM_ICON,
ATOM__NET_WM_STATE,
ATOM__NET_WM_STATE_FULLSCREEN,
ATOM__NET_SUPPORTED,
ATOM_COUNT
};

@@ -417,8 +416,6 @@ struct win {
unsigned int h; /* = win height - bar height */
unsigned int bw;

bool fullscreen;

struct {
int w;
int h;


+ 2
- 49
window.c 查看文件

@@ -53,9 +53,6 @@ static int barheight;

Atom atoms[ATOM_COUNT];

static Bool fs_support;
static Bool fs_warned;

void win_init_font(const win_env_t *e, const char *fontstr)
{
if ((font = XftFontOpenName(e->dpy, e->scr, fontstr)) == NULL)
@@ -74,36 +71,6 @@ void win_alloc_color(const win_env_t *e, const char *name, XftColor *col)
}
}

void win_check_wm_support(Display *dpy, Window root)
{
int format;
long offset = 0, length = 16;
Atom *data, type;
unsigned long i, nitems, bytes_left;
Bool found = False;

while (!found && length > 0) {
if (XGetWindowProperty(dpy, root, atoms[ATOM__NET_SUPPORTED],
offset, length, False, XA_ATOM, &type, &format,
&nitems, &bytes_left, (unsigned char**) &data))
{
break;
}
if (type == XA_ATOM && format == 32) {
for (i = 0; i < nitems; i++) {
if (data[i] == atoms[ATOM__NET_WM_STATE_FULLSCREEN]) {
found = True;
fs_support = True;
break;
}
}
}
XFree(data);
offset += nitems;
length = MIN(length, bytes_left / 4);
}
}

const char* win_res(Display *dpy, const char *name, const char *def)
{
char *type;
@@ -170,9 +137,6 @@ void win_init(win_t *win)
INIT_ATOM_(_NET_WM_ICON);
INIT_ATOM_(_NET_WM_STATE);
INIT_ATOM_(_NET_WM_STATE_FULLSCREEN);
INIT_ATOM_(_NET_SUPPORTED);

win_check_wm_support(e->dpy, RootWindow(e->dpy, e->scr));
}

void win_open(win_t *win)
@@ -188,7 +152,6 @@ void win_open(win_t *win)
Pixmap none;
int gmask;
XSizeHints sizehints;
Bool fullscreen = options->fullscreen && fs_support;

e = &win->env;
parent = options->embed != 0 ? options->embed : RootWindow(e->dpy, e->scr);
@@ -300,7 +263,7 @@ void win_open(win_t *win)
XMapWindow(e->dpy, win->xwin);
XFlush(e->dpy);

if (fullscreen)
if (options->fullscreen)
win_toggle_fullscreen(win);
}

@@ -337,15 +300,6 @@ void win_toggle_fullscreen(win_t *win)
XEvent ev;
XClientMessageEvent *cm;

if (!fs_support) {
if (!fs_warned) {
error(0, 0, "No fullscreen support");
fs_warned = True;
}
return;
}
win->fullscreen = !win->fullscreen;

memset(&ev, 0, sizeof(ev));
ev.type = ClientMessage;

@@ -353,9 +307,8 @@ void win_toggle_fullscreen(win_t *win)
cm->window = win->xwin;
cm->message_type = atoms[ATOM__NET_WM_STATE];
cm->format = 32;
cm->data.l[0] = win->fullscreen;
cm->data.l[0] = 2; // toggle
cm->data.l[1] = atoms[ATOM__NET_WM_STATE_FULLSCREEN];
cm->data.l[2] = cm->data.l[3] = 0;

XSendEvent(win->env.dpy, DefaultRootWindow(win->env.dpy), False,
SubstructureNotifyMask | SubstructureRedirectMask, &ev);


Loading…
取消
儲存