Sun Mar 26 13:42:23 PST 2000
(Mandrake) fixed edge resistance between heads when you're using xinerama. SVN revision: 2338
This commit is contained in:
parent
c642472633
commit
b930be1be0
|
@ -4475,3 +4475,10 @@ Sat Mar 25 20:58:49 PST 2000
|
||||||
(Mandrake)
|
(Mandrake)
|
||||||
|
|
||||||
oops, debugging printfs
|
oops, debugging printfs
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Sun Mar 26 13:42:23 PST 2000
|
||||||
|
(Mandrake)
|
||||||
|
|
||||||
|
fixed edge resistance between heads when you're using xinerama.
|
||||||
|
|
|
@ -1181,11 +1181,11 @@ doMoveEnd(void *params)
|
||||||
if (gwins[i]->floating)
|
if (gwins[i]->floating)
|
||||||
MoveEwinToDesktopAt(gwins[i], d,
|
MoveEwinToDesktopAt(gwins[i], d,
|
||||||
gwins[i]->x - (desks.desk[d].x -
|
gwins[i]->x - (desks.desk[d].x -
|
||||||
desks.
|
desks.desk[gwins[i]->
|
||||||
desk[gwins[i]->desktop].x),
|
desktop].x),
|
||||||
gwins[i]->y - (desks.desk[d].y -
|
gwins[i]->y - (desks.desk[d].y -
|
||||||
desks.
|
desks.desk[gwins[i]->
|
||||||
desk[gwins[i]->desktop].y));
|
desktop].y));
|
||||||
else
|
else
|
||||||
MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y);
|
MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y);
|
||||||
gwins[i]->floating = 0;
|
gwins[i]->floating = 0;
|
||||||
|
|
24
src/areas.c
24
src/areas.c
|
@ -357,13 +357,13 @@ SetCurrentArea(int ax, int ay)
|
||||||
lst[i]->x -
|
lst[i]->x -
|
||||||
(root.w *
|
(root.w *
|
||||||
(ax -
|
(ax -
|
||||||
desks.desk[desks.
|
desks.desk[desks.current].
|
||||||
current].current_area_x)),
|
current_area_x)),
|
||||||
lst[i]->y -
|
lst[i]->y -
|
||||||
(root.h *
|
(root.h *
|
||||||
(ay -
|
(ay -
|
||||||
desks.desk[desks.
|
desks.desk[desks.current].
|
||||||
current].current_area_y)));
|
current_area_y)));
|
||||||
if (setflip)
|
if (setflip)
|
||||||
mode.flipp = 0;
|
mode.flipp = 0;
|
||||||
lst[i]->area_x = a1;
|
lst[i]->area_x = a1;
|
||||||
|
@ -394,13 +394,13 @@ SetCurrentArea(int ax, int ay)
|
||||||
x -
|
x -
|
||||||
(root.w *
|
(root.w *
|
||||||
(ax -
|
(ax -
|
||||||
desks.desk[desks.current].
|
desks.desk[desks.
|
||||||
current_area_x)),
|
current].current_area_x)),
|
||||||
y -
|
y -
|
||||||
(root.h *
|
(root.h *
|
||||||
(ay -
|
(ay -
|
||||||
desks.desk[desks.current].
|
desks.desk[desks.
|
||||||
current_area_y)));
|
current].current_area_y)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* if we're not moving it... move it across */
|
/* if we're not moving it... move it across */
|
||||||
|
@ -419,13 +419,13 @@ SetCurrentArea(int ax, int ay)
|
||||||
lst[i]->x -
|
lst[i]->x -
|
||||||
(root.w *
|
(root.w *
|
||||||
(ax -
|
(ax -
|
||||||
desks.desk[desks.
|
desks.desk[desks.current].
|
||||||
current].current_area_x)),
|
current_area_x)),
|
||||||
lst[i]->y -
|
lst[i]->y -
|
||||||
(root.h *
|
(root.h *
|
||||||
(ay -
|
(ay -
|
||||||
desks.desk[desks.
|
desks.desk[desks.current].
|
||||||
current].current_area_y)));
|
current_area_y)));
|
||||||
if (setflip)
|
if (setflip)
|
||||||
mode.flipp = 0;
|
mode.flipp = 0;
|
||||||
lst[i]->area_x = a1;
|
lst[i]->area_x = a1;
|
||||||
|
|
|
@ -667,6 +667,9 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
|
||||||
EWin **lst, **gwins;
|
EWin **lst, **gwins;
|
||||||
int gnum, num, i, j, screen_snap_dist, odx, ody;
|
int gnum, num, i, j, screen_snap_dist, odx, ody;
|
||||||
static char last_res = 0;
|
static char last_res = 0;
|
||||||
|
static XineramaScreenInfo *screens = NULL;
|
||||||
|
static int num_screens = 0;
|
||||||
|
int top_bound, bottom_bound, left_bound, right_bound;
|
||||||
|
|
||||||
EDBUG(5, "SnapEwin");
|
EDBUG(5, "SnapEwin");
|
||||||
if (!ewin)
|
if (!ewin)
|
||||||
|
@ -678,8 +681,53 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
|
||||||
*new_dy = dy;
|
*new_dy = dy;
|
||||||
EDBUG_RETURN_;
|
EDBUG_RETURN_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
left_bound = 0;
|
||||||
|
right_bound = root.w;
|
||||||
|
top_bound = 0;
|
||||||
|
bottom_bound = root.h;
|
||||||
|
|
||||||
screen_snap_dist = mode.constrained ? (root.w + root.h)
|
screen_snap_dist = mode.constrained ? (root.w + root.h)
|
||||||
: mode.screen_snap_dist;
|
: mode.screen_snap_dist;
|
||||||
|
|
||||||
|
#ifdef HAS_XINERAMA
|
||||||
|
|
||||||
|
if (xinerama_active)
|
||||||
|
{
|
||||||
|
if (!screens)
|
||||||
|
screens = XineramaQueryScreens(disp, &num_screens);
|
||||||
|
for (i = 0; i < num_screens; i++)
|
||||||
|
{
|
||||||
|
if (ewin->x >= screens[i].x_org)
|
||||||
|
{
|
||||||
|
if (ewin->x <= (screens[i].width + screens[i].x_org))
|
||||||
|
{
|
||||||
|
if (ewin->y >= screens[i].y_org)
|
||||||
|
{
|
||||||
|
if (ewin->y <= (screens[i].height +
|
||||||
|
screens[i].y_org))
|
||||||
|
{
|
||||||
|
left_bound = screens[i].x_org;
|
||||||
|
right_bound =
|
||||||
|
screens[i].x_org + screens[i].width;
|
||||||
|
top_bound = screens[i].y_org;
|
||||||
|
bottom_bound =
|
||||||
|
screens[i].y_org + screens[i].height;
|
||||||
|
screen_snap_dist =
|
||||||
|
mode.constrained ? (screens[i].width +
|
||||||
|
screens[i].
|
||||||
|
height) : mode.
|
||||||
|
screen_snap_dist;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
|
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
|
||||||
gwins = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, mode.nogroup, &gnum);
|
gwins = ListWinGroupMembersForEwin(ewin, ACTION_MOVE, mode.nogroup, &gnum);
|
||||||
if (gwins)
|
if (gwins)
|
||||||
|
@ -698,9 +746,10 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
|
||||||
ody = dy;
|
ody = dy;
|
||||||
if (dx < 0)
|
if (dx < 0)
|
||||||
{
|
{
|
||||||
if (IN_BELOW(ewin->x + dx, 0, screen_snap_dist) && (ewin->x >= 0))
|
if (IN_BELOW(ewin->x + dx, left_bound, screen_snap_dist)
|
||||||
|
&& (ewin->x >= left_bound))
|
||||||
{
|
{
|
||||||
dx = 0 - ewin->x;
|
dx = left_bound - ewin->x;
|
||||||
}
|
}
|
||||||
else if (lst)
|
else if (lst)
|
||||||
{
|
{
|
||||||
|
@ -732,10 +781,10 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
|
||||||
}
|
}
|
||||||
else if (dx > 0)
|
else if (dx > 0)
|
||||||
{
|
{
|
||||||
if (IN_ABOVE(ewin->x + ewin->w + dx, root.w, screen_snap_dist)
|
if (IN_ABOVE(ewin->x + ewin->w + dx, right_bound, screen_snap_dist)
|
||||||
&& ((ewin->x + ewin->w) <= root.w))
|
&& ((ewin->x + ewin->w) <= right_bound))
|
||||||
{
|
{
|
||||||
dx = root.w - (ewin->x + ewin->w);
|
dx = right_bound - (ewin->x + ewin->w);
|
||||||
}
|
}
|
||||||
else if (lst)
|
else if (lst)
|
||||||
{
|
{
|
||||||
|
@ -766,9 +815,10 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
|
||||||
}
|
}
|
||||||
if (dy < 0)
|
if (dy < 0)
|
||||||
{
|
{
|
||||||
if (IN_BELOW(ewin->y + dy, 0, screen_snap_dist) && (ewin->y >= 0))
|
if (IN_BELOW(ewin->y + dy, top_bound, screen_snap_dist)
|
||||||
|
&& (ewin->y >= top_bound))
|
||||||
{
|
{
|
||||||
dy = 0 - ewin->y;
|
dy = top_bound - ewin->y;
|
||||||
}
|
}
|
||||||
else if (lst)
|
else if (lst)
|
||||||
{
|
{
|
||||||
|
@ -800,10 +850,10 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
|
||||||
}
|
}
|
||||||
else if (dy > 0)
|
else if (dy > 0)
|
||||||
{
|
{
|
||||||
if (IN_ABOVE(ewin->y + ewin->h + dy, root.h, screen_snap_dist)
|
if (IN_ABOVE(ewin->y + ewin->h + dy, bottom_bound, screen_snap_dist)
|
||||||
&& ((ewin->y + ewin->h) <= root.h))
|
&& ((ewin->y + ewin->h) <= bottom_bound))
|
||||||
{
|
{
|
||||||
dy = root.h - (ewin->y + ewin->h);
|
dy = bottom_bound - (ewin->y + ewin->h);
|
||||||
}
|
}
|
||||||
else if (lst)
|
else if (lst)
|
||||||
{
|
{
|
||||||
|
@ -1004,25 +1054,21 @@ ArrangeEwin(EWin * ewin)
|
||||||
screens = XineramaQueryScreens(disp, &num);
|
screens = XineramaQueryScreens(disp, &num);
|
||||||
for (i = 0; i < num; i++)
|
for (i = 0; i < num; i++)
|
||||||
{
|
{
|
||||||
for (i = 0; i < num; i++)
|
if (pointer_x >= screens[i].x_org)
|
||||||
{
|
{
|
||||||
if (pointer_x >= screens[i].x_org)
|
if (pointer_x <= (screens[i].width + screens[i].x_org))
|
||||||
{
|
{
|
||||||
if (pointer_x <=
|
if (pointer_y >= screens[i].y_org)
|
||||||
(screens[i].width + screens[i].x_org))
|
|
||||||
{
|
{
|
||||||
if (pointer_y >= screens[i].y_org)
|
if (pointer_y <= (screens[i].height +
|
||||||
|
screens[i].y_org))
|
||||||
{
|
{
|
||||||
if (pointer_y <= (screens[i].height +
|
ewin->x =
|
||||||
screens[i].y_org))
|
((screens[i].width - ewin->w) /
|
||||||
{
|
2) + screens[i].x_org;
|
||||||
ewin->x =
|
ewin->y =
|
||||||
((screens[i].width - ewin->w) /
|
((screens[i].height - ewin->h) /
|
||||||
2) + screens[i].x_org;
|
2) + screens[i].y_org;
|
||||||
ewin->y =
|
|
||||||
((screens[i].height - ewin->h) /
|
|
||||||
2) + screens[i].y_org;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1227,12 +1227,12 @@ CalcEwinWinpart(EWin * ewin, int i)
|
||||||
if (bottomright == -1)
|
if (bottomright == -1)
|
||||||
{
|
{
|
||||||
ox =
|
ox =
|
||||||
((ewin->border->
|
((ewin->
|
||||||
part[i].geom.bottomright.x.percent * ewin->w) >> 10) +
|
border->part[i].geom.bottomright.x.percent * ewin->w) >> 10) +
|
||||||
ewin->border->part[i].geom.bottomright.x.absolute;
|
ewin->border->part[i].geom.bottomright.x.absolute;
|
||||||
oy =
|
oy =
|
||||||
((ewin->border->
|
((ewin->
|
||||||
part[i].geom.bottomright.y.percent * ewin->h) >> 10) +
|
border->part[i].geom.bottomright.y.percent * ewin->h) >> 10) +
|
||||||
ewin->border->part[i].geom.bottomright.y.absolute;
|
ewin->border->part[i].geom.bottomright.y.absolute;
|
||||||
}
|
}
|
||||||
else if (bottomright >= 0)
|
else if (bottomright >= 0)
|
||||||
|
@ -2643,9 +2643,8 @@ MinShadeSize(EWin * ewin, int *mw, int *mh)
|
||||||
(ewin->w - ewin->border->border.right) > rightborderwidth)
|
(ewin->w - ewin->border->border.right) > rightborderwidth)
|
||||||
rightborderwidth =
|
rightborderwidth =
|
||||||
(ewin->bits[i].x + ewin->bits[i].w) - (ewin->w -
|
(ewin->bits[i].x + ewin->bits[i].w) - (ewin->w -
|
||||||
ewin->
|
ewin->border->
|
||||||
border->border.
|
border.right);
|
||||||
right);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ewin->w = rightborderwidth + leftborderwidth;
|
ewin->w = rightborderwidth + leftborderwidth;
|
||||||
|
@ -2671,9 +2670,8 @@ MinShadeSize(EWin * ewin, int *mw, int *mh)
|
||||||
bottomborderwidth)
|
bottomborderwidth)
|
||||||
bottomborderwidth =
|
bottomborderwidth =
|
||||||
(ewin->bits[i].y + ewin->bits[i].h) - (ewin->h -
|
(ewin->bits[i].y + ewin->bits[i].h) - (ewin->h -
|
||||||
ewin->
|
ewin->border->
|
||||||
border->border.
|
border.bottom);
|
||||||
bottom);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ewin->h = bottomborderwidth + topborderwidth;
|
ewin->h = bottomborderwidth + topborderwidth;
|
||||||
|
|
33
src/dialog.c
33
src/dialog.c
|
@ -1193,8 +1193,8 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
||||||
ImlibImage *im;
|
ImlibImage *im;
|
||||||
|
|
||||||
im =
|
im =
|
||||||
ELoadImage(di->item.slider.ic_border->norm.normal->
|
ELoadImage(di->item.slider.ic_border->norm.
|
||||||
im_file);
|
normal->im_file);
|
||||||
if (im)
|
if (im)
|
||||||
{
|
{
|
||||||
di->item.slider.border_orig_w = im->rgb_width;
|
di->item.slider.border_orig_w = im->rgb_width;
|
||||||
|
@ -1470,12 +1470,13 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
||||||
dii->y +
|
dii->y +
|
||||||
((dii->h
|
((dii->h
|
||||||
-
|
-
|
||||||
dii->item.check_button.
|
dii->item.
|
||||||
check_orig_h) / 2),
|
check_button.check_orig_h) /
|
||||||
dii->item.check_button.
|
2),
|
||||||
check_orig_w,
|
dii->item.
|
||||||
dii->item.check_button.
|
check_button.check_orig_w,
|
||||||
check_orig_h);
|
dii->item.
|
||||||
|
check_button.check_orig_h);
|
||||||
if (dii->type == DITEM_RADIOBUTTON)
|
if (dii->type == DITEM_RADIOBUTTON)
|
||||||
EMoveResizeWindow(disp,
|
EMoveResizeWindow(disp,
|
||||||
dii->item.radio_button.radio_win,
|
dii->item.radio_button.radio_win,
|
||||||
|
@ -1483,12 +1484,13 @@ DialogRealizeItem(Dialog * d, DItem * di)
|
||||||
dii->y +
|
dii->y +
|
||||||
((dii->h
|
((dii->h
|
||||||
-
|
-
|
||||||
dii->item.radio_button.
|
dii->item.
|
||||||
radio_orig_h) / 2),
|
radio_button.radio_orig_h) /
|
||||||
dii->item.radio_button.
|
2),
|
||||||
radio_orig_w,
|
dii->item.
|
||||||
dii->item.radio_button.
|
radio_button.radio_orig_w,
|
||||||
radio_orig_h);
|
dii->item.
|
||||||
|
radio_button.radio_orig_h);
|
||||||
if (dii->type == DITEM_AREA)
|
if (dii->type == DITEM_AREA)
|
||||||
{
|
{
|
||||||
dii->item.area.w = dii->w -
|
dii->item.area.w = dii->w -
|
||||||
|
@ -1998,7 +2000,8 @@ DialogItemAreaSetSize(DItem * di, int w, int h)
|
||||||
di->item.area.h = h;
|
di->item.area.h = h;
|
||||||
}
|
}
|
||||||
|
|
||||||
Window DialogItemAreaGetWindow(DItem * di)
|
Window
|
||||||
|
DialogItemAreaGetWindow(DItem * di)
|
||||||
{
|
{
|
||||||
return di->item.area.area_win;
|
return di->item.area.area_win;
|
||||||
}
|
}
|
||||||
|
|
|
@ -494,7 +494,8 @@ HandleMotion(XEvent * ev)
|
||||||
(gwins
|
(gwins
|
||||||
[i]->reqx,
|
[i]->reqx,
|
||||||
gwins[i]->x,
|
gwins[i]->x,
|
||||||
mode.edge_snap_dist)))))))
|
mode.
|
||||||
|
edge_snap_dist)))))))
|
||||||
{
|
{
|
||||||
jumpx = 1;
|
jumpx = 1;
|
||||||
ndx = gwins[i]->reqx - gwins[i]->x + dx;
|
ndx = gwins[i]->reqx - gwins[i]->x + dx;
|
||||||
|
@ -517,7 +518,8 @@ HandleMotion(XEvent * ev)
|
||||||
(gwins
|
(gwins
|
||||||
[i]->reqy,
|
[i]->reqy,
|
||||||
gwins[i]->y,
|
gwins[i]->y,
|
||||||
mode.edge_snap_dist)))))))
|
mode.
|
||||||
|
edge_snap_dist)))))))
|
||||||
{
|
{
|
||||||
jumpy = 1;
|
jumpy = 1;
|
||||||
ndy = gwins[i]->reqy - gwins[i]->y + dy;
|
ndy = gwins[i]->reqy - gwins[i]->y + dy;
|
||||||
|
@ -980,8 +982,8 @@ HandleMotion(XEvent * ev)
|
||||||
{
|
{
|
||||||
di->item.slider.wanted_val += dy;
|
di->item.slider.wanted_val += dy;
|
||||||
di->item.slider.val = di->item.slider.lower +
|
di->item.slider.val = di->item.slider.lower +
|
||||||
((((di->item.
|
((((di->
|
||||||
slider.base_h - di->item.slider.knob_h -
|
item.slider.base_h - di->item.slider.knob_h -
|
||||||
di->item.slider.wanted_val) *
|
di->item.slider.wanted_val) *
|
||||||
(di->item.slider.upper -
|
(di->item.slider.upper -
|
||||||
di->item.slider.lower)) /
|
di->item.slider.lower)) /
|
||||||
|
@ -2507,13 +2509,13 @@ HandleMouseUp(XEvent * ev)
|
||||||
HideEwin(gwins[i]);
|
HideEwin(gwins[i]);
|
||||||
MoveEwin(gwins[i], gwin_px[i] +
|
MoveEwin(gwins[i], gwin_px[i] +
|
||||||
((desks.desk
|
((desks.desk
|
||||||
[gwins[i]->
|
[gwins[i]->desktop].
|
||||||
desktop].current_area_x) -
|
current_area_x) -
|
||||||
p->hi_ewin->area_x) * root.w,
|
p->hi_ewin->area_x) * root.w,
|
||||||
gwin_py[i] +
|
gwin_py[i] +
|
||||||
((desks.desk
|
((desks.
|
||||||
[gwins[i]->
|
desk[gwins[i]->desktop].
|
||||||
desktop].current_area_y) -
|
current_area_y) -
|
||||||
p->hi_ewin->area_y) * root.h);
|
p->hi_ewin->area_y) * root.h);
|
||||||
if (was_shaded != gwins[i]->shaded)
|
if (was_shaded != gwins[i]->shaded)
|
||||||
InstantShadeEwin(gwins[i]);
|
InstantShadeEwin(gwins[i]);
|
||||||
|
|
|
@ -263,8 +263,7 @@ cp(char *s, char *ss)
|
||||||
EDBUG_RETURN_;
|
EDBUG_RETURN_;
|
||||||
}
|
}
|
||||||
|
|
||||||
time_t
|
time_t moddate(char *s)
|
||||||
moddate(char *s)
|
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
|
||||||
|
|
|
@ -1745,8 +1745,8 @@ IPC_ImageClass(char *params, Client * c)
|
||||||
if (iclass->norm.normal->real_file)
|
if (iclass->norm.normal->real_file)
|
||||||
im =
|
im =
|
||||||
Imlib_load_image(id,
|
Imlib_load_image(id,
|
||||||
iclass->norm.
|
iclass->norm.normal->
|
||||||
normal->real_file);
|
real_file);
|
||||||
if (im)
|
if (im)
|
||||||
{
|
{
|
||||||
Esnprintf(buf, sizeof(buf),
|
Esnprintf(buf, sizeof(buf),
|
||||||
|
|
|
@ -279,7 +279,8 @@ ShowMenu(Menu * m, char noshow)
|
||||||
* * *
|
* * *
|
||||||
* * * *
|
* * * *
|
||||||
* * * * *
|
* * * * *
|
||||||
* * * * * * from appearing offscreen */
|
* * * * * *
|
||||||
|
* * * * * * * from appearing offscreen */
|
||||||
unsigned int w, h, mw, mh;
|
unsigned int w, h, mw, mh;
|
||||||
|
|
||||||
EDBUG(5, "ShowMenu");
|
EDBUG(5, "ShowMenu");
|
||||||
|
|
|
@ -126,8 +126,7 @@ GetNetText(char *URL)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
time_t
|
time_t GetNetFileDate(char *URL)
|
||||||
GetNetFileDate(char *URL)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef AUTOUPGRADE
|
#ifdef AUTOUPGRADE
|
||||||
|
|
|
@ -37,8 +37,7 @@ static Window sc_window = 0;
|
||||||
static Atom sc_atom = 0;
|
static Atom sc_atom = 0;
|
||||||
static ImlibData *imd = NULL;
|
static ImlibData *imd = NULL;
|
||||||
|
|
||||||
Window
|
Window SC_GetDestWin(void)
|
||||||
SC_GetDestWin(void)
|
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -751,7 +751,8 @@ SetupEnv()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Window MakeExtInitWin(void)
|
Window
|
||||||
|
MakeExtInitWin(void)
|
||||||
{
|
{
|
||||||
Display *d2;
|
Display *d2;
|
||||||
Window win;
|
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);
|
ic->norm.normal->im->rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im),
|
im),
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->norm.normal->im),
|
ic->norm.normal->im),
|
||||||
x, y);
|
x, y);
|
||||||
|
@ -702,12 +702,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
||||||
ic->norm.normal->im->rgb_height);
|
ic->norm.normal->im->rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im),
|
im),
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im), x,
|
im), x, y);
|
||||||
y);
|
|
||||||
x += ic->norm.normal->im->rgb_width;
|
x += ic->norm.normal->im->rgb_width;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -723,12 +722,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
||||||
ic->norm.normal->im->rgb_height);
|
ic->norm.normal->im->rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im),
|
im),
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im), x,
|
im), x, y);
|
||||||
y);
|
|
||||||
x += ic->norm.normal->im->rgb_width;
|
x += ic->norm.normal->im->rgb_width;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -744,12 +742,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
||||||
ic->norm.normal->im->rgb_height);
|
ic->norm.normal->im->rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im),
|
im),
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im), x,
|
im), x, y);
|
||||||
y);
|
|
||||||
x += ic->norm.normal->im->rgb_width;
|
x += ic->norm.normal->im->rgb_width;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -765,12 +762,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
||||||
ic->norm.normal->im->rgb_height);
|
ic->norm.normal->im->rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im),
|
im),
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im), x,
|
im), x, y);
|
||||||
y);
|
|
||||||
x += ic->norm.normal->im->rgb_width;
|
x += ic->norm.normal->im->rgb_width;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -786,12 +782,11 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
||||||
ic->norm.normal->im->rgb_height);
|
ic->norm.normal->im->rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im),
|
im),
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->norm.
|
ic->norm.normal->
|
||||||
normal->im), x,
|
im), x, y);
|
||||||
y);
|
|
||||||
x += ic->norm.normal->im->rgb_width;
|
x += ic->norm.normal->im->rgb_width;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -811,17 +806,16 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
|
||||||
{
|
{
|
||||||
Imlib_render(id, ic->norm.normal->im,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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,
|
Imlib_render(id, ic->norm.normal->im,
|
||||||
ic->norm.normal->im->rgb_width,
|
ic->norm.normal->im->rgb_width,
|
||||||
ic->norm.normal->
|
ic->norm.normal->im->
|
||||||
im->rgb_height);
|
rgb_height);
|
||||||
PastePixmap(disp, tt->win,
|
PastePixmap(disp, tt->win,
|
||||||
Imlib_copy_image(id,
|
Imlib_copy_image(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im),
|
||||||
im),
|
|
||||||
Imlib_copy_mask(id,
|
Imlib_copy_mask(id,
|
||||||
ic->
|
ic->norm.
|
||||||
norm.normal->
|
normal->im), x,
|
||||||
im), x, y);
|
y);
|
||||||
x += ic->norm.normal->im->rgb_width;
|
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);
|
XFreePixmap(display, pixmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
Window
|
Window ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
|
||||||
ECreateWindow(Window parent, int x, int y, int w, int h, int saveunder)
|
|
||||||
{
|
{
|
||||||
EXID *xid;
|
EXID *xid;
|
||||||
Window win;
|
Window win;
|
||||||
|
@ -587,8 +586,7 @@ DelXID(Window win)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Window
|
Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
|
||||||
ECreateEventWindow(Window parent, int x, int y, int w, int h)
|
|
||||||
{
|
{
|
||||||
Window win;
|
Window win;
|
||||||
XSetWindowAttributes attr;
|
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
|
* create a window which will accept the keyboard focus when no other
|
||||||
* windows have it
|
* windows have it
|
||||||
*/
|
*/
|
||||||
Window
|
Window ECreateFocusWindow(Window parent, int x, int y, int w, int h)
|
||||||
ECreateFocusWindow(Window parent, int x, int y, int w, int h)
|
|
||||||
{
|
{
|
||||||
Window win;
|
Window win;
|
||||||
XSetWindowAttributes attr;
|
XSetWindowAttributes attr;
|
||||||
|
@ -739,8 +736,7 @@ WinExists(Window win)
|
||||||
EDBUG_RETURN(0);
|
EDBUG_RETURN(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
Window
|
Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
|
||||||
WindowAtXY_0(Window base, int bx, int by, int x, int y)
|
|
||||||
{
|
{
|
||||||
Window *list = NULL;
|
Window *list = NULL;
|
||||||
XWindowAttributes att;
|
XWindowAttributes att;
|
||||||
|
@ -787,8 +783,7 @@ WindowAtXY_0(Window base, int bx, int by, int x, int y)
|
||||||
EDBUG_RETURN(base);
|
EDBUG_RETURN(base);
|
||||||
}
|
}
|
||||||
|
|
||||||
Window
|
Window WindowAtXY(int x, int y)
|
||||||
WindowAtXY(int x, int y)
|
|
||||||
{
|
{
|
||||||
Window *list = NULL;
|
Window *list = NULL;
|
||||||
Window child = 0, parent_win = 0, root_win = 0;
|
Window child = 0, parent_win = 0, root_win = 0;
|
||||||
|
|
Loading…
Reference in New Issue