GNOME.org
 

[vte] Make capability name and seq handler names match exactly

commit fb579fdf7e0df89b1228300433d128586d5fa3e2
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed May 21 20:35:29 2014 -0400

    Make capability name and seq handler names match exactly
    
    Going to remove the indirection through string capability names
    at some point.

 src/caps.c         |   82 ++++++++++++++++++++++++++--------------------------
 src/vteseq-n.gperf |   68 +++++++++++++++++++++---------------------
 src/vteseq.c       |    8 ++--
 3 files changed, 79 insertions(+), 79 deletions(-)
---
diff --git a/src/caps.c b/src/caps.c
index 620430b..ee95f85 100644
--- a/src/caps.c
+++ b/src/caps.c
@@ -67,7 +67,7 @@ struct _vte_capability_string _vte_xterm_capability_strings[] = {
        /* These are actually designate-other-coding-system from ECMA 35,
         * but we don't support the full repertoire.  Actually, we don't
         * know what the full repertoire looks like. */
-       {ESC "%%@", "iso8859-1-character-set", 0},
+       {ESC "%%@", "default-character-set", 0},
        {ESC "%%G", "utf-8-character-set", 0},
 
         {ESC "(0", "alternate-character-set-start", 0},
@@ -219,31 +219,31 @@ struct _vte_capability_string _vte_xterm_capability_strings[] = {
        {OSC "4;%s" BEL, "change-color-bel", 0},
         {OSC "6;%s" BEL, "set-current-file-uri", 0},
         {OSC "7;%s" BEL, "set-current-directory-uri", 0},
-       {OSC "10;%s" BEL, "change-foreground-colors-bel", 0},
-       {OSC "11;%s" BEL, "change-background-colors-bel", 0},
-       {OSC "12;%s" BEL, "change-cursor-colors-bel", 0},
-       {OSC "13;%s" BEL, "change-mouse-cursor-foreground-colors-bel", 0},
-       {OSC "14;%s" BEL, "change-mouse-cursor-background-colors-bel", 0},
-       {OSC "15;%s" BEL, "change-tek-foreground-colors-bel", 0},
-       {OSC "16;%s" BEL, "change-tek-background-colors-bel", 0},
-       {OSC "17;%s" BEL, "change-highlight-background-colors-bel", 0},
-       {OSC "18;%s" BEL, "change-tek-cursor-colors-bel", 0},
-       {OSC "19;%s" BEL, "change-highlight-foreground-colors-bel", 0},
+       {OSC "10;%s" BEL, "change-foreground-color-bel", 0},
+       {OSC "11;%s" BEL, "change-background-color-bel", 0},
+       {OSC "12;%s" BEL, "change-cursor-color-bel", 0},
+       {OSC "13;%s" BEL, "change-mouse-cursor-foreground-color-bel", 0},
+       {OSC "14;%s" BEL, "change-mouse-cursor-background-color-bel", 0},
+       {OSC "15;%s" BEL, "change-tek-foreground-color-bel", 0},
+       {OSC "16;%s" BEL, "change-tek-background-color-bel", 0},
+       {OSC "17;%s" BEL, "change-highlight-background-color-bel", 0},
+       {OSC "18;%s" BEL, "change-tek-cursor-color-bel", 0},
+       {OSC "19;%s" BEL, "change-highlight-foreground-color-bel", 0},
        {OSC "46;%s" BEL, "change-logfile", 0},
        {OSC "50;#%d" BEL, "change-font-number", 0},
        {OSC "50;%s" BEL, "change-font-name", 0},
        {OSC "104" BEL, "reset-color", 0},
        {OSC "104;%m" BEL, "reset-color", 0},
-       {OSC "110" BEL, "reset-foreground-colors", 0},
-       {OSC "111" BEL, "reset-background-colors", 0},
-       {OSC "112" BEL, "reset-cursor-colors", 0},
-       {OSC "113" BEL, "reset-mouse-cursor-foreground-colors", 0},
-       {OSC "114" BEL, "reset-mouse-cursor-background-colors", 0},
-       {OSC "115" BEL, "reset-tek-foreground-colors", 0},
-       {OSC "116" BEL, "reset-tek-background-colors", 0},
-       {OSC "117" BEL, "reset-highlight-background-colors", 0},
-       {OSC "118" BEL, "reset-tek-cursor-colors", 0},
-       {OSC "119" BEL, "reset-highlight-foreground-colors", 0},
+       {OSC "110" BEL, "reset-foreground-color", 0},
+       {OSC "111" BEL, "reset-background-color", 0},
+       {OSC "112" BEL, "reset-cursor-color", 0},
+       {OSC "113" BEL, "reset-mouse-cursor-foreground-color", 0},
+       {OSC "114" BEL, "reset-mouse-cursor-background-color", 0},
+       {OSC "115" BEL, "reset-tek-foreground-color", 0},
+       {OSC "116" BEL, "reset-tek-background-color", 0},
+       {OSC "117" BEL, "reset-highlight-background-color", 0},
+       {OSC "118" BEL, "reset-tek-cursor-color", 0},
+       {OSC "119" BEL, "reset-highlight-foreground-color", 0},
 
        /* Set text parameters, ST-terminated versions. */
        {OSC ";%s" ST, "set-icon-and-window-title", 0}, /* undocumented default */
@@ -254,31 +254,31 @@ struct _vte_capability_string _vte_xterm_capability_strings[] = {
        {OSC "4;%s" ST, "change-color-st", 0},
         {OSC "6;%s" ST, "set-current-file-uri", 0},
         {OSC "7;%s" ST, "set-current-directory-uri", 0},
-       {OSC "10;%s" ST, "change-foreground-colors-st", 0},
-       {OSC "11;%s" ST, "change-background-colors-st", 0},
-       {OSC "12;%s" ST, "change-cursor-colors-st", 0},
-       {OSC "13;%s" ST, "change-mouse-cursor-foreground-colors-st", 0},
-       {OSC "14;%s" ST, "change-mouse-cursor-background-colors-st", 0},
-       {OSC "15;%s" ST, "change-tek-foreground-colors-st", 0},
-       {OSC "16;%s" ST, "change-tek-background-colors-st", 0},
-       {OSC "17;%s" ST, "change-highlight-background-colors-st", 0},
-       {OSC "18;%s" ST, "change-tek-cursor-colors-st", 0},
-       {OSC "19;%s" ST, "change-highlight-foreground-colors-st", 0},
+       {OSC "10;%s" ST, "change-foreground-color-st", 0},
+       {OSC "11;%s" ST, "change-background-color-st", 0},
+       {OSC "12;%s" ST, "change-cursor-color-st", 0},
+       {OSC "13;%s" ST, "change-mouse-cursor-foreground-color-st", 0},
+       {OSC "14;%s" ST, "change-mouse-cursor-background-color-st", 0},
+       {OSC "15;%s" ST, "change-tek-foreground-color-st", 0},
+       {OSC "16;%s" ST, "change-tek-background-color-st", 0},
+       {OSC "17;%s" ST, "change-highlight-background-color-st", 0},
+       {OSC "18;%s" ST, "change-tek-cursor-color-st", 0},
+       {OSC "19;%s" ST, "change-highlight-foreground-color-st", 0},
        {OSC "46;%s" ST, "change-logfile", 0},
        {OSC "50;#%d" ST, "change-font-number", 0},
        {OSC "50;%s" ST, "change-font-name", 0},
        {OSC "104" ST, "reset-color", 0},
        {OSC "104;%m" ST, "reset-color", 0},
-       {OSC "110" ST, "reset-foreground-colors", 0},
-       {OSC "111" ST, "reset-background-colors", 0},
-       {OSC "112" ST, "reset-cursor-colors", 0},
-       {OSC "113" ST, "reset-mouse-cursor-foreground-colors", 0},
-       {OSC "114" ST, "reset-mouse-cursor-background-colors", 0},
-       {OSC "115" ST, "reset-tek-foreground-colors", 0},
-       {OSC "116" ST, "reset-tek-background-colors", 0},
-       {OSC "117" ST, "reset-highlight-background-colors", 0},
-       {OSC "118" ST, "reset-tek-cursor-colors", 0},
-       {OSC "119" ST, "reset-highlight-foreground-colors", 0},
+       {OSC "110" ST, "reset-foreground-color", 0},
+       {OSC "111" ST, "reset-background-color", 0},
+       {OSC "112" ST, "reset-cursor-color", 0},
+       {OSC "113" ST, "reset-mouse-cursor-foreground-color", 0},
+       {OSC "114" ST, "reset-mouse-cursor-background-color", 0},
+       {OSC "115" ST, "reset-tek-foreground-color", 0},
+       {OSC "116" ST, "reset-tek-background-color", 0},
+       {OSC "117" ST, "reset-highlight-background-color", 0},
+       {OSC "118" ST, "reset-tek-cursor-color", 0},
+       {OSC "119" ST, "reset-highlight-foreground-color", 0},
 
        /* These may be bogus, I can't find docs for them anywhere (#104154). */
        {OSC "21;%s" BEL, "set-text-property-21", 0},
diff --git a/src/vteseq-n.gperf b/src/vteseq-n.gperf
index aff74de..208ab19 100644
--- a/src/vteseq-n.gperf
+++ b/src/vteseq-n.gperf
@@ -64,7 +64,7 @@ struct vteseq_n_struct {
 #"dec-media-copy", VTE_SEQUENCE_HANDLER_NULL
 "restore-cursor", VTE_SEQUENCE_HANDLER(vte_sequence_handler_restore_cursor)
 "set-icon-title", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_icon_title)
-"cursor-back-tab", VTE_SEQUENCE_HANDLER(vte_sequence_handler_back_tab)
+"cursor-back-tab", VTE_SEQUENCE_HANDLER(vte_sequence_handler_cursor_back_tab)
 "cursor-backward", VTE_SEQUENCE_HANDLER(vte_sequence_handler_cursor_backward)
 "cursor-position", VTE_SEQUENCE_HANDLER(vte_sequence_handler_cursor_position)
 "cursor-position-top-row", VTE_SEQUENCE_HANDLER(vte_sequence_handler_cursor_position_top_row)
@@ -81,11 +81,11 @@ struct vteseq_n_struct {
 #"change-font-number", VTE_SEQUENCE_HANDLER_NULL
 "return-terminal-id", VTE_SEQUENCE_HANDLER(vte_sequence_handler_return_terminal_id)
 #"end-of-guarded-area", VTE_SEQUENCE_HANDLER_NULL
-"utf-8-character-set", VTE_SEQUENCE_HANDLER(vte_sequence_handler_utf_8_charset)
+"utf-8-character-set", VTE_SEQUENCE_HANDLER(vte_sequence_handler_utf_8_character_set)
 "window-manipulation", VTE_SEQUENCE_HANDLER(vte_sequence_handler_window_manipulation)
-"change-cursor-colors-bel", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_cursor_color_bel)
-"change-cursor-colors-st", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_cursor_color_st)
-"reset-cursor-colors", VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_cursor_color)
+"change-cursor-color-bel", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_cursor_color_bel)
+"change-cursor-color-st", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_cursor_color_st)
+"reset-cursor-color", VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_cursor_color)
 "character-attributes", VTE_SEQUENCE_HANDLER(vte_sequence_handler_character_attributes)
 "device-status-report", VTE_SEQUENCE_HANDLER(vte_sequence_handler_device_status_report)
 "set-scrolling-region", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_scrolling_region)
@@ -102,29 +102,29 @@ struct vteseq_n_struct {
 #"double-height-top-half", VTE_SEQUENCE_HANDLER_NULL
 "line-position-absolute", VTE_SEQUENCE_HANDLER(vte_sequence_handler_line_position_absolute)
 "return-terminal-status", VTE_SEQUENCE_HANDLER(vte_sequence_handler_return_terminal_status)
-"change-highlight-background-colors-bel", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_background_color_bel)
-"change-highlight-background-colors-st", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_background_color_st)
-"reset-highlight-background-colors", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_highlight_background_color)
-"change-highlight-foreground-colors-bel", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_foreground_color_bel)
-"change-highlight-foreground-colors-st", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_foreground_color_st)
-"reset-highlight-foreground-colors", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_highlight_foreground_color)
+"change-highlight-background-color-bel", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_background_color_bel)
+"change-highlight-background-color-st", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_background_color_st)
+"reset-highlight-background-color", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_highlight_background_color)
+"change-highlight-foreground-color-bel", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_foreground_color_bel)
+"change-highlight-foreground-color-st", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_highlight_foreground_color_st)
+"reset-highlight-foreground-color", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_highlight_foreground_color)
 #"enable-filter-rectangle", VTE_SEQUENCE_HANDLER_NULL
 "insert-blank-characters", VTE_SEQUENCE_HANDLER(vte_sequence_handler_insert_blank_characters)
 #"invoke-g2-character-set", VTE_SEQUENCE_HANDLER_NULL
 #"invoke-g3-character-set", VTE_SEQUENCE_HANDLER_NULL
-"iso8859-1-character-set", VTE_SEQUENCE_HANDLER(vte_sequence_handler_local_charset)
+"default-character-set", VTE_SEQUENCE_HANDLER(vte_sequence_handler_default_character_set)
 #"selective-erase-in-line", VTE_SEQUENCE_HANDLER_NULL
 #"ansi-conformance-level-1", VTE_SEQUENCE_HANDLER_NULL
 #"ansi-conformance-level-2", VTE_SEQUENCE_HANDLER_NULL
 #"ansi-conformance-level-3", VTE_SEQUENCE_HANDLER_NULL
 "alternate-character-set-start", VTE_SEQUENCE_HANDLER(vte_sequence_handler_alternate_character_set_start)
 "alternate-character-set-end", VTE_SEQUENCE_HANDLER(vte_sequence_handler_alternate_character_set_end)
-"change-background-colors-bel", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_background_color_bel)
-"change-background-colors-st", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_background_color_st)
-"reset-background-colors", VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_background_color)
-"change-foreground-colors-bel", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_foreground_color_bel)
-"change-foreground-colors-st", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_foreground_color_st)
-"reset-foreground-colors", VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_foreground_color)
+"change-background-color-bel", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_background_color_bel)
+"change-background-color-st", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_background_color_st)
+"reset-background-color", VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_background_color)
+"change-foreground-color-bel", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_foreground_color_bel)
+"change-foreground-color-st", VTE_SEQUENCE_HANDLER(vte_sequence_handler_change_foreground_color_st)
+"reset-foreground-color", VTE_SEQUENCE_HANDLER(vte_sequence_handler_reset_foreground_color)
 "dec-device-status-report", VTE_SEQUENCE_HANDLER(vte_sequence_handler_dec_device_status_report)
 #"enable-locator-reporting", VTE_SEQUENCE_HANDLER_NULL
 #"request-locator-position", VTE_SEQUENCE_HANDLER_NULL
@@ -136,27 +136,27 @@ struct vteseq_n_struct {
 "character-position-absolute", VTE_SEQUENCE_HANDLER(vte_sequence_handler_character_position_absolute)
 "request-terminal-parameters", VTE_SEQUENCE_HANDLER(vte_sequence_handler_request_terminal_parameters)
 #"select-character-protection", VTE_SEQUENCE_HANDLER_NULL
-#"change-tek-background-colors-bel", VTE_SEQUENCE_HANDLER_NULL
-#"change-tek-background-colors-st", VTE_SEQUENCE_HANDLER_NULL
-#"reset-tek-background-colors", VTE_SEQUENCE_HANDLER_NULL
-#"change-tek-foreground-colors-bel", VTE_SEQUENCE_HANDLER_NULL
-#"change-tek-foreground-colors-st", VTE_SEQUENCE_HANDLER_NULL
-#"reset-tek-foreground-colors", VTE_SEQUENCE_HANDLER_NULL
-#"change-tek-cursor-colors-bel", VTE_SEQUENCE_HANDLER_NULL
-#"change-tek-cursor-colors-st", VTE_SEQUENCE_HANDLER_NULL
-#"reset-tek-cursor-colors", VTE_SEQUENCE_HANDLER_NULL
+#"change-tek-background-color-bel", VTE_SEQUENCE_HANDLER_NULL
+#"change-tek-background-color-st", VTE_SEQUENCE_HANDLER_NULL
+#"reset-tek-background-color", VTE_SEQUENCE_HANDLER_NULL
+#"change-tek-foreground-color-bel", VTE_SEQUENCE_HANDLER_NULL
+#"change-tek-foreground-color-st", VTE_SEQUENCE_HANDLER_NULL
+#"reset-tek-foreground-color", VTE_SEQUENCE_HANDLER_NULL
+#"change-tek-cursor-color-bel", VTE_SEQUENCE_HANDLER_NULL
+#"change-tek-cursor-color-st", VTE_SEQUENCE_HANDLER_NULL
+#"reset-tek-cursor-color", VTE_SEQUENCE_HANDLER_NULL
 #"invoke-g1-character-set-as-gr", VTE_SEQUENCE_HANDLER_NULL
 #"invoke-g2-character-set-as-gr", VTE_SEQUENCE_HANDLER_NULL
 #"invoke-g3-character-set-as-gr", VTE_SEQUENCE_HANDLER_NULL
 #"initiate-hilite-mouse-tracking", VTE_SEQUENCE_HANDLER_NULL
 "send-primary-device-attributes", VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_primary_device_attributes)
-"linux-console-cursor-attributes", VTE_SEQUENCE_HANDLER(vte_sequence_handler_noop)
+"linux-console-cursor-attributes", VTE_SEQUENCE_HANDLER(vte_sequence_handler_linux_console_cursor_attributes)
 "send-secondary-device-attributes", 
VTE_SEQUENCE_HANDLER(vte_sequence_handler_send_secondary_device_attributes)
-#"change-mouse-cursor-background-colors-bel", VTE_SEQUENCE_HANDLER_NULL
-#"change-mouse-cursor-background-colors-st", VTE_SEQUENCE_HANDLER_NULL
-#"reset-mouse-cursor-background-colors", VTE_SEQUENCE_HANDLER_NULL
-#"change-mouse-cursor-foreground-colors-bel", VTE_SEQUENCE_HANDLER_NULL
-#"change-mouse-cursor-foreground-colors-st", VTE_SEQUENCE_HANDLER_NULL
-#"reset-mouse-cursor-foreground-colors", VTE_SEQUENCE_HANDLER_NULL
+#"change-mouse-cursor-background-color-bel", VTE_SEQUENCE_HANDLER_NULL
+#"change-mouse-cursor-background-color-st", VTE_SEQUENCE_HANDLER_NULL
+#"reset-mouse-cursor-background-color", VTE_SEQUENCE_HANDLER_NULL
+#"change-mouse-cursor-foreground-color-bel", VTE_SEQUENCE_HANDLER_NULL
+#"change-mouse-cursor-foreground-color-st", VTE_SEQUENCE_HANDLER_NULL
+#"reset-mouse-cursor-foreground-color", VTE_SEQUENCE_HANDLER_NULL
 "set-current-directory-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_directory_uri)
 "set-current-file-uri", VTE_SEQUENCE_HANDLER(vte_sequence_handler_set_current_file_uri)
diff --git a/src/vteseq.c b/src/vteseq.c
index ea5019d..ebfee21 100644
--- a/src/vteseq.c
+++ b/src/vteseq.c
@@ -885,7 +885,7 @@ vte_sequence_handler_bell (VteTerminal *terminal, GValueArray *params)
 
 /* Backtab. */
 static void
-vte_sequence_handler_back_tab (VteTerminal *terminal, GValueArray *params)
+vte_sequence_handler_cursor_back_tab (VteTerminal *terminal, GValueArray *params)
 {
        long newcol;
 
@@ -1427,7 +1427,7 @@ vte_sequence_handler_next_line (VteTerminal *terminal, GValueArray *params)
 
 /* No-op. */
 static void
-vte_sequence_handler_noop (VteTerminal *terminal, GValueArray *params)
+vte_sequence_handler_linux_console_cursor_attributes (VteTerminal *terminal, GValueArray *params)
 {
 }
 
@@ -2530,7 +2530,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
 
 /* Set the terminal encoding. */
 static void
-vte_sequence_handler_local_charset (VteTerminal *terminal, GValueArray *params)
+vte_sequence_handler_default_character_set (VteTerminal *terminal, GValueArray *params)
 {
        G_CONST_RETURN char *locale_encoding;
        g_get_charset(&locale_encoding);
@@ -2538,7 +2538,7 @@ vte_sequence_handler_local_charset (VteTerminal *terminal, GValueArray *params)
 }
 
 static void
-vte_sequence_handler_utf_8_charset (VteTerminal *terminal, GValueArray *params)
+vte_sequence_handler_utf_8_character_set (VteTerminal *terminal, GValueArray *params)
 {
        vte_terminal_set_encoding(terminal, "UTF-8");
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]