e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use "filler" border in stead of zoom masks when zooming. 

SVN revision: 50351
This commit is contained in:
Kim Woelders 2010-07-18 18:52:54 +00:00
parent c76a25ec82
commit c24755d012
4 changed files with 43 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/borders.c
View File

@ -1296,14 +1296,22 @@ BorderConfigLoad(FILE * fs)
}
Border *
BorderCreateFiller(int left, int right, int top, int bottom)
BorderCreateFiller(int w, int h, int sw, int sh)
{
Border *b;
int left, right, top, bottom;
b = BorderCreate("__FILLER");
if (!b)
return b;
left = (sw - w) / 2;
left = (left < 0) ? 0 : left;
right = sw - w - left;
top = (sh - h) / 2;
top = (top < 0) ? 0 : top;
bottom = sh - h - top;
b->throwaway = 1;
b->border.left = left;

5
src/borders.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -96,8 +96,7 @@ void EwinBorderChange(EWin * ewin, const Border * b, int normal);
void EwinBorderSetInitially(EWin * ewin, const char *name);
int BorderWinpartIndex(EWin * ewin, Win win);
void BorderCheckState(EWin * ewin, XEvent * ev);
Border *BorderCreateFiller(int left, int right, int top,
int bottom);
Border *BorderCreateFiller(int w, int h, int sw, int sh);
void BordersForeach(void (*func) (Border * b, void *data),
void *data);
Border **BordersGetList(int *pnum);

10
src/ewin-ops.c
View File

@ -1286,6 +1286,8 @@ EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
if (ewin->state.fullscreen == (unsigned)on)
return;
if (ewin->state.zoomed)
return;
if (on)
{
@ -1309,13 +1311,7 @@ EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
}
else
{
int l, t;
l = (w - ww) / 2;
l = (l < 0) ? 0 : l;
t = (h - hh) / 2;
t = (t < 0) ? 0 : t;
b = BorderCreateFiller(l, w - ww - l, t, h - hh - t);
b = BorderCreateFiller(ww, hh, w, h);
w = ww;
h = hh;
}

88
src/zoom.c
View File

@ -23,10 +23,11 @@
*/
#include "E.h"
#include "ewins.h"
#include "focus.h"
#include "xwin.h"
#ifdef WITH_ZOOM
#include "borders.h"
#include "focus.h"
#include "xwin.h"
#include <X11/extensions/xf86vmode.h>
#if USE_XRANDR
#include <X11/extensions/Xrandr.h>
@ -36,12 +37,7 @@ static int std_vid_modes_num = 0;
static int std_vid_mode_cur = 0;
static XF86VidModeModeInfo **std_vid_modes = NULL;
static Win zoom_mask_1 = 0;
static Win zoom_mask_2 = 0;
static Win zoom_mask_3 = 0;
static Win zoom_mask_4 = 0;
static EWin *zoom_last_ewin = NULL;
static int zoom_last_x, zoom_last_y;
static signed char zoom_can = 0;
static XF86VidModeModeInfo *
@ -189,22 +185,6 @@ ZoomInit(void)
zoom_can = 1;
}
static Win
ZoomMask(int x, int y, int w, int h)
{
Win win;
if (x < 0 || y < 0 || w <= 0 || h <= 0)
return 0;
win = ECreateWindow(VROOT, x, y, w, h, 0);
ESetWindowBackground(win, Dpy.pixel_black);
ERaiseWindow(win);
EMapWindow(win);
return win;
}
void
Zoom(EWin * ewin, int on)
{
@ -218,36 +198,37 @@ Zoom(EWin * ewin, int on)
if (!on)
{
if (zoom_last_ewin)
{
ewin = zoom_last_ewin;
/* XUngrabPointer(disp, CurrentTime); */
EwinMove(ewin, zoom_last_x, zoom_last_y);
if (zoom_mask_1)
EDestroyWindow(zoom_mask_1);
if (zoom_mask_2)
EDestroyWindow(zoom_mask_2);
if (zoom_mask_3)
EDestroyWindow(zoom_mask_3);
if (zoom_mask_4)
EDestroyWindow(zoom_mask_4);
SwitchRes(0, 0, 0, 0, 0);
EwinWarpTo(ewin, 1);
ewin->state.zoomed = 0;
ESync(0);
zoom_last_ewin = NULL;
}
/* Unzoom */
if (ewin && ewin != zoom_last_ewin)
return;
ewin = zoom_last_ewin;
if (!ewin)
return;
zoom_last_ewin = NULL;
SwitchRes(0, 0, 0, 0, 0);
EwinBorderSetTo(ewin, ewin->normal_border);
EwinMoveResize(ewin, ewin->save_fs.x, ewin->save_fs.y,
ewin->client.w, ewin->client.h);
ewin->state.zoomed = 0;
EwinWarpTo(ewin, 1);
ESync(0);
return;
}
if (ewin->state.fullscreen)
return;
mode = SwitchRes(1, 0, 0, ewin->client.w, ewin->client.h);
if (mode)
{
int x1, y1, x2, y2, bl, br, bt, bb, dw, dh;
int x1, y1, x2, y2, dw, dh;
zoom_last_ewin = ewin;
zoom_last_x = EoGetX(ewin);
zoom_last_y = EoGetY(ewin);
ewin->save_fs.x = EoGetX(ewin);
ewin->save_fs.y = EoGetY(ewin);
#if USE_XRANDR
if ((Mode.screen.rotation == RR_Rotate_90) ||
(Mode.screen.rotation == RR_Rotate_270))
@ -274,23 +255,12 @@ Zoom(EWin * ewin, int on)
if (y2 < 0)
y2 = 0;
EwinRaise(ewin);
EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
EwinMove(ewin, -bl + x1, -bt + y1);
EwinBorderSetTo(ewin, BorderCreateFiller(ewin->client.w,
ewin->client.h, dw, dh));
EwinMoveResize(ewin, 0, 0, ewin->client.w, ewin->client.h);
ewin->state.zoomed = 1;
FocusToEWin(ewin, FOCUS_SET);
EwinWarpTo(ewin, 1);
#if 0 /* Doesn't work as intended */
XGrabPointer(disp, EwinGetClientXwin(ewin), True,
ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | ButtonMotionMask |
EnterWindowMask | LeaveWindowMask,
GrabModeAsync, GrabModeAsync,
EwinGetClientXwin(ewin), None, CurrentTime);
#endif
zoom_mask_1 = ZoomMask(0, 0, x1, dh);
zoom_mask_2 = ZoomMask(0, 0, dw, y1);
zoom_mask_3 = ZoomMask(x1 + ewin->client.w, 0, x2, dh);
zoom_mask_4 = ZoomMask(0, y1 + ewin->client.h, dw, y2);
ESync(0);
}
}