Sat Mar 25 20:51:51 PST 2000
(Mandrake) more xinerama support. This time settings dialogs pop up centered on the current head if there isn't a settings dialog already open. Next - edge resistance between heads. SVN revision: 2336
This commit is contained in:
parent
4aff4646d6
commit
2e2ac95de5
|
@ -4459,3 +4459,12 @@ Sat Mar 25 18:17:32 PST 2000
|
|||
(Mandrake)
|
||||
|
||||
oops, left a debugging printf in arrange.c
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Sat Mar 25 20:51:51 PST 2000
|
||||
(Mandrake)
|
||||
|
||||
more xinerama support. This time settings dialogs pop up centered on the
|
||||
current head if there isn't a settings dialog already open.
|
||||
Next - edge resistance between heads.
|
||||
|
|
|
@ -1181,11 +1181,11 @@ doMoveEnd(void *params)
|
|||
if (gwins[i]->floating)
|
||||
MoveEwinToDesktopAt(gwins[i], d,
|
||||
gwins[i]->x - (desks.desk[d].x -
|
||||
desks.
|
||||
desk[gwins[i]->desktop].x),
|
||||
desks.desk[gwins[i]->
|
||||
desktop].x),
|
||||
gwins[i]->y - (desks.desk[d].y -
|
||||
desks.
|
||||
desk[gwins[i]->desktop].y));
|
||||
desks.desk[gwins[i]->
|
||||
desktop].y));
|
||||
else
|
||||
MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y);
|
||||
gwins[i]->floating = 0;
|
||||
|
|
24
src/areas.c
24
src/areas.c
|
@ -357,13 +357,13 @@ SetCurrentArea(int ax, int ay)
|
|||
lst[i]->x -
|
||||
(root.w *
|
||||
(ax -
|
||||
desks.desk[desks.
|
||||
current].current_area_x)),
|
||||
desks.desk[desks.current].
|
||||
current_area_x)),
|
||||
lst[i]->y -
|
||||
(root.h *
|
||||
(ay -
|
||||
desks.desk[desks.
|
||||
current].current_area_y)));
|
||||
desks.desk[desks.current].
|
||||
current_area_y)));
|
||||
if (setflip)
|
||||
mode.flipp = 0;
|
||||
lst[i]->area_x = a1;
|
||||
|
@ -394,13 +394,13 @@ SetCurrentArea(int ax, int ay)
|
|||
x -
|
||||
(root.w *
|
||||
(ax -
|
||||
desks.desk[desks.current].
|
||||
current_area_x)),
|
||||
desks.desk[desks.
|
||||
current].current_area_x)),
|
||||
y -
|
||||
(root.h *
|
||||
(ay -
|
||||
desks.desk[desks.current].
|
||||
current_area_y)));
|
||||
desks.desk[desks.
|
||||
current].current_area_y)));
|
||||
}
|
||||
}
|
||||
/* if we're not moving it... move it across */
|
||||
|
@ -419,13 +419,13 @@ SetCurrentArea(int ax, int ay)
|
|||
lst[i]->x -
|
||||
(root.w *
|
||||
(ax -
|
||||
desks.desk[desks.
|
||||
current].current_area_x)),
|
||||
desks.desk[desks.current].
|
||||
current_area_x)),
|
||||
lst[i]->y -
|
||||
(root.h *
|
||||
(ay -
|
||||
desks.desk[desks.
|
||||
current].current_area_y)));
|
||||
desks.desk[desks.current].
|
||||
current_area_y)));
|
||||
if (setflip)
|
||||
mode.flipp = 0;
|
||||
lst[i]->area_x = a1;
|
||||
|
|
|
@ -989,8 +989,57 @@ ArrangeEwin(EWin * ewin)
|
|||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAS_XINERAMA
|
||||
if (xinerama_active)
|
||||
{
|
||||
Window rt, ch;
|
||||
XineramaScreenInfo *screens;
|
||||
int pointer_x, pointer_y;
|
||||
int num;
|
||||
int d;
|
||||
unsigned int ud;
|
||||
|
||||
XQueryPointer(disp, root.win, &rt, &ch, &pointer_x, &pointer_y,
|
||||
&d, &d, &ud);
|
||||
screens = XineramaQueryScreens(disp, &num);
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
if (pointer_x >= screens[i].x_org)
|
||||
{
|
||||
if (pointer_x <=
|
||||
(screens[i].width + screens[i].x_org))
|
||||
{
|
||||
if (pointer_y >= screens[i].y_org)
|
||||
{
|
||||
if (pointer_y <= (screens[i].height +
|
||||
screens[i].y_org))
|
||||
{
|
||||
ewin->x =
|
||||
((screens[i].width - ewin->w) /
|
||||
2) + screens[i].x_org;
|
||||
ewin->y =
|
||||
((screens[i].height - ewin->h) /
|
||||
2) + screens[i].y_org;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
XFree(screens);
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif
|
||||
ewin->x = (root.w - ewin->w) >> 1;
|
||||
ewin->y = (root.h - ewin->h) >> 1;
|
||||
#ifdef HAS_XINERAMA
|
||||
}
|
||||
printf("setting it to %d %d\n", ewin->x, ewin->y);
|
||||
fflush(stdout);
|
||||
#endif
|
||||
}
|
||||
MoveEwin(ewin, ewin->x, ewin->y);
|
||||
}
|
||||
|
|
|
@ -630,8 +630,60 @@ AddToFamily(Window win)
|
|||
}
|
||||
else
|
||||
{
|
||||
x = (root.w - ewin->w) >> 1;
|
||||
y = (root.h - ewin->h) >> 1;
|
||||
#ifdef HAS_XINERAMA
|
||||
if (xinerama_active)
|
||||
{
|
||||
Window rt, ch;
|
||||
XineramaScreenInfo *screens;
|
||||
int pointer_x, pointer_y;
|
||||
int num;
|
||||
int d;
|
||||
unsigned int ud;
|
||||
|
||||
XQueryPointer(disp, root.win, &rt, &ch, &pointer_x,
|
||||
&pointer_y, &d, &d, &ud);
|
||||
screens = XineramaQueryScreens(disp, &num);
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
if (pointer_x >= screens[i].x_org)
|
||||
{
|
||||
if (pointer_x <=
|
||||
(screens[i].width + screens[i].x_org))
|
||||
{
|
||||
if (pointer_y >= screens[i].y_org)
|
||||
{
|
||||
if (pointer_y <= (screens[i].height +
|
||||
screens[i].y_org))
|
||||
{
|
||||
ewin->x =
|
||||
((screens[i].width - ewin->w)
|
||||
/ 2) + screens[i].x_org;
|
||||
ewin->y =
|
||||
((screens
|
||||
[i].height -
|
||||
ewin->h) / 2) +
|
||||
screens[i].y_org;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
XFree(screens);
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif
|
||||
ewin->x = (root.w - ewin->w) >> 1;
|
||||
ewin->y = (root.h - ewin->h) >> 1;
|
||||
#ifdef HAS_XINERAMA
|
||||
}
|
||||
printf("setting it to %d %d\n", ewin->x, ewin->y);
|
||||
fflush(stdout);
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -2852,8 +2904,8 @@ ShadeEwin(EWin * ewin)
|
|||
EMoveResizeWindow(disp, ewin->win_container,
|
||||
ewin->border->border.left,
|
||||
ewin->border->border.top, ww, hh);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
|
@ -2908,8 +2960,8 @@ ShadeEwin(EWin * ewin)
|
|||
EMoveResizeWindow(disp, ewin->win_container,
|
||||
ewin->border->border.left,
|
||||
ewin->border->border.top, ww, hh);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
|
@ -2962,8 +3014,8 @@ ShadeEwin(EWin * ewin)
|
|||
EMoveResizeWindow(disp, ewin->win_container,
|
||||
ewin->border->border.left,
|
||||
ewin->border->border.top, ww, hh);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
|
@ -3019,8 +3071,8 @@ ShadeEwin(EWin * ewin)
|
|||
EMoveResizeWindow(disp, ewin->win_container,
|
||||
ewin->border->border.left,
|
||||
ewin->border->border.top, ww, hh);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
|
@ -3118,16 +3170,16 @@ UnShadeEwin(EWin * ewin)
|
|||
ewin->border->border.top,
|
||||
ewin->w - ewin->border->border.left -
|
||||
ewin->border->border.right, ewin->client.h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
ShapeBounding,
|
||||
-(ewin->client.w -
|
||||
(ewin->w - ewin->border->border.left -
|
||||
ewin->border->border.right)),
|
||||
0,
|
||||
(ewin->w -
|
||||
ewin->border->border.left -
|
||||
ewin->border->border.right)), 0,
|
||||
ewin->client.win, ShapeBounding,
|
||||
ShapeSet);
|
||||
PropagateShapes(ewin->win);
|
||||
|
@ -3180,8 +3232,8 @@ UnShadeEwin(EWin * ewin)
|
|||
ewin->border->border.top,
|
||||
ewin->w - ewin->border->border.left -
|
||||
ewin->border->border.right, ewin->client.h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
|
@ -3236,15 +3288,16 @@ UnShadeEwin(EWin * ewin)
|
|||
ewin->border->border.top, ewin->client.w,
|
||||
ewin->h - ewin->border->border.top -
|
||||
ewin->border->border.bottom);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y, ewin->w,
|
||||
ewin->h);
|
||||
EMoveResizeWindow(disp, ewin->win, ewin->x, ewin->y,
|
||||
ewin->w, ewin->h);
|
||||
CalcEwinSizes(ewin);
|
||||
if (ewin->client.shaped)
|
||||
EShapeCombineShape(disp, ewin->win_container,
|
||||
ShapeBounding,
|
||||
0,
|
||||
-(ewin->client.h -
|
||||
(ewin->h - ewin->border->border.top -
|
||||
(ewin->h -
|
||||
ewin->border->border.top -
|
||||
ewin->border->border.bottom)),
|
||||
ewin->client.win, ShapeBounding,
|
||||
ShapeSet);
|
||||
|
|
136
src/dialog.c
136
src/dialog.c
|
@ -437,8 +437,7 @@ DialogActivateButton(Window win, int inclick)
|
|||
if (!d)
|
||||
return;
|
||||
if ((d->button[bnum]->hilited) && (d->button[bnum]->clicked) &&
|
||||
(inclick == 3))
|
||||
doact = 1;
|
||||
(inclick == 3)) doact = 1;
|
||||
if (inclick == 0)
|
||||
d->button[bnum]->hilited = 1;
|
||||
if (inclick == 1)
|
||||
|
@ -613,8 +612,66 @@ ShowDialog(Dialog * d)
|
|||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAS_XINERAMA
|
||||
if (xinerama_active)
|
||||
{
|
||||
Window rt, ch;
|
||||
int d;
|
||||
unsigned int ud;
|
||||
int pointer_x, pointer_y;
|
||||
int num;
|
||||
XineramaScreenInfo *screens;
|
||||
|
||||
XQueryPointer(disp, root.win, &rt, &ch, &pointer_x,
|
||||
&pointer_y, &d, &d, &ud);
|
||||
screens = XineramaQueryScreens(disp, &num);
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
if (pointer_x >= screens[i].x_org)
|
||||
{
|
||||
if (pointer_x <=
|
||||
(screens[i].width +
|
||||
screens[i].x_org))
|
||||
{
|
||||
if (pointer_y >=
|
||||
screens[i].y_org)
|
||||
{
|
||||
if (pointer_y <=
|
||||
(screens[i].height +
|
||||
screens[i].y_org))
|
||||
{
|
||||
ewin->x =
|
||||
((screens
|
||||
[i].width -
|
||||
ewin->w) / 2) +
|
||||
screens[i].x_org;
|
||||
ewin->y =
|
||||
((screens
|
||||
[i].height -
|
||||
ewin->h) / 2) +
|
||||
screens[i].y_org;
|
||||
MoveEwin(ewin,
|
||||
ewin->x,
|
||||
ewin->y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
XFree(screens);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif
|
||||
MoveEwin(ewin, ((root.w - (ewin->w)) / 2),
|
||||
((root.h - (ewin->h)) / 2));
|
||||
#ifdef HAS_XINERAMA
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -626,8 +683,63 @@ ShowDialog(Dialog * d)
|
|||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAS_XINERAMA
|
||||
if (xinerama_active)
|
||||
{
|
||||
Window rt, ch;
|
||||
int d;
|
||||
unsigned int ud;
|
||||
int pointer_x, pointer_y;
|
||||
int num;
|
||||
XineramaScreenInfo *screens;
|
||||
|
||||
XQueryPointer(disp, root.win, &rt, &ch, &pointer_x,
|
||||
&pointer_y, &d, &d, &ud);
|
||||
screens = XineramaQueryScreens(disp, &num);
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
if (pointer_x >= screens[i].x_org)
|
||||
{
|
||||
if (pointer_x <=
|
||||
(screens[i].width + screens[i].x_org))
|
||||
{
|
||||
if (pointer_y >= screens[i].y_org)
|
||||
{
|
||||
if (pointer_y <=
|
||||
(screens[i].height +
|
||||
screens[i].y_org))
|
||||
{
|
||||
ewin->x =
|
||||
((screens
|
||||
[i].width -
|
||||
ewin->w) / 2) +
|
||||
screens[i].x_org;
|
||||
ewin->y =
|
||||
((screens
|
||||
[i].height -
|
||||
ewin->h) / 2) +
|
||||
screens[i].y_org;
|
||||
MoveEwin(ewin, ewin->x,
|
||||
ewin->y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
XFree(screens);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif
|
||||
MoveEwin(ewin, ((root.w - (ewin->w)) / 2),
|
||||
((root.h - (ewin->h)) / 2));
|
||||
#ifdef HAS_XINERAMA
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
RestackEwin(ewin);
|
||||
|
@ -1349,13 +1461,15 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
|||
(((sh - (dii->padding.top + dii->padding.bottom)
|
||||
- dii->h) * dii->align_v) >> 10);
|
||||
if (dii->win)
|
||||
EMoveResizeWindow(disp, dii->win, dii->x, dii->y,
|
||||
dii->w, dii->h);
|
||||
EMoveResizeWindow(disp, dii->win, dii->x,
|
||||
dii->y, dii->w, dii->h);
|
||||
if (dii->type == DITEM_CHECKBUTTON)
|
||||
EMoveResizeWindow(disp,
|
||||
dii->item.check_button.check_win,
|
||||
dii->x, dii->y +
|
||||
((dii->h -
|
||||
dii->x,
|
||||
dii->y +
|
||||
((dii->h
|
||||
-
|
||||
dii->item.
|
||||
check_button.check_orig_h) /
|
||||
2),
|
||||
|
@ -1366,8 +1480,10 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
|||
if (dii->type == DITEM_RADIOBUTTON)
|
||||
EMoveResizeWindow(disp,
|
||||
dii->item.radio_button.radio_win,
|
||||
dii->x, dii->y +
|
||||
((dii->h -
|
||||
dii->x,
|
||||
dii->y +
|
||||
((dii->h
|
||||
-
|
||||
dii->item.
|
||||
radio_button.radio_orig_h) /
|
||||
2),
|
||||
|
@ -1598,8 +1714,8 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h)
|
|||
if (di->item.slider.border_win)
|
||||
IclassApply(di->item.slider.ic_border,
|
||||
di->item.slider.border_win,
|
||||
di->item.slider.border_w, di->item.slider.border_h,
|
||||
0, 0, STATE_NORMAL, 0);
|
||||
di->item.slider.border_w,
|
||||
di->item.slider.border_h, 0, 0, STATE_NORMAL, 0);
|
||||
state = STATE_NORMAL;
|
||||
if ((di->hilited) && (di->clicked))
|
||||
state = STATE_CLICKED;
|
||||
|
|
|
@ -494,7 +494,8 @@ HandleMotion(XEvent * ev)
|
|||
(gwins
|
||||
[i]->reqx,
|
||||
gwins[i]->x,
|
||||
mode.edge_snap_dist)))))))
|
||||
mode.
|
||||
edge_snap_dist)))))))
|
||||
{
|
||||
jumpx = 1;
|
||||
ndx = gwins[i]->reqx - gwins[i]->x + dx;
|
||||
|
@ -517,7 +518,8 @@ HandleMotion(XEvent * ev)
|
|||
(gwins
|
||||
[i]->reqy,
|
||||
gwins[i]->y,
|
||||
mode.edge_snap_dist)))))))
|
||||
mode.
|
||||
edge_snap_dist)))))))
|
||||
{
|
||||
jumpy = 1;
|
||||
ndy = gwins[i]->reqy - gwins[i]->y + dy;
|
||||
|
@ -980,8 +982,8 @@ HandleMotion(XEvent * ev)
|
|||
{
|
||||
di->item.slider.wanted_val += dy;
|
||||
di->item.slider.val = di->item.slider.lower +
|
||||
((((di->item.
|
||||
slider.base_h - di->item.slider.knob_h -
|
||||
((((di->
|
||||
item.slider.base_h - di->item.slider.knob_h -
|
||||
di->item.slider.wanted_val) *
|
||||
(di->item.slider.upper -
|
||||
di->item.slider.lower)) /
|
||||
|
@ -2507,13 +2509,13 @@ HandleMouseUp(XEvent * ev)
|
|||
HideEwin(gwins[i]);
|
||||
MoveEwin(gwins[i], gwin_px[i] +
|
||||
((desks.desk
|
||||
[gwins[i]->
|
||||
desktop].current_area_x) -
|
||||
[gwins[i]->desktop].
|
||||
current_area_x) -
|
||||
p->hi_ewin->area_x) * root.w,
|
||||
gwin_py[i] +
|
||||
((desks.desk
|
||||
[gwins[i]->
|
||||
desktop].current_area_y) -
|
||||
((desks.
|
||||
desk[gwins[i]->desktop].
|
||||
current_area_y) -
|
||||
p->hi_ewin->area_y) * root.h);
|
||||
if (was_shaded != gwins[i]->shaded)
|
||||
InstantShadeEwin(gwins[i]);
|
||||
|
|
|
@ -263,8 +263,7 @@ cp(char *s, char *ss)
|
|||
EDBUG_RETURN_;
|
||||
}
|
||||
|
||||
time_t
|
||||
moddate(char *s)
|
||||
time_t moddate(char *s)
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
|
|
|
@ -1745,8 +1745,8 @@ IPC_ImageClass(char *params, Client * c)
|
|||
if (iclass->norm.normal->real_file)
|
||||
im =
|
||||
Imlib_load_image(id,
|
||||
iclass->norm.
|
||||
normal->real_file);
|
||||
iclass->norm.normal->
|
||||
real_file);
|
||||
if (im)
|
||||
{
|
||||
Esnprintf(buf, sizeof(buf),
|
||||
|
|
|
@ -277,7 +277,8 @@ ShowMenu(Menu * m, char noshow)
|
|||
*
|
||||
* *
|
||||
* * *
|
||||
* * * * from appearing offscreen */
|
||||
* * * *
|
||||
* * * * * from appearing offscreen */
|
||||
unsigned int w, h, mw, mh;
|
||||
|
||||
EDBUG(5, "ShowMenu");
|
||||
|
|
|
@ -126,8 +126,7 @@ GetNetText(char *URL)
|
|||
|
||||
}
|
||||
|
||||
time_t
|
||||
GetNetFileDate(char *URL)
|
||||
time_t GetNetFileDate(char *URL)
|
||||
{
|
||||
|
||||
#ifdef AUTOUPGRADE
|
||||
|
|
|
@ -37,8 +37,7 @@ static Window sc_window = 0;
|
|||
static Atom sc_atom = 0;
|
||||
static ImlibData *imd = NULL;
|
||||
|
||||
Window
|
||||
SC_GetDestWin(void)
|
||||
Window SC_GetDestWin(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -751,7 +751,8 @@ SetupEnv()
|
|||
return;
|
||||
}
|
||||
|
||||
Window MakeExtInitWin(void)
|
||||
Window
|
||||
MakeExtInitWin(void)
|
||||
{
|
||||
Display *d2;
|
||||
Window win;
|
||||
|
|
169
src/tooltips.c
169
src/tooltips.c
|
@ -679,8 +679,8 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
ic->norm.normal->im->rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->norm.
|
||||
normal->im),
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.normal->im),
|
||||
x, y);
|
||||
|
@ -702,12 +702,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
ic->norm.normal->im->rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->norm.
|
||||
normal->im),
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
ic->norm.normal->
|
||||
im), x, y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
break;
|
||||
|
@ -723,12 +722,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
ic->norm.normal->im->rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->norm.
|
||||
normal->im),
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
ic->norm.normal->
|
||||
im), x, y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
break;
|
||||
|
@ -744,12 +742,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
ic->norm.normal->im->rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->norm.
|
||||
normal->im),
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
ic->norm.normal->
|
||||
im), x, y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
break;
|
||||
|
@ -765,12 +762,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
ic->norm.normal->im->rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->norm.
|
||||
normal->im),
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
ic->norm.normal->
|
||||
im), x, y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
break;
|
||||
|
@ -786,12 +782,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
ic->norm.normal->im->rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->norm.
|
||||
normal->im),
|
||||
ic->norm.normal->
|
||||
im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
ic->norm.normal->
|
||||
im), x, y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
break;
|
||||
|
@ -811,17 +806,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -835,17 +829,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -859,17 +852,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -883,17 +875,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -907,17 +898,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -931,17 +921,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -955,17 +944,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
@ -979,17 +967,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
|||
{
|
||||
Imlib_render(id, ic->norm.normal->im,
|
||||
ic->norm.normal->im->rgb_width,
|
||||
ic->norm.normal->
|
||||
im->rgb_height);
|
||||
ic->norm.normal->im->
|
||||
rgb_height);
|
||||
PastePixmap(disp, tt->win,
|
||||
Imlib_copy_image(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im),
|
||||
ic->norm.
|
||||
normal->im),
|
||||
Imlib_copy_mask(id,
|
||||
ic->
|
||||
norm.normal->
|
||||
im), x, y);
|
||||
ic->norm.
|
||||
normal->im), x,
|
||||
y);
|
||||
x += ic->norm.normal->im->rgb_width;
|
||||
}
|
||||
}
|
||||
|
|
15
src/x.c
15
src/x.c
|
@ -40,8 +40,7 @@ EFreePixmap(Display * display, Pixmap pixmap)
|
|||
XFreePixmap(display, pixmap);
|
||||
}
|
||||
|
||||
Window
|
||||
ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
|
||||
Window ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
|
||||
{
|
||||
EXID *xid;
|
||||
Window win;
|
||||
|
@ -587,8 +586,7 @@ DelXID(Window win)
|
|||
}
|
||||
}
|
||||
|
||||
Window
|
||||
ECreateEventWindow(Window parent, int x, int y, int w, int h)
|
||||
Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
|
||||
{
|
||||
Window win;
|
||||
XSetWindowAttributes attr;
|
||||
|
@ -604,8 +602,7 @@ ECreateEventWindow(Window parent, int x, int y, int w, int h)
|
|||
* create a window which will accept the keyboard focus when no other
|
||||
* windows have it
|
||||
*/
|
||||
Window
|
||||
ECreateFocusWindow(Window parent, int x, int y, int w, int h)
|
||||
Window ECreateFocusWindow(Window parent, int x, int y, int w, int h)
|
||||
{
|
||||
Window win;
|
||||
XSetWindowAttributes attr;
|
||||
|
@ -739,8 +736,7 @@ WinExists(Window win)
|
|||
EDBUG_RETURN(0);
|
||||
}
|
||||
|
||||
Window
|
||||
WindowAtXY_0(Window base, int bx, int by, int x, int y)
|
||||
Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
|
||||
{
|
||||
Window *list = NULL;
|
||||
XWindowAttributes att;
|
||||
|
@ -787,8 +783,7 @@ WindowAtXY_0(Window base, int bx, int by, int x, int y)
|
|||
EDBUG_RETURN(base);
|
||||
}
|
||||
|
||||
Window
|
||||
WindowAtXY(int x, int y)
|
||||
Window WindowAtXY(int x, int y)
|
||||
{
|
||||
Window *list = NULL;
|
||||
Window child = 0, parent_win = 0, root_win = 0;
|
||||
|
|
Loading…
Reference in New Issue