gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 12:58:08 +01:00
Code Issues Projects Releases Wiki Activity

changed encoding of (c) thing in about panel to utf-8

Browse Source 
changed techdraw style size display to use X core fonts
This commit is contained in:
kojima
2004-08-21 21:29:44 +00:00
parent b6e06d4beb
commit 0445dd5c18
4 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dialog.c
View File

@@ -859,8 +859,8 @@ typedef struct {
#define COPYRIGHT_TEXT \ #define COPYRIGHT_TEXT \
"Copyright \xa9 1997-2003 Alfredo K. Kojima <kojima@windowmaker.org>\n"\ "Copyright © 1997-2004 Alfredo K. Kojima <kojima@windowmaker.org>\n"\
"Copyright \xa9 1998-2003 Dan Pascu <dan@windowmaker.org>" "Copyright © 1998-2004 Dan Pascu <dan@windowmaker.org>"

40
src/moveres.c
View File

@@ -255,13 +255,11 @@ showGeometry(WWindow *wwin, int x1, int y1, int x2, int y2, int direction)
{ {
WScreen *scr = wwin->screen_ptr; WScreen *scr = wwin->screen_ptr;
Window root = scr->root_win; Window root = scr->root_win;
GC gc = scr->line_gc, saveGC; GC gc = scr->line_gc;
int ty, by, my, x, y, mx, s; int ty, by, my, x, y, mx, s;
char num[16]; char num[16];
XSegment segment[4]; XSegment segment[4];
int fw, fh; int fw, fh;
WMColor *color;
WMPixel pixel;
/* This seems necessary for some odd reason (too lazy to write x1-1 and /* This seems necessary for some odd reason (too lazy to write x1-1 and
* x2-1 everywhere below in the code). But why only for x? */ * x2-1 everywhere below in the code). But why only for x? */
@@ -278,8 +276,8 @@ showGeometry(WWindow *wwin, int x1, int y1, int x2, int y2, int direction)
by = y2 - wwin->frame->bottom_width; by = y2 - wwin->frame->bottom_width;
if (wPreferences.size_display == WDIS_NEW) { if (wPreferences.size_display == WDIS_NEW) {
fw = WMWidthOfString(scr->tech_draw_font, "8888", 4); fw = XTextWidth(scr->tech_draw_font, "8888", 4);
fh = WMFontHeight(scr->tech_draw_font); fh = scr->tech_draw_font->ascent+scr->tech_draw_font->descent;
XSetForeground(dpy, gc, scr->line_pixel); XSetForeground(dpy, gc, scr->line_pixel);
@@ -329,25 +327,12 @@ showGeometry(WWindow *wwin, int x1, int y1, int x2, int y2, int direction)
snprintf(num, sizeof(num), "%i", (by - ty - wwin->normal_hints->base_height) / snprintf(num, sizeof(num), "%i", (by - ty - wwin->normal_hints->base_height) /
wwin->normal_hints->height_inc); wwin->normal_hints->height_inc);
fw = WMWidthOfString(scr->tech_draw_font, num, strlen(num)); fw = XTextWidth(scr->tech_draw_font, num, strlen(num));
/* XSetForeground(dpy, gc, WMColorPixel(scr->window_title_color[WS_UNFOCUSED])); */
color = WMBlackColor(scr->wmscreen);
saveGC = scr->wmscreen->drawStringGC;
pixel = color->color.pixel;
/* Display the height. */ /* Display the height. */
XSetFont(dpy, gc, scr->tech_draw_font->fid);
XDrawString(dpy, root, gc, x - s + 3 - fw/2, my + scr->tech_draw_font->ascent - fh/2 + 1, num, strlen(num));
/* // ugly hack */
color->color.pixel = scr->line_pixel;
scr->wmscreen->drawStringGC = gc;
WMDrawString(scr->wmscreen, root, color, scr->tech_draw_font,
x - s + 3 - fw/2, my - fh/2 + 1, num, strlen(num));
scr->wmscreen->drawStringGC = saveGC;
color->color.pixel = pixel;
XSetForeground(dpy, gc, scr->line_pixel);
/* horizontal geometry */ /* horizontal geometry */
if (y1 < 15) { if (y1 < 15) {
y = y2; y = y2;
@@ -359,7 +344,7 @@ showGeometry(WWindow *wwin, int x1, int y1, int x2, int y2, int direction)
mx = x1 + (x2 - x1)/2; mx = x1 + (x2 - x1)/2;
snprintf(num, sizeof(num), "%i", (x2 - x1 - wwin->normal_hints->base_width) / snprintf(num, sizeof(num), "%i", (x2 - x1 - wwin->normal_hints->base_width) /
wwin->normal_hints->width_inc); wwin->normal_hints->width_inc);
fw = WMWidthOfString(scr->tech_draw_font, num, strlen(num)); fw = XTextWidth(scr->tech_draw_font, num, strlen(num));
/* left arrow & end bar */ /* left arrow & end bar */
segment[0].x1 = x1; segment[0].y1 = y - (s + 6); segment[0].x1 = x1; segment[0].y1 = y - (s + 6);
@@ -395,17 +380,8 @@ showGeometry(WWindow *wwin, int x1, int y1, int x2, int y2, int direction)
XDrawSegments(dpy, root, gc, segment, 4); XDrawSegments(dpy, root, gc, segment, 4);
/* XSetForeground(dpy, gc, WMColorPixel(scr->window_title_color[WS_UNFOCUSED])); */
/* Display the width. */ /* Display the width. */
/* // ugly hack */ XDrawString(dpy, root, gc, mx - fw/2 + 1, y - s + scr->tech_draw_font->ascent - fh/2 + 1, num, strlen(num));
color->color.pixel = scr->line_pixel;
scr->wmscreen->drawStringGC = gc;
WMDrawString(scr->wmscreen, root, color, scr->tech_draw_font,
mx - fw/2 + 1, y - s - fh/2 + 1, num, strlen(num));
scr->wmscreen->drawStringGC = saveGC;
color->color.pixel = pixel;
WMReleaseColor(color);
} else { } else {
WSetGeometryViewShownSize(scr->gview, WSetGeometryViewShownSize(scr->gview,
(x2 - x1 - wwin->normal_hints->base_width) (x2 - x1 - wwin->normal_hints->base_width)

6
src/screen.c
View File

@@ -821,11 +821,7 @@ wScreenInit(int screen_number)
scr->info_text_font = WMBoldSystemFontOfSize(scr->wmscreen, 12); scr->info_text_font = WMBoldSystemFontOfSize(scr->wmscreen, 12);
// fix this too -Dan scr->tech_draw_font= XLoadQueryFont(dpy, "-adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
//scr->tech_draw_font = WMCreateFontWithFlags(scr->wmscreen,
// "BoldSystemFont-12",
// WFNotAntialiased);
scr->tech_draw_font = WMBoldSystemFontOfSize(scr->wmscreen, 12);
scr->gview = WCreateGeometryView(scr->wmscreen); scr->gview = WCreateGeometryView(scr->wmscreen);
WMRealizeWidget(scr->gview); WMRealizeWidget(scr->gview);

5
src/screen.h
View File

@@ -162,7 +162,10 @@ typedef struct _WScreen {
WMFont *clip_title_font; /* for clip titles */ WMFont *clip_title_font; /* for clip titles */
WMFont *info_text_font; /* text on things like geometry WMFont *info_text_font; /* text on things like geometry
* hint boxes */ * hint boxes */
WMFont *tech_draw_font;
XFontStruct *tech_draw_font; /* font for tech draw style geom view
needs to be a core font so we can
use it with a XORing GC */
WMFont *workspace_name_font; WMFont *workspace_name_font;