Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow changing display foreground and background colors #16

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Allow changing display foreground and background colors #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7a087c
Allow changing display foreground and background colors
AbeJellinek Oct 12, 2020
afdcefc
Parse hex correctly and only from command-line args
AbeJellinek Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 35 additions & 25 deletions src/xlspwin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ extern int Current_Hot_X, Current_Hot_Y; /* X Cursor hotspots */

extern char Window_Title[255];
extern char Icon_Title[255];
extern unsigned long Fg_Color;
extern unsigned long Bg_Color;

extern int save_argc;
extern char **save_argv;
Expand All @@ -57,6 +59,9 @@ extern GC cursor_source_gc;
XGCValues gcv;
XEvent report;

unsigned long WhitePixel;
unsigned long BlackPixel;

Cursor WaitCursor, DefaultCursor, VertScrollCursor, VertThumbCursor, ScrollUpCursor,
ScrollDownCursor, HorizScrollCursor, HorizThumbCursor, ScrollLeftCursor, ScrollRightCursor;

Expand Down Expand Up @@ -84,6 +89,9 @@ void Create_LispWindow(DspInterface dsp)
int Col2, Row2, Col3, Row3, GravSize;
char *WT, *IT;

XColor whitex;
XColor blackx;

WT = Window_Title;
IT = Icon_Title;

Expand All @@ -94,13 +102,17 @@ void Create_LispWindow(DspInterface dsp)
Row3 = dsp->Visible.height + (int)(OUTER_SB_WIDTH(dsp) / 2);

screen = ScreenOfDisplay(dsp->display_id, DefaultScreen(dsp->display_id));

BlackPixel = Fg_Color;
WhitePixel = Bg_Color;

dsp->LispWindow = XCreateSimpleWindow(
dsp->display_id, RootWindowOfScreen(screen), LispWindowRequestedX, /* Default upper left */
LispWindowRequestedY, /* Default upper left */
dsp->Visible.width + OUTER_SB_WIDTH(dsp), /* Default width */
dsp->Visible.height + OUTER_SB_WIDTH(dsp), /* Default height */
0, /* Default border */
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
BlackPixel, WhitePixel);

Lisp_SetWinAttributes.bit_gravity = dsp->BitGravity;
Lisp_SetWinAttributes.override_redirect = False;
Expand All @@ -116,10 +128,8 @@ void Create_LispWindow(DspInterface dsp)

/* Have to make the GC before we make the icon. */
gcv.function = GXcopy;
gcv.foreground =
BlackPixelOfScreen(ScreenOfDisplay(dsp->display_id, DefaultScreen(dsp->display_id)));
gcv.background =
WhitePixelOfScreen(ScreenOfDisplay(dsp->display_id, DefaultScreen(dsp->display_id)));
gcv.foreground = BlackPixel;
gcv.background = WhitePixel;
dsp->Copy_GC =
XCreateGC(dsp->display_id, dsp->LispWindow, GCForeground | GCBackground | GCFunction, &gcv);

Expand Down Expand Up @@ -148,7 +158,7 @@ void Create_LispWindow(DspInterface dsp)

dsp->DisplayWindow = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, 0, 0,
dsp->Visible.width, dsp->Visible.height, 0,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
BlackPixel, WhitePixel);
XChangeWindowAttributes(dsp->display_id, dsp->DisplayWindow,
CWBitGravity | CWOverrideRedirect | CWBackingStore,
&Lisp_SetWinAttributes);
Expand All @@ -161,14 +171,14 @@ void Create_LispWindow(DspInterface dsp)

dsp->ScrollBarPixmap = XCreatePixmapFromBitmapData(
dsp->display_id, dsp->LispWindow, check_bits, check_width, check_height,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen), DefaultDepthOfScreen(screen));
BlackPixel, WhitePixel, DefaultDepthOfScreen(screen));
dsp->GravityOnPixmap = XCreatePixmapFromBitmapData(
dsp->display_id, dsp->LispWindow, check_bits, 16, 16, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen), DefaultDepthOfScreen(screen));
dsp->display_id, dsp->LispWindow, check_bits, 16, 16, BlackPixel,
WhitePixel, DefaultDepthOfScreen(screen));

dsp->GravityOffPixmap = XCreatePixmapFromBitmapData(
dsp->display_id, dsp->LispWindow, plain_bits, 16, 16, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen), DefaultDepthOfScreen(screen));
dsp->display_id, dsp->LispWindow, plain_bits, 16, 16, BlackPixel,
WhitePixel, DefaultDepthOfScreen(screen));

set_Xcursor(dsp, (unsigned char *)default_cursor.cuimage, (int)default_cursor.cuhotspotx,
(int)(15 - default_cursor.cuhotspoty), &DefaultCursor, 0);
Expand Down Expand Up @@ -198,15 +208,15 @@ void Create_LispWindow(DspInterface dsp)
0 - dsp->InternalBorderWidth, /* y */
dsp->ScrollBarWidth, /* width */
dsp->Visible.height, dsp->InternalBorderWidth,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
BlackPixel, WhitePixel);
DefineCursor(dsp->display_id, dsp->VerScrollBar, &VertScrollCursor);
XMapWindow(dsp->display_id, dsp->VerScrollBar);

dsp->HorScrollBar = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow,
0 - dsp->InternalBorderWidth, Row2, /* y */
dsp->Visible.width, /* width */
dsp->ScrollBarWidth, dsp->InternalBorderWidth,
BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
BlackPixel, WhitePixel);
DefineCursor(dsp->display_id, dsp->HorScrollBar, &HorizScrollCursor);
XChangeWindowAttributes(dsp->display_id, dsp->HorScrollBar, CWOverrideRedirect,
&Lisp_SetWinAttributes);
Expand All @@ -217,7 +227,7 @@ void Create_LispWindow(DspInterface dsp)
(int)((dsp->Visible.y * dsp->Visible.height) / dsp->Display.height), /* y */
dsp->ScrollBarWidth, /* width */
(int)((dsp->Visible.height * dsp->Visible.height) / dsp->Display.height) + 1,
dsp->InternalBorderWidth, BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
dsp->InternalBorderWidth, BlackPixel, WhitePixel);
XChangeWindowAttributes(dsp->display_id, dsp->VerScrollButton, CWOverrideRedirect,
&Lisp_SetWinAttributes);
XSetWindowBackgroundPixmap(dsp->display_id, dsp->VerScrollButton, dsp->ScrollBarPixmap);
Expand All @@ -229,43 +239,43 @@ void Create_LispWindow(DspInterface dsp)
(int)((dsp->Visible.x * dsp->Visible.width) / dsp->Display.width),
0 - dsp->InternalBorderWidth, /* y */
(int)((dsp->Visible.width * dsp->Visible.width) / dsp->Display.width) + 1,
dsp->ScrollBarWidth, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen));
dsp->ScrollBarWidth, dsp->InternalBorderWidth, BlackPixel,
WhitePixel);
XChangeWindowAttributes(dsp->display_id, dsp->HorScrollButton, CWOverrideRedirect,
&Lisp_SetWinAttributes);
XSetWindowBackgroundPixmap(dsp->display_id, dsp->HorScrollButton, dsp->ScrollBarPixmap);
XClearWindow(dsp->display_id, dsp->HorScrollButton);
XMapWindow(dsp->display_id, dsp->HorScrollButton);

dsp->NWGrav = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, Col2, Row2, GravSize,
GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen));
GravSize, dsp->InternalBorderWidth, BlackPixel,
WhitePixel);
XSetWindowBackgroundPixmap(dsp->display_id, dsp->NWGrav, dsp->GravityOnPixmap);
DefineCursor(dsp->display_id, dsp->NWGrav, &DefaultCursor);
XChangeWindowAttributes(dsp->display_id, dsp->NWGrav, CWOverrideRedirect, &Lisp_SetWinAttributes);
XClearWindow(dsp->display_id, dsp->NWGrav);
XMapWindow(dsp->display_id, dsp->NWGrav);

dsp->SEGrav = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, Col3, Row3, GravSize,
GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen));
GravSize, dsp->InternalBorderWidth, BlackPixel,
WhitePixel);
XSetWindowBackgroundPixmap(dsp->display_id, dsp->SEGrav, dsp->GravityOffPixmap);
DefineCursor(dsp->display_id, dsp->SEGrav, &DefaultCursor);
XChangeWindowAttributes(dsp->display_id, dsp->SEGrav, CWOverrideRedirect, &Lisp_SetWinAttributes);
XClearWindow(dsp->display_id, dsp->NWGrav);
XMapWindow(dsp->display_id, dsp->SEGrav);

dsp->SWGrav = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, Col2, Row3, GravSize,
GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen));
GravSize, dsp->InternalBorderWidth, BlackPixel,
WhitePixel);
XSetWindowBackgroundPixmap(dsp->display_id, dsp->SWGrav, dsp->GravityOffPixmap);
DefineCursor(dsp->display_id, dsp->SWGrav, &DefaultCursor);
XClearWindow(dsp->display_id, dsp->NWGrav);
XMapWindow(dsp->display_id, dsp->SWGrav);

dsp->NEGrav = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, Col3, Row2, GravSize,
GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
WhitePixelOfScreen(screen));
GravSize, dsp->InternalBorderWidth, BlackPixel,
WhitePixel);
XSetWindowBackgroundPixmap(dsp->display_id, dsp->NEGrav, dsp->GravityOffPixmap);
DefineCursor(dsp->display_id, dsp->NEGrav, &DefaultCursor);
XClearWindow(dsp->display_id, dsp->NWGrav);
Expand All @@ -287,7 +297,7 @@ void lisp_Xvideocolor(int flag)

XLOCK;
screen = ScreenOfDisplay(currentdsp->display_id, DefaultScreen(currentdsp->display_id));
newForeground = flag ? WhitePixelOfScreen(screen) : BlackPixelOfScreen(screen);
newForeground = flag ? WhitePixel : BlackPixel;

/* window -- are we making a change? */
XGetGCValues(currentdsp->display_id, currentdsp->Copy_GC, GCForeground | GCBackground, &gcv);
Expand Down
31 changes: 30 additions & 1 deletion src/xrdopt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ char Display_Name[128];
char iconpixmapfile[1024];
char Window_Title[255];
char Icon_Title[255];
unsigned long Fg_Color;
unsigned long Bg_Color;

extern char sysout_name[], keystring[];
extern int sysout_size, for_makeinit, please_fork, Scroll_Border;
Expand Down Expand Up @@ -132,6 +134,8 @@ void print_Xusage(char *prog)
fprintf(stderr,
" -sc[reen] <geom> -size & placement for the medley display\n");
fprintf(stderr, " -t[itle] <string> -titlebar text for the window manager\n");
fprintf(stderr, " -f[ore]g[round] <hex color> -display foreground color (hex RGB)\n");
fprintf(stderr, " -b[ack]g[round] <hex color> -display background color (hex RGB)\n");
fprintf(stderr, " -icontitle <string> | -it <string> -text for the medley icon\n");
fprintf(stderr, " -iconbitmap <path> | -ibm <path> -bitmap for the medley icon\n");
fprintf(stderr,
Expand Down Expand Up @@ -160,6 +164,21 @@ void print_lispusage(char *prog)

} /* end print_lisp_usage() */

unsigned long parse_color(char *s, size_t size) {
int i;
unsigned long result = 0;
for (i = 0; i < size; i++) {
char c = s[i];
if (c >= '0' && c <= '9') c -= '0';
else if (c >= 'a' && c <='f') c -= 'a' - 10;
else if (c >= 'A' && c <='F') c -= 'A' - 10;
else continue;
// 0x will be ignored, as will #, ...
result = (result << 4) | (c & 0xF);
}
return result;
}

/************************************************************************/
/* */
/* r e a d _ X o p t i o n */
Expand Down Expand Up @@ -234,7 +253,7 @@ void read_Xoption(int *argc, char *argv[])
(void)strncpy(Display_Name, value.addr, (int)value.size);
} else if (getenv("DISPLAY") == (char *)NULL) {
fprintf(stderr, "Can't find a display. Either set the shell\n");
fprintf(stderr, "variabel DISPLAY to an appropriate display\n");
fprintf(stderr, "variable DISPLAY to an appropriate display\n");
fprintf(stderr, "or provide a -display argument.\n");
print_Xusage(argv[0]);
} else {
Expand All @@ -253,12 +272,22 @@ void read_Xoption(int *argc, char *argv[])
serverDB = XrmGetStringDatabase(XResourceManagerString(xdisplay));
if (serverDB != NULL) { (void)XrmMergeDatabases(serverDB, &rDB); }
}
Screen *defaultScreen = ScreenOfDisplay(xdisplay, DefaultScreen(xdisplay));
Fg_Color = BlackPixelOfScreen(defaultScreen); // set default colors here
Bg_Color = WhitePixelOfScreen(defaultScreen);
XCloseDisplay(xdisplay);
} else {
fprintf(stderr, "Open_Display: cannot connect to display %s.", XDisplayName(Display_Name));
exit(-1);
}

if (XrmGetResource(commandlineDB, "ldex.foreground", "Ldex.Foreground", str_type, &value) == True) {
Fg_Color = parse_color(value.addr, value.size);
}
if (XrmGetResource(commandlineDB, "ldex.background", "Ldex.Background", str_type, &value) == True) {
Bg_Color = parse_color(value.addr, value.size);
}

envname = (char *)getenv("HOME");
(void)strcat(tmp, envname);
(void)strcat(tmp, "/.Xdefaults");
Expand Down