diff --git a/gnoemoe/dialogs/gm-preferences-dialog.c b/gnoemoe/dialogs/gm-preferences-dialog.c index 9b1868e..a8b41ff 100644 --- a/gnoemoe/dialogs/gm-preferences-dialog.c +++ b/gnoemoe/dialogs/gm-preferences-dialog.c @@ -116,6 +116,9 @@ static const GmKeyValuePair color_mapping[] = { static const GmKeyValuePair color_schemes[] = { {N_("Default"), "default"}, {N_("White on black"), "white_on_black"}, + {N_("Rxvt"), "rxvt"}, + {N_("XTerm"), "xterm"}, + {N_("Linux"), "linux"}, {N_("User defined"), "user"}, {NULL, NULL} }; diff --git a/gnoemoe/gm-color-table.c b/gnoemoe/gm-color-table.c index dc67a30..bb3f21b 100644 --- a/gnoemoe/gm-color-table.c +++ b/gnoemoe/gm-color-table.c @@ -21,27 +21,6 @@ typedef struct _GmColorTableSchemeItem { const gchar *hex; } GmColorTableSchemeItem; -/*const GdkColor -terminal_palette_linux[TERMINAL_PALETTE_SIZE] = -{ - { 0, 0x0000, 0x0000, 0x0000 }, - { 0, 0xaaaa, 0x0000, 0x0000 }, - { 0, 0x0000, 0xaaaa, 0x0000 }, - { 0, 0xaaaa, 0x5555, 0x0000 }, - { 0, 0x0000, 0x0000, 0xaaaa }, - { 0, 0xaaaa, 0x0000, 0xaaaa }, - { 0, 0x0000, 0xaaaa, 0xaaaa }, - { 0, 0xaaaa, 0xaaaa, 0xaaaa }, - { 0, 0x5555, 0x5555, 0x5555 }, - { 0, 0xffff, 0x5555, 0x5555 }, - { 0, 0x5555, 0xffff, 0x5555 }, - { 0, 0xffff, 0xffff, 0x5555 }, - { 0, 0x5555, 0x5555, 0xffff }, - { 0, 0xffff, 0x5555, 0xffff }, - { 0, 0x5555, 0xffff, 0xffff }, - { 0, 0xffff, 0xffff, 0xffff } -};*/ - static const GmColorTableSchemeItem scheme_default[] = { {"fg_default", "#000000"}, {"fg_black", "#000000"}, @@ -75,39 +54,6 @@ static const GmColorTableSchemeItem scheme_default[] = { {NULL, NULL} }; -/*static const GmColorTableSchemeItem scheme_default[] = { - {"fg_default", "#000000"}, - {"fg_black", "#000000"}, - {"fg_red", "#663822"}, - {"fg_green", "#445632"}, - {"fg_yellow", "#D1940C"}, - {"fg_blue", "#314E6C"}, - {"fg_purple", "#494066"}, - {"fg_cyan", "#0000FFFFFFFF"}, - {"fg_white", "#BAB5AB"}, - - {"fg_default_h", "#565248"}, - {"fg_black_h", "#565248"}, - {"fg_red_h", "#990000"}, - {"fg_green_h", "#267726"}, - {"fg_yellow_h", "#EED680"}, - {"fg_blue_h", "#9DB8D2"}, - {"fg_purple_h", "#ADA7C8"}, - {"fg_cyan_h", "#86EEFFFFFFFF"}, - {"fg_white_h", "#807D74"}, - - {"bg_default", "#FFFFFF"}, - {"bg_black", "#000000"}, - {"bg_red", "#663822"}, - {"bg_green", "#445632"}, - {"bg_yellow", "#D1940C"}, - {"bg_blue", "#314E6C"}, - {"bg_purple", "#494066"}, - {"bg_cyan", "#0000FFFFFFFF"}, - {"bg_white", "#FFFFFFFFFFFF"}, - {NULL, NULL} -};*/ - static const GmColorTableSchemeItem scheme_white_on_black[] = { {"fg_default", "#D6B5D6B5D6B5"}, {"fg_black", "#2D6B2D6B2D6B"}, @@ -141,6 +87,117 @@ static const GmColorTableSchemeItem scheme_white_on_black[] = { {NULL, NULL} }; +static const GmColorTableSchemeItem scheme_xterm[] = { + {"fg_default", "#E5E2E5E2E5E2"}, + + {"fg_black", "#000000000000"}, + {"fg_red", "#CDCB00000000"}, + {"fg_green", "#0000CDCB0000"}, + {"fg_yellow", "#CDCBCDCB0000"}, + {"fg_blue", "#1E1A908FFFFF"}, + {"fg_purple", "#CDCB0000CDCB"}, + {"fg_cyan", "#0000CDCBCDCB"}, + {"fg_white", "#E5E2E5E2E5E2"}, + + {"fg_default_h", "#FFFFFFFFFFFF"}, + + {"fg_black_h", "#4CCCC4CCCC4CCCC"}, + {"fg_red_h", "#FFFF00000000"}, + {"fg_green_h", "#0000FFFF0000"}, + {"fg_yellow_h", "#FFFFFFFF0000"}, + {"fg_blue_h", "#46458281B4AE"}, + {"fg_purple_h", "#FFFF0000FFFF"}, + {"fg_cyan_h", "#0000FFFFFFFF"}, + {"fg_white_h", "#FFFFFFFFFFFF"}, + + {"bg_default", "#000000000000"}, + + {"bg_black", "#000000000000"}, + {"bg_red", "#CDCB00000000"}, + {"bg_green", "#0000CDCB0000"}, + {"bg_yellow", "#CDCBCDCB0000"}, + {"bg_blue", "#1E1A908FFFFF"}, + {"bg_purple", "#CDCB0000CDCB"}, + {"bg_cyan", "#0000CDCBCDCB"}, + {"bg_white", "#E5E2E5E2E5E2"}, + + {NULL, NULL} +}; + +static const GmColorTableSchemeItem scheme_rxvt[] = { + {"fg_default", "#FAFAEBEBD7D7"}, + + {"fg_black", "#000000000000"}, + {"fg_red", "#CDCD00000000"}, + {"fg_green", "#0000CDCD0000"}, + {"fg_yellow", "#CDCDCDCD0000"}, + {"fg_blue", "#00000000CDCD"}, + {"fg_purple", "#CDCD0000CDCD"}, + {"fg_cyan", "#0000CDCDCDCD"}, + {"fg_white", "#FAFAEBEBD7D7"}, + + {"fg_default_h", "#FFFFFFFFFFFF"}, + + {"fg_black_h", "#404040404040"}, + {"fg_red_h", "#FFFF00000000"}, + {"fg_green_h", "#0000FFFF0000"}, + {"fg_yellow_h", "#FFFFFFFF0000"}, + {"fg_blue_h", "#00000000FFFF"}, + {"fg_purple_h", "#FFFF0000FFFF"}, + {"fg_cyan_h", "#0000FFFFFFFF"}, + {"fg_white_h", "#FFFFFFFFFFFF"}, + + {"bg_default", "#000000000000"}, + + {"bg_black", "#000000000000"}, + {"bg_red", "#CDCD00000000"}, + {"bg_green", "#0000CDCD0000"}, + {"bg_yellow", "#CDCDCDCD0000"}, + {"bg_blue", "#00000000CDCD"}, + {"bg_purple", "#CDCD0000CDCD"}, + {"bg_cyan", "#0000CDCDCDCD"}, + {"bg_white", "#FAFAEBEBD7D7"}, + + {NULL, NULL} +}; + +static const GmColorTableSchemeItem scheme_linux[] = { + {"fg_default", "#AAAAAAAAAAAA"}, + + {"fg_black", "#000000000000"}, + {"fg_red", "#AAAA00000000"}, + {"fg_green", "#0000AAAA0000"}, + {"fg_yellow", "#AAAA55550000"}, + {"fg_blue", "#00000000AAAA"}, + {"fg_purple", "#AAAA0000AAAA"}, + {"fg_cyan", "#0000AAAAAAAA"}, + {"fg_white", "#AAAAAAAAAAAA"}, + + {"fg_default_h", "#FFFFFFFFFFFF"}, + + {"fg_black_h", "#555555555555"}, + {"fg_red_h", "#FFFF55555555"}, + {"fg_green_h", "#5555FFFF5555"}, + {"fg_yellow_h", "#FFFFFFFF5555"}, + {"fg_blue_h", "#55555555FFFF"}, + {"fg_purple_h", "#FFFF5555FFFF"}, + {"fg_cyan_h", "#5555FFFFFFFF"}, + {"fg_white_h", "#FFFFFFFFFFFF"}, + + {"bg_default", "#000000000000"}, + + {"bg_black", "#000000000000"}, + {"bg_red", "#AAAA00000000"}, + {"bg_green", "#0000AAAA0000"}, + {"bg_yellow", "#AAAA55550000"}, + {"bg_blue", "#00000000AAAA"}, + {"bg_purple", "#AAAA0000AAAA"}, + {"bg_cyan", "#0000AAAAAAAA"}, + {"bg_white", "#AAAAAAAAAAAA"}, + + {NULL, NULL} +}; + typedef struct _GmColorScheme { GmColorTableScheme scheme; const gchar *name; @@ -151,6 +208,9 @@ static const GmColorScheme scheme_names[] = { {SCHEME_NONE, "none", NULL}, {SCHEME_DEFAULT, "default", scheme_default}, {SCHEME_WHITE_ON_BLACK, "white_on_black", scheme_white_on_black}, + {SCHEME_RXVT, "rxvt", scheme_rxvt}, + {SCHEME_XTERM, "xterm", scheme_xterm}, + {SCHEME_LINUX, "linux", scheme_linux}, {SCHEME_USER, "user", NULL}, {SCHEME_NONE, NULL, NULL} }; diff --git a/gnoemoe/gm-color-table.h b/gnoemoe/gm-color-table.h index bcbb195..bb696cb 100644 --- a/gnoemoe/gm-color-table.h +++ b/gnoemoe/gm-color-table.h @@ -53,9 +53,12 @@ struct _GmColorTableClass { typedef enum _GmColorTableScheme { SCHEME_NONE = 0, - SCHEME_DEFAULT = 1, - SCHEME_WHITE_ON_BLACK = 2, - SCHEME_USER = 3 + SCHEME_DEFAULT, + SCHEME_WHITE_ON_BLACK, + SCHEME_RXVT, + SCHEME_XTERM, + SCHEME_LINUX, + SCHEME_USER } GmColorTableScheme; GType gm_color_table_get_type(void) G_GNUC_CONST;