ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.60 by pcg, Fri Feb 27 02:52:51 2004 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

… …
140 valid_keysym = keysym != NoSymbol; 140 valid_keysym = keysym != NoSymbol;
141 } 141 }
142 142
143 if (valid_keysym) 143 if (valid_keysym)
144 { 144 {
145 /* for some backwards compatibility */
146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
147# ifdef HOTKEY_CTRL
148 if (ctrl)
149# else
150 if (meta)
151# endif
152 {
153 if (keysym == ks_bigfont)
154 {
155 change_font (FONT_UP);
156 return;
157 }
158 else if (keysym == ks_smallfont)
159 {
160 change_font (FONT_DN);
161 return;
162 }
163 }
164#endif
165
166 if (TermWin.saveLines) 145 if (TermWin.saveLines)
167 { 146 {
168#ifdef UNSHIFTED_SCROLLKEYS 147#ifdef UNSHIFTED_SCROLLKEYS
169 if (!ctrl && !meta) 148 if (!ctrl && !meta)
170 { 149 {
… …
261#ifdef KEYSYM_RESOURCE 240#ifdef KEYSYM_RESOURCE
262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
263 { 242 {
264 unsigned int l; 243 unsigned int l;
265 const unsigned char *kbuf0; 244 const unsigned char *kbuf0;
266 const unsigned char ch = C0_ESC;
267 245
268 kbuf0 = (Keysym_map[keysym & 0xFF]); 246 kbuf0 = (Keysym_map[keysym & 0xFF]);
269 l = (unsigned int)*kbuf0++; 247 l = (unsigned int)*kbuf0++;
270 248
271 /* escape prefix */ 249 /* escape prefix */
272 if (meta) 250 if (meta
273# ifdef META8_OPTION 251# ifdef META8_OPTION
274 if (meta_char == C0_ESC) 252 && meta_char == C0_ESC
275# endif 253# endif
254 )
255 {
256 const unsigned char ch = C0_ESC;
276 tt_write (&ch, 1); 257 tt_write (&ch, 1);
258 }
259
277 tt_write (kbuf0, l); 260 tt_write (kbuf0, l);
278 return; 261 return;
279 } 262 }
280 else 263 else
281#endif 264#endif
… …
291 ^ !!ctrl) ? '\b' : '\177'; 274 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 275 kbuf[1] = '\0';
293 } 276 }
294 else 277 else
295 STRCPY (kbuf, key_backspace); 278 STRCPY (kbuf, key_backspace);
296# ifdef MULTICHAR_SET
297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
298 {
299 int col, row;
300
301 newlen = STRLEN (kbuf);
302 col = screen.cur.col - 1;
303 row = screen.cur.row + TermWin.saveLines;
304 if (IS_MULTI2 (screen.rend[row][col]))
305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
306 }
307# endif
308 break; 279 break;
309#endif 280#endif
310#ifndef NO_DELETE_KEY 281#ifndef NO_DELETE_KEY
311 case XK_Delete: 282 case XK_Delete:
312 STRCPY (kbuf, key_delete); 283 STRCPY (kbuf, key_delete);
313# ifdef MULTICHAR_SET
314 if (Options & Opt_mc_hack)
315 {
316 int col, row;
317
318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
323 }
324# endif
325 break; 284 break;
326#endif 285#endif
327 case XK_Tab: 286 case XK_Tab:
328 if (shft) 287 if (shft)
329 STRCPY (kbuf, "\033[Z"); 288 STRCPY (kbuf, "\033[Z");
… …
371 kbuf[1] = 'O'; 330 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left]; 331 kbuf[2] = "dacb"[keysym - XK_Left];
373 } 332 }
374 else if (PrivateModes & PrivMode_aplCUR) 333 else if (PrivateModes & PrivMode_aplCUR)
375 kbuf[1] = 'O'; 334 kbuf[1] = 'O';
376#ifdef MULTICHAR_SET
377 //TODO: ??
378 if (Options & Opt_mc_hack)
379 {
380 int col, row, m;
381
382 col = screen.cur.col;
383 row = screen.cur.row + TermWin.saveLines;
384 m = 0;
385 if (keysym == XK_Right
386 && IS_MULTI1 (screen.rend[row][col]))
387 m = 1;
388 else if (keysym == XK_Left)
389 {
390 if (col > 0)
391 {
392 if (IS_MULTI2 (screen.rend[row][col - 1]))
393 m = 1;
394 }
395 else if (screen.cur.row > 0)
396 {
397 col = screen.tlen[--row];
398 if (col == -1)
399 col = TermWin.ncol - 1;
400 else
401 col--;
402 if (col > 0
403 && IS_MULTI2 (screen.rend[row][col]))
404 m = 1;
405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
410#endif
411 break; 335 break;
412 336
413#ifndef UNSHIFTED_SCROLLKEYS 337#ifndef UNSHIFTED_SCROLLKEYS
414# ifdef XK_KP_Prior 338# ifdef XK_KP_Prior
415 case XK_KP_Prior: 339 case XK_KP_Prior:
… …
604 break; 528 break;
605 } 529 }
606 if (newlen) 530 if (newlen)
607 len = STRLEN (kbuf); 531 len = STRLEN (kbuf);
608 } 532 }
533
609 /* 534 /*
610 * Pass meta for all function keys, if 'meta' option set 535 * Pass meta for all function keys, if 'meta' option set
611 */ 536 */
612#ifdef META8_OPTION 537#ifdef META8_OPTION
613 if (meta && (meta_char == 0x80) && len > 0) 538 if (meta && (meta_char == 0x80) && len > 0)
… …
628 { 553 {
629 unsigned char *ch; 554 unsigned char *ch;
630 555
631 for (ch = kbuf; ch < kbuf + len; ch++) 556 for (ch = kbuf; ch < kbuf + len; ch++)
632 *ch |= 0x80; 557 *ch |= 0x80;
558
633 meta = 0; 559 meta = 0;
634 } 560 }
635#endif 561#endif
636 /* nil */ ; 562 /* nil */ ;
637 } 563 }
… …
833 759
834bool 760bool
835rxvt_term::cmd_parse () 761rxvt_term::cmd_parse ()
836{ 762{
837 bool flag = false; 763 bool flag = false;
838 uint32_t ch = NOCHAR; 764 unicode_t ch = NOCHAR;
839 765
840 for (;;) 766 for (;;)
841 { 767 {
842 if (ch == NOCHAR) 768 if (ch == NOCHAR)
843 ch = next_char (); 769 ch = next_char ();
… …
846 break; 772 break;
847 773
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 { 775 {
850 /* Read a text string from the input buffer */ 776 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ]; 777 unicode_t buf[BUFSIZ];
852 bool refreshnow = false; 778 bool refreshnow = false;
853 int nlines = 0; 779 int nlines = 0;
854 uint32_t *str = buf; 780 unicode_t *str = buf;
855 781
856 *str++ = ch; 782 *str++ = ch;
857 783
858 for (;;) 784 for (;;)
859 { 785 {
… …
937 return flag; 863 return flag;
938} 864}
939 865
940// read the next character, currently handles UTF-8 866// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future 867// will probably handle all sorts of other stuff in the future
942uint32_t 868unicode_t
943rxvt_term::next_char () 869rxvt_term::next_char ()
944{ 870{
945 while (cmdbuf_ptr < cmdbuf_endp) 871 while (cmdbuf_ptr < cmdbuf_endp)
946 { 872 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
948 return *cmdbuf_ptr++; 876 return *cmdbuf_ptr++;
949 877
950 wchar_t wc; 878 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952 880
953 if (len == (size_t)-2) 881 if (len == (size_t)-2)
954 return NOCHAR; 882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
955 887
956 if (len == (size_t)-1) 888 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958 890
959 // assume wchar == unicode 891 // assume wchar == unicode
… …
967/* rxvt_cmd_getc () - Return next input character */ 899/* rxvt_cmd_getc () - Return next input character */
968/* 900/*
969 * Return the next input character after first passing any keyboard input 901 * Return the next input character after first passing any keyboard input
970 * to the command. 902 * to the command.
971 */ 903 */
972uint32_t 904unicode_t
973rxvt_term::cmd_getc () 905rxvt_term::cmd_getc ()
974{ 906{
975 for (;;) 907 for (;;)
976 { 908 {
977 uint32_t c = next_char (); 909 unicode_t c = next_char ();
978 if (c != NOCHAR) 910 if (c != NOCHAR)
979 return c; 911 return c;
980 912
981 // incomplete sequences should occur rarely, still, a better solution 913 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design. 914 // would be preferred. either setjmp/longjmp or better design.
… …
1987 if (have_pixmap) 1919 if (have_pixmap)
1988 { 1920 {
1989 /* 1921 /*
1990 * Copy display->root pixmap transparency 1922 * Copy display->root pixmap transparency
1991 */ 1923 */
1992 int sx, sy, nx, ny; 1924 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 1925 unsigned int nw, nh;
1994 Window cr; 1926 Window cr;
1995 XImage *image; 1927 XImage *image;
1996 GC gc; 1928 GC gc;
1997 XGCValues gcvalue; 1929 XGCValues gcvalue;
1998 1930
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 1932 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 1933 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 1934 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 1935 nx = ny = 0;
1936
2004 if (sx < 0) 1937 if (sx < 0)
2005 { 1938 {
2006 nw += sx; 1939 nw += sx;
2007 nx = -sx; 1940 nx = -sx;
2008 sx = 0; 1941 sx = 0;
2009 } 1942 }
1943
2010 if (sy < 0) 1944 if (sy < 0)
2011 { 1945 {
2012 nh += sy; 1946 nh += sy;
2013 ny = -sy; 1947 ny = -sy;
2014 sy = 0; 1948 sy = 0;
2015 } 1949 }
1950
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2018 allowedxerror = -1; 1953 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2020 ZPixmap); 1955 ZPixmap);
… …
2053 if (!am_transparent || !am_pixmap_trans) 1988 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 1989 pchanged = 1;
2055 am_transparent = am_pixmap_trans = 1; 1990 am_transparent = am_pixmap_trans = 1;
2056 } 1991 }
2057 } 1992 }
1993
2058 if (!am_pixmap_trans) 1994 if (!am_pixmap_trans)
2059 { 1995 {
2060 unsigned int n; 1996 unsigned int n;
2061 /* 1997 /*
2062 * InheritPixmap transparency 1998 * InheritPixmap transparency
… …
2077 break; 2013 break;
2078 } 2014 }
2079 if (oldp != TermWin.parent[i]) 2015 if (oldp != TermWin.parent[i])
2080 pchanged = 1; 2016 pchanged = 1;
2081 } 2017 }
2018
2082 n = 0; 2019 n = 0;
2020
2083 if (pchanged) 2021 if (pchanged)
2084 { 2022 {
2085 for (; n < (unsigned int)i; n++) 2023 for (; n < (unsigned int)i; n++)
2086 { 2024 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2092 break; 2030 break;
2093 } 2031 }
2094 } 2032 }
2095 } 2033 }
2034
2096 if (n > (int) (sizeof (TermWin.parent) 2035 if (n > (int) (sizeof (TermWin.parent)
2097 / sizeof (TermWin.parent[0]))) 2036 / sizeof (TermWin.parent[0])))
2098 { 2037 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2038 D_X ((stderr, "InheritPixmap Turning off"));
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2039 XSetWindowBackground (display->display, TermWin.parent[0],
… …
2123 ParentRelative); 2062 ParentRelative);
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2125 ParentRelative); 2064 ParentRelative);
2126 am_transparent = 1; 2065 am_transparent = 1;
2127 } 2066 }
2067
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2069 TermWin.parent[i] = None;
2130 } 2070 }
2131 return pchanged; 2071 return pchanged;
2132} 2072}
… …
2138/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2140FILE * 2080FILE *
2141rxvt_term::popen_printer () 2081rxvt_term::popen_printer ()
2142{ 2082{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2084
2145 if (stream == NULL) 2085 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2086 rxvt_print_error ("can't open printer pipe");
2147 return stream; 2087 return stream;
2148} 2088}
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 2300 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 2301 break;
2362 case '+': 2302 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 2303 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 2304 break;
2365#ifdef MULTICHAR_SET
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS 2305#ifndef NO_FRILLS
2371 case '6': 2306 case '6':
2372 scr_backindex (); 2307 scr_backindex ();
2373 break; 2308 break;
2374#endif 2309#endif
… …
2396 break; 2331 break;
2397 2332
2398 /* 8.3.87: NEXT LINE */ 2333 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 2334 case C1_NEL: /* ESC E */
2400 { 2335 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 2336 unicode_t nlcr[] = { L'\n', L'\r' };
2402 scr_add_lines (nlcr, 1, 2); 2337 scr_add_lines (nlcr, 1, 2);
2403 } 2338 }
2404 break; 2339 break;
2405 2340
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 2341 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2715 case 7: /* unofficial extension */ 2650 case 7: /* unofficial extension */
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2651 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2717 break; 2652 break;
2718#endif 2653#endif
2719 case 8: /* unofficial extension */ 2654 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 2656 break;
2722 } 2657 }
2723 break; 2658 break;
2724 2659
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2994 * 19 = change underlined character color 2929 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented) 2930 * 46 = change logfile (not implemented)
2996 * 50 = change font 2931 * 50 = change font
2997 * 2932 *
2998 * rxvt extensions: 2933 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future) 2934 * 10 = menu (may change in future)
3001 * 20 = bg pixmap 2935 * 20 = bg pixmap
3002 * 39 = change default fg color 2936 * 39 = change default fg color
3003 * 49 = change default bg color 2937 * 49 = change default bg color
3004 * 55 = dump scrollback buffer and all of screen 2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
3005 */ 2941 */
3006void 2942void
3007rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3008{ 2944{
3009 int changed = 0; 2945 int changed = 0;
… …
3107 { 3043 {
3108 set_locale (str); 3044 set_locale (str);
3109# ifdef USE_XIM 3045# ifdef USE_XIM
3110 im_cb (); 3046 im_cb ();
3111# endif 3047# endif
3112 // TODO: call selection_make with the right values set
3113 // to re-fresh the selection.
3114 if (display->selection_owner == this)
3115 display->set_selection_owner (0);
3116 } 3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3117 break; 3055 break;
3118#endif 3056#endif
3119#if 0 3057#if 0
3120 case XTerm_dumpscreen: /* no error notices */ 3058 case XTerm_dumpscreen: /* no error notices */
3121 { 3059 {
… …
3188 { menuBar_esc, PrivMode_menuBar }, 3126 { menuBar_esc, PrivMode_menuBar },
3189#endif 3127#endif
3190#ifdef scrollBar_esc 3128#ifdef scrollBar_esc
3191 { scrollBar_esc, PrivMode_scrollBar }, 3129 { scrollBar_esc, PrivMode_scrollBar },
3192#endif 3130#endif
3131 // 18, 19 printing-related
3193 { 25, PrivMode_VisibleCursor }, 3132 { 25, PrivMode_VisibleCursor },
3133 // 30 show scrollbar rxvt. extension
3194 { 35, PrivMode_ShiftKeys }, 3134 { 35, PrivMode_ShiftKeys }, // rxvt extension
3195 { 40, PrivMode_132OK }, 3135 { 40, PrivMode_132OK },
3136 // 41 xterm more fixes NYI
3137 // 45 margin bell NYI
3138 // 46 start logging
3196 { 47, PrivMode_Screen }, 3139 { 47, PrivMode_Screen },
3197 { 66, PrivMode_aplKP }, 3140 { 66, PrivMode_aplKP },
3198#ifndef NO_BACKSPACE_KEY 3141#ifndef NO_BACKSPACE_KEY
3199 { 67, PrivMode_BackSpace }, 3142 { 67, PrivMode_BackSpace },
3200#endif 3143#endif
3201 { 1000, PrivMode_MouseX11 }, 3144 { 1000, PrivMode_MouseX11 },
3145 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3146 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3147 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3202 { 1010, PrivMode_TtyOutputInh }, 3148 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3203 { 1011, PrivMode_Keypress }, 3149 { 1011, PrivMode_Keypress }, // rxvt extension
3150 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI
3204 { 1047, PrivMode_Screen }, 3153 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor
3205 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3206 }; 3157 };
3207 3158
3208 if (nargs == 0) 3159 if (nargs == 0)
3209 return; 3160 return;
3210 3161
… …
3225 state = privcases (mode, argtopriv[j].bit); 3176 state = privcases (mode, argtopriv[j].bit);
3226 break; 3177 break;
3227 } 3178 }
3228 3179
3229 /* extra handling for values with state unkept */ 3180 /* extra handling for values with state unkept */
3181 switch (arg[i])
3182 {
3183 case 1048: /* alternative cursor save */
3184 case 1049:
3185 if (mode == 0)
3186 scr_cursor (RESTORE);
3187 else if (mode == 1)
3188 scr_cursor (SAVE);
3189 /* FALLTHROUGH */
3190 }
3191
3230 if (state == -1) 3192 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */
3231 switch (arg[i]) 3194 switch (arg[i])
3232 { 3195 {
3233 case 1048: /* alternative cursor save */ 3196 /* case 1: - application cursor keys */
3197 case 2: /* VT52 mode */
3198 /* oddball mode. should be set regardless of set/reset
3199 * parameter. Return from VT52 mode with an ESC < from
3200 * within VT52 mode
3201 */
3202 PrivMode (1, PrivMode_vt52);
3203 break;
3204 case 3: /* 80/132 */
3205 if (PrivateModes & PrivMode_132OK)
3206 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3207 break;
3208 case 4: /* smooth scrolling */
3234 if (mode == 0) 3209 if (state)
3235 scr_cursor (RESTORE); 3210 Options &= ~Opt_jumpScroll;
3236 else if (mode == 1) 3211 else
3237 scr_cursor (SAVE); 3212 Options |= Opt_jumpScroll;
3213 break;
3214 case 5: /* reverse video */
3215 scr_rvideo_mode (state);
3216 break;
3217 case 6: /* relative/absolute origins */
3218 scr_relative_origin (state);
3219 break;
3220 case 7: /* autowrap */
3221 scr_autowrap (state);
3222 break;
3223 /* case 8: - auto repeat, can't do on a per window basis */
3224 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11);
3227 break;
3228#ifdef menuBar_esc
3229 case menuBar_esc:
3230#ifdef MENUBAR
3231 map_menuBar (state);
3232#endif
3233 break;
3234#endif
3235#ifdef scrollBar_esc
3236 case scrollBar_esc:
3237 if (scrollbar_mapping (state))
3238 {
3239 resize_all_windows (0, 0, 0);
3240 scr_touch (true);
3241 }
3242 break;
3243#endif
3244 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state);
3246 break;
3247 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */
3250 scr_change_screen (state);
3251 break;
3252 /* case 66: - application key pad */
3253 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10);
3257 break;
3258#if 0
3259 case 1001:
3260 break; /* X11 mouse highlighting */
3261#endif
3262 case 1010: /* scroll to bottom on TTY output inhibit */
3263 if (state)
3264 Options &= ~Opt_scrollTtyOutput;
3265 else
3266 Options |= Opt_scrollTtyOutput;
3267 break;
3268 case 1011: /* scroll to bottom on key press */
3269 if (state)
3270 Options |= Opt_scrollTtyKeypress;
3271 else
3272 Options &= ~Opt_scrollTtyKeypress;
3273 break;
3274 case 1047: /* secondary screen w/ clearing */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3276 if (current_screen != PRIMARY)
3277 scr_erase_screen (2);
3278 scr_change_screen (state);
3238 /* FALLTHROUGH */ 3279 /* FALLTHROUGH */
3239 default: 3280 default:
3240 continue; /* for (;i;) */ 3281 break;
3241 } 3282 }
3242
3243 /* extra handling for values with valid 0 or 1 state */
3244 switch (arg[i])
3245 {
3246 /* case 1: - application cursor keys */
3247 case 2: /* VT52 mode */
3248 /* oddball mode. should be set regardless of set/reset
3249 * parameter. Return from VT52 mode with an ESC < from
3250 * within VT52 mode
3251 */
3252 PrivMode (1, PrivMode_vt52);
3253 break;
3254 case 3: /* 80/132 */
3255 if (PrivateModes & PrivMode_132OK)
3256 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3257 (unsigned int)TermWin.height);
3258 break;
3259 case 4: /* smooth scrolling */
3260 if (state)
3261 Options &= ~Opt_jumpScroll;
3262 else
3263 Options |= Opt_jumpScroll;
3264 break;
3265 case 5: /* reverse video */
3266 scr_rvideo_mode (state);
3267 break;
3268 case 6: /* relative/absolute origins */
3269 scr_relative_origin (state);
3270 break;
3271 case 7: /* autowrap */
3272 scr_autowrap (state);
3273 break;
3274 /* case 8: - auto repeat, can't do on a per window basis */
3275 case 9: /* X10 mouse reporting */
3276 if (state) /* orthogonal */
3277 PrivateModes &= ~ (PrivMode_MouseX11);
3278 break;
3279#ifdef menuBar_esc
3280 case menuBar_esc:
3281#ifdef MENUBAR
3282 map_menuBar (state);
3283#endif
3284 break;
3285#endif
3286#ifdef scrollBar_esc
3287 case scrollBar_esc:
3288 if (scrollbar_mapping (state))
3289 {
3290 resize_all_windows (0, 0, 0);
3291 scr_touch (true);
3292 }
3293 break;
3294#endif
3295 case 25: /* visible/invisible cursor */
3296 scr_cursor_visible (state);
3297 break;
3298 /* case 35: - shift keys */
3299 /* case 40: - 80 <--> 132 mode */
3300 case 47: /* secondary screen */
3301 scr_change_screen (state);
3302 break;
3303 /* case 66: - application key pad */
3304 /* case 67: - backspace key */
3305 case 1000: /* X11 mouse reporting */
3306 if (state) /* orthogonal */
3307 PrivateModes &= ~ (PrivMode_MouseX10);
3308 break;
3309#if 0
3310 case 1001:
3311 break; /* X11 mouse highlighting */
3312#endif
3313 case 1010: /* scroll to bottom on TTY output inhibit */
3314 if (state)
3315 Options &= ~Opt_scrollTtyOutput;
3316 else
3317 Options |= Opt_scrollTtyOutput;
3318 break;
3319 case 1011: /* scroll to bottom on key press */
3320 if (state)
3321 Options |= Opt_scrollTtyKeypress;
3322 else
3323 Options &= ~Opt_scrollTtyKeypress;
3324 break;
3325 case 1047: /* secondary screen w/ clearing */
3326 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3327 if (current_screen != PRIMARY)
3328 scr_erase_screen (2);
3329 scr_change_screen (state);
3330 /* FALLTHROUGH */
3331 default:
3332 break;
3333 }
3334 } 3283 }
3335} 3284}
3336/*}}} */ 3285/*}}} */
3337 3286
3338/*{{{ process sgr sequences */ 3287/*{{{ process sgr sequences */
… …
3366 rendset = 1, rendstyle = RS_Blink; 3315 rendset = 1, rendstyle = RS_Blink;
3367 break; 3316 break;
3368 case 7: 3317 case 7:
3369 rendset = 1, rendstyle = RS_RVid; 3318 rendset = 1, rendstyle = RS_RVid;
3370 break; 3319 break;
3320 case 8:
3321 // invisible. NYI
3322 break;
3371 case 22: 3323 case 22:
3372 rendset = 0, rendstyle = RS_Bold; 3324 rendset = 0, rendstyle = RS_Bold;
3373 break; 3325 break;
3374 case 24: 3326 case 24:
3375 rendset = 0, rendstyle = RS_Uline; 3327 rendset = 0, rendstyle = RS_Uline;
… …
3378 rendset = 0, rendstyle = RS_Blink; 3330 rendset = 0, rendstyle = RS_Blink;
3379 break; 3331 break;
3380 case 27: 3332 case 27:
3381 rendset = 0, rendstyle = RS_RVid; 3333 rendset = 0, rendstyle = RS_RVid;
3382 break; 3334 break;
3335 case 28:
3336 // visible. NYI
3337 break;
3383 } 3338 }
3339
3384 if (rendset != -1) 3340 if (rendset != -1)
3385 { 3341 {
3386 scr_rendition (rendset, rendstyle); 3342 scr_rendition (rendset, rendstyle);
3387 continue; /* for (;i;) */ 3343 continue; /* for (;i;) */
3388 } 3344 }
… …
3395 case 33: 3351 case 33:
3396 case 34: 3352 case 34:
3397 case 35: 3353 case 35:
3398 case 36: 3354 case 36:
3399 case 37: 3355 case 37:
3400 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3356 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3401 Color_fg);
3402 break; 3357 break;
3403#ifdef TTY_256COLOR 3358#ifdef TTY_256COLOR
3404 case 38: 3359 case 38:
3405 if (nargs > i + 2 && arg[i + 1] == 5) 3360 if (nargs > i + 2 && arg[i + 1] == 5)
3406 { 3361 {
3407 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3408 Color_fg);
3409 i += 2; 3363 i += 2;
3410 } 3364 }
3411 break; 3365 break;
3412#endif 3366#endif
3413 case 39: /* default fg */ 3367 case 39: /* default fg */
… …
3420 case 43: 3374 case 43:
3421 case 44: 3375 case 44:
3422 case 45: 3376 case 45:
3423 case 46: 3377 case 46:
3424 case 47: 3378 case 47:
3425 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3426 Color_bg);
3427 break; 3380 break;
3428#ifdef TTY_256COLOR 3381#ifdef TTY_256COLOR
3429 case 48: 3382 case 48:
3430 if (nargs > i + 2 && arg[i + 1] == 5) 3383 if (nargs > i + 2 && arg[i + 1] == 5)
3431 { 3384 {
3432 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3385 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3433 Color_bg);
3434 i += 2; 3386 i += 2;
3435 } 3387 }
3436 break; 3388 break;
3437#endif 3389#endif
3438 case 49: /* default bg */ 3390 case 49: /* default bg */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines