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

Simplify ZoomInit(), make static. 

SVN revision: 50349
This commit is contained in:
Kim Woelders 2010-07-18 18:52:50 +00:00
parent a32381ce55
commit 5bdd90c22e
3 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ewins.h
View File

@ -478,7 +478,6 @@ int EwinListStackIsRaised(const EWin * ewin);
EWin *GetZoomEWin(void);
void ReZoom(EWin * ewin);
char InZoom(void);
void ZoomInit(void);
void Zoom(EWin * ewin);
#endif /* _EWIN_H_ */

1
src/setup.c
View File

@ -232,5 +232,4 @@ SetupX(const char *dstr)
}
ScreenInit();
ZoomInit();
}

50
src/zoom.c
View File

@ -42,14 +42,7 @@ 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 char zoom_can = 0;
static void
FillStdVidModes(void)
{
XF86VidModeGetAllModeLines(disp, Dpy.screen,
&std_vid_modes_num, &std_vid_modes);
}
static signed char zoom_can = 0;
static XF86VidModeModeInfo *
FindMode(int w, int h)
@ -169,17 +162,6 @@ SwitchRes(char inout, int x, int y, int w, int h)
return mode;
}
static char
XHasDGA(void)
{
int ev_base, er_base;
if (XF86VidModeQueryExtension(disp, &ev_base, &er_base))
return 1;
else
return 0;
}
EWin *
GetZoomEWin(void)
{
@ -204,15 +186,21 @@ InZoom(void)
return 0;
}
void
static void
ZoomInit(void)
{
if (XHasDGA())
{
FillStdVidModes();
if (std_vid_modes_num > 1)
zoom_can = 1;
}
int ev_base, er_base;
zoom_can = -1;
if (!XF86VidModeQueryExtension(disp, &ev_base, &er_base))
return;
XF86VidModeGetAllModeLines(disp, Dpy.screen,
&std_vid_modes_num, &std_vid_modes);
if (std_vid_modes_num > 1)
zoom_can = 1;
}
static Win
@ -236,7 +224,10 @@ Zoom(EWin * ewin)
{
const XF86VidModeModeInfo *mode;
if (!zoom_can)
if (zoom_can == 0)
ZoomInit();
if (zoom_can <= 0)
return;
if (!ewin)
@ -336,11 +327,6 @@ InZoom(void)
return 0;
}
void
ZoomInit(void)
{
}
void
Zoom(EWin * ewin)
{