1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
*** x11.c.orig Tue Nov 19 05:00:50 1991
--- x11.c Mon Feb 26 21:29:24 2001
***************
*** 58,64 ****
#define F_ICON 0 /* Icon index to frame array. */
#define F_WINDOW 1 /* Window index to frame array. */
- #define FACES_BORDER_WIDTH 2
#define FRAME_MASK (ButtonPressMask | ExposureMask | \
ButtonMotionMask | KeyPressMask)
#define ICON_MASK ExposureMask
--- 58,63 ----
***************
*** 364,374 ****
init_font() ;
gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ;
gc_val.font = sfont->fid ;
! gc_val.foreground = foregnd ;
! gc_val.background = backgnd ;
gc_val.graphics_exposures = False ;
gc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ;
else XSetFillStyle(dpy, tilegc, FillTiled) ;
--- 363,375 ----
init_font() ;
gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ;
gc_val.font = sfont->fid ;
! gc_val.foreground = BlackPixel(dpy, screen) ;
! gc_val.background = WhitePixel(dpy, screen) ;
gc_val.graphics_exposures = False ;
gc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
+ gc_val.foreground = foregnd ;
+ gc_val.background = backgnd ;
tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ;
else XSetFillStyle(dpy, tilegc, FillTiled) ;
***************
*** 459,465 ****
--- 460,470 ----
home = getenv("HOME") ;
XrmInitialize() ;
+ #ifdef __FreeBSD__
+ STRCPY(name, "/usr/X11R6/lib/X11/app-defaults/Faces") ;
+ #else
STRCPY(name, "/usr/lib/X11/app-defaults/Faces") ;
+ #endif
/* Get applications defaults file, if any. */
***************
*** 576,589 ****
winattrs.event_mask = FRAME_MASK ;
frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y,
! size.width, size.height, FACES_BORDER_WIDTH,
CopyFromParent, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
winattrs.event_mask = ICON_MASK ;
frame[F_ICON] = XCreateWindow(dpy, root,
! ix, iy, imagewidth, imageheight, FACES_BORDER_WIDTH,
CopyFromParent, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
--- 581,594 ----
winattrs.event_mask = FRAME_MASK ;
frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y,
! size.width, size.height, border_width,
CopyFromParent, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
winattrs.event_mask = ICON_MASK ;
frame[F_ICON] = XCreateWindow(dpy, root,
! ix, iy, imagewidth, imageheight, border_width,
CopyFromParent, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
***************
*** 818,823 ****
--- 823,830 ----
int c, r ; /* Column and row position for this face. */
int x, y ; /* Position of start of this text string. */
int textwidth ;
+ Colormap cmap ;
+ XColor selcolor ;
c = column ;
r = row ;
***************
*** 852,861 ****
case RIGHT : x = (c + 1) * imagewidth - textwidth - 2 ;
y = (r + 1) * imageheight - 5 ;
}
! XSetFunction(dpy, gc, GXandInverted) ;
XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9,
(unsigned int) textwidth+2, 13) ;
! XSetFunction(dpy, gc, GXxor) ;
XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ;
XSetFunction(dpy, gc, GXcopy) ;
}
--- 859,873 ----
case RIGHT : x = (c + 1) * imagewidth - textwidth - 2 ;
y = (r + 1) * imageheight - 5 ;
}
! XSetForeground(dpy, gc, WhitePixel(dpy, screen));
! XSetFunction(dpy, gc, GXcopy) ;
XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9,
(unsigned int) textwidth+2, 13) ;
! XSetFunction(dpy, gc, GXcopy) ;
! cmap = DefaultColormap(dpy, screen);
! XParseColor(dpy, cmap, "red", &selcolor);
! XAllocColor(dpy, cmap, &selcolor) ;
! XSetForeground(dpy, gc, selcolor.pixel );
XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ;
XSetFunction(dpy, gc, GXcopy) ;
}
|
