From b6c997706d8d2e70902dc6312215beef28b402a4 Mon Sep 17 00:00:00 2001 From: Brett Weiland Date: Thu, 6 Aug 2020 21:58:14 -0500 Subject: modified: src/color.c modified: src/color.h --- src/color.c | 71 ++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 27 deletions(-) (limited to 'src/color.c') diff --git a/src/color.c b/src/color.c index ad21919..81702b3 100644 --- a/src/color.c +++ b/src/color.c @@ -12,43 +12,43 @@ int add_color(update_info *color, int key) { - XFreeColors(color->display, color->colormap, &color->background.pixel, 1, 0); + XFreeColors(color->display, color->colormap, &color->background->pixel, 1, 0); switch(key){ case X_Q_KEY: - color->background.red += color->channel_step; + color->background->red += color->channel_step; break; case X_W_KEY: - color->background.green += color->channel_step; - printf("%i\n", color->background.green); + color->background->green += color->channel_step; break; case X_E_KEY: - color->background.blue += color->channel_step; + color->background->blue += color->channel_step; break; case X_A_KEY: - color->background.red -= color->channel_step; + color->background->red -= color->channel_step; break; case X_S_KEY: - color->background.green -= color->channel_step; + color->background->green -= color->channel_step; break; case X_D_KEY: - color->background.blue -= color->channel_step; + color->background->blue -= color->channel_step; break; default: printf("what the actual fuck is wrong with your program you cunt\n"); break; } - XAllocColor(color->display, color->colormap, &color->background); + XAllocColor(color->display, color->colormap, color->background); + printf("Pixel:\t%x\nR:\t%x\nG:\t%x\nB:\t%x\n", color->background->pixel, color->background->red, color->background->green, color->background->blue); } -int redraw_display(update_info *display_summary, XTextItem *text_prompt, GC *gc, unsigned int textpos_y) { +void redraw_display(update_info *display_summary, XTextItem *text_prompt, GC *gc, unsigned int textpos_y) { XFreeColors(display_summary->display, display_summary->colormap, &display_summary->foreground.pixel, 1, 0); - display_summary->foreground.red = 0xffff - display_summary->background.red; - display_summary->foreground.green = 0xffff - display_summary->background.green; - display_summary->foreground.blue = 0xffff - display_summary->background.blue; + display_summary->foreground.red = 0xffff - display_summary->background->red; + display_summary->foreground.green = 0xffff - display_summary->background->green; + display_summary->foreground.blue = 0xffff - display_summary->background->blue; XAllocColor(display_summary->display, display_summary->colormap, &display_summary->foreground); + XClearWindow(display_summary->display, display_summary->window); - printf("%i\n", display_summary->background.pixel); - XSetWindowBackground(display_summary->display, display_summary->window, display_summary->background.pixel); + XSetWindowBackground(display_summary->display, display_summary->window, display_summary->background->pixel); XSetForeground(display_summary->display, *gc, display_summary->foreground.pixel); XDrawText(display_summary->display, display_summary->window, *gc, TEXT_CORNER_OFFSET, textpos_y, text_prompt, 1); @@ -56,7 +56,9 @@ int redraw_display(update_info *display_summary, XTextItem *text_prompt, GC *gc, int main(void) { - char text_prompt_buffer[PROMPT_BUFSIZE] = "Q/W/E increases R/G/B. A/S/D decreases R/G/B. Enter allows exact value. Press Escape to dismiss."; + char text_prompt_buffer[PROMPT_BUFSIZE] = "Q/W/E, A/S/D for RGB channels. [Enter] begins rgb prompt, [Space] for 24 bit integers, [Enter] for hex. Seperate channels with \"/\""; + + char rgb_split_seperations[3][3]; Display *display; Window window; @@ -77,7 +79,6 @@ int main(void) { unsigned int textpos_y; - XFontStruct* font; XWindowAttributes win_info; @@ -104,6 +105,13 @@ int main(void) { XAllocColor(display, colormap, &background_color); XAllocColor(display, colormap, &foreground_color); + + XFreeColors(display, colormap, &background_color.pixel, 1, 0); + XParseColor(display, colormap, "rgb:0/0/ff", &background_color); + XAllocColor(display, colormap, &background_color); + + XFreeColors(display, colormap, &background_color.pixel, 1, 0); + XAllocColor(display, colormap, &background_color); @@ -142,7 +150,7 @@ int main(void) { .window = window, .display = display, .colormap = colormap, - .background = background_color, + .background = &background_color, .foreground = foreground_color, .channel_step = color_step }; @@ -154,6 +162,7 @@ int main(void) { if(is_prompt) { XClearWindow(display, window); text_buffer_space = PROMPT_BUFSIZE - text_prompt.nchars; + printf("%i\n", event.xkey.keycode); switch(event.xkey.keycode) { case X_BACKSPACE: if(text_buffer_space < PROMPT_BUFSIZE) { @@ -166,14 +175,21 @@ int main(void) { break; case X_ENTER_KEY: text_prompt_buffer[text_prompt.nchars + 1] = '\0'; - XFreeColors(display, colormap, background_color.pixel, 1, NULL); + XFreeColors(display, colormap, &background_color.pixel, 1, 0); XParseColor(display, colormap, text_prompt_buffer, &background_color); - background_color.red = 60000; XAllocColor(display, colormap, &background_color); is_prompt = 0; text_prompt.nchars = 0; redraw_display(&display_summary, &text_prompt, &text_prompt_gc, textpos_y); break; + case X_SHIFT_KEY: + XFreeColors(display, colormap, &background_color.pixel, 1, 0); + str + background_color.red = + background_color.green = + background_color.blue = + + printf("Pixel:\t%x\nR:\t%x\nG:\t%x\nB:\t%x\n", background_color.pixel, background_color.red, background_color.green, background_color.blue); default: if(text_buffer_space > 0) { text_prompt.nchars += XLookupString(&event.xkey, text_prompt_buffer + text_prompt.nchars, text_buffer_space, NULL, NULL); @@ -189,16 +205,17 @@ int main(void) { text_prompt.nchars = 4; strcpy(text_prompt_buffer, "rgb:"); break; - case X_Q_KEY: //if anyone is reading this, on a scale from 1-10, - case X_W_KEY: //just how ugly is this? - case X_E_KEY: //I don't know why, but it feels gross. - case X_A_KEY: //to be fair, most of this code is just for me. - case X_S_KEY: //otherwise, it'd be way cleaner. + case X_ESCAPE_KEY: + text_prompt.nchars = 0; + break; + case X_Q_KEY: // if anyone is reading this, on a scale from 1-10, + case X_W_KEY: // just how ugly is this? + case X_E_KEY: // I don't know why, but it feels gross. + case X_A_KEY: // to be fair, most of this code is just for me. + case X_S_KEY: // otherwise, it'd be way cleaner. case X_D_KEY: add_color(&display_summary, event.xkey.keycode); break; - case X_ESCAPE_KEY: - text_prompt.nchars = 0; default: break; } -- cgit v1.2.3