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.47 by pcg, Sat Feb 21 21:12:20 2004 UTC vs.
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
51 52
52#include <wchar.h> 53#include <wchar.h>
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
56/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
57void 63void
58rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
59{ 65{
60 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
61 unsigned int newlen; 67 unsigned int newlen;
62 KeySym keysym; 68 KeySym keysym;
63#ifdef DEBUG_CMD 69#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 70 static int debug_key = 1; /* accessible by a debugger only */
65#endif 71#endif
66 int valid_keysym; 72 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 73 unsigned char kbuf[KBUFSZ];
68 74
69 /* 75 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 77 * escape sequence to toggle the Keypad.
… …
87#ifdef USE_XIM 93#ifdef USE_XIM
88 if (Input_Context) 94 if (Input_Context)
89 { 95 {
90 Status status_return; 96 Status status_return;
91 97
98#if 0
92#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
96 else 103 else
97#endif 104#endif
98 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 110 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 115 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 116 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 117 SET_LOCALE (locale);
111 118
112 if (status_return == XLookupChars 119 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 120 || status_return == XLookupBoth)
114 { 121 {
122 /* make sure the user can type ctrl-@, i.e. NUL */
123 if (len == 1 && *wkbuf == 0)
124 {
125 kbuf[0] = 0;
126 len = 1;
127 }
128 else
129 {
115 wkbuf[len] = 0; 130 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 131 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 132 if (len < 0)
118 len = 0; 133 len = 0;
134 }
119 } 135 }
120 else 136 else
121 len = 0; 137 len = 0;
122 } 138 }
123 139
124 valid_keysym = status_return == XLookupKeySym 140 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 141 || status_return == XLookupBoth;
126 } 142 }
127 else 143 else
128#endif 144#endif
129
130 { 145 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 147 valid_keysym = keysym != NoSymbol;
133 } 148 }
134 149
135 if (valid_keysym) 150 if (valid_keysym)
136 { 151 {
137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL
140 if (ctrl)
141# else
142 if (meta)
143# endif
144 {
145 if (keysym == ks_bigfont)
146 {
147 change_font (0, FONT_UP);
148 return;
149 }
150 else if (keysym == ks_smallfont)
151 {
152 change_font (0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (TermWin.saveLines) 152 if (TermWin.saveLines)
159 { 153 {
160#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 155 if (!ctrl && !meta)
162 { 156 {
163#else 157#else
164 if (IS_SCROLL_MOD) 158 if (IS_SCROLL_MOD)
165 { 159 {
166#endif 160#endif
167 int lnsppg; 161 int lnsppg;
168 162
169#ifdef PAGING_CONTEXT_LINES 163#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 165#else
172 lnsppg = TermWin.nrow * 4 / 5; 166 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 204 scr_move_to (1, 0);
211 return; 205 return;
212 } 206 }
213 } 207 }
214#endif 208#endif
215
216 } 209 }
217 210
218 if (shft) 211 if (shft)
219 { 212 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 213 /* Shift + F1 - F10 generates F11 - F20 */
… …
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 224 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 225 selection_request (ev.time, 0, 0);
233 return; 226 return;
234 /* rxvt extras */ 227 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 229 change_font (FONT_UP);
237 return; 230 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 232 change_font (FONT_DN);
240 return; 233 return;
241 } 234 }
242 } 235 }
243 } 236 }
244#ifdef PRINTPIPE 237#ifdef PRINTPIPE
245 if (keysym == XK_Print) 238 if (keysym == XK_Print)
246 { 239 {
247 scr_printscreen (ctrl | shft); 240 scr_printscreen (ctrl | shft);
248 return;
249 }
250#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode () == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset ();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return; 241 return;
265 } 242 }
266#endif 243#endif
267 244
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
270#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
271 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 249 {
273 unsigned int l; 250 unsigned int l;
274 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC;
276 252
277 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
279 255
280 /* escape prefix */ 256 /* escape prefix */
281 if (meta) 257 if (meta
282# ifdef META8_OPTION 258# ifdef META8_OPTION
283 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
284# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
285 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
286 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
287 return; 268 return;
288 } 269 }
289 else 270 else
290#endif 271#endif
291
292 { 272 {
293 newlen = 1; 273 newlen = 1;
294 switch (keysym) 274 switch (keysym)
295 { 275 {
296#ifndef NO_BACKSPACE_KEY 276#ifndef NO_BACKSPACE_KEY
… …
301 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
303 } 283 }
304 else 284 else
305 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
311 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 }
317# endif
318 break; 286 break;
319#endif 287#endif
320#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
321 case XK_Delete: 289 case XK_Delete:
322 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN (kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 291 break;
336#endif 292#endif
337 case XK_Tab: 293 case XK_Tab:
338 if (shft) 294 if (shft)
339 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
349#endif 305#endif
350 newlen = 0; 306 newlen = 0;
351 } 307 }
352 break; 308 break;
353 309
354
355#ifdef XK_KP_Left 310#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 316 {
… …
382 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
383 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 339 }
385 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 342 break;
423 343
424#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
426 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
482 STRCPY (kbuf, "\033OP"); 402 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 403 kbuf[2] += (keysym - XK_KP_F1);
484 break; 404 break;
485 405
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 406 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 407 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 408 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 409 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 410 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 411 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 412 case XK_KP_0: /* "\033Op" : "0" */
… …
615 break; 535 break;
616 } 536 }
617 if (newlen) 537 if (newlen)
618 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
619 } 539 }
540
620 /* 541 /*
621 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
622 */ 543 */
623#ifdef META8_OPTION 544#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
639 { 560 {
640 unsigned char *ch; 561 unsigned char *ch;
641 562
642 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 564 *ch |= 0x80;
565
644 meta = 0; 566 meta = 0;
645 } 567 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat (kbuf, len);
650#endif 568#endif
651 /* nil */ ; 569 /* nil */ ;
652 } 570 }
653 } 571 }
654 572
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 596
679 /* escape prefix */ 597 /* escape prefix */
680 if (meta 598 if (meta
681#ifdef META8_OPTION 599#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
683#endif 601#endif
684 ) 602 )
685 { 603 {
686 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
687
688 tt_write (&ch, 1); 605 tt_write (&ch, 1);
689 } 606 }
607
690#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
693 char *p; 610 unsigned char *p;
694 int i; 611 int i;
695 612
696 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf (stderr, "'\n"); 616 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
703} 619}
704/*}}} */ 620/*}}} */
705 621
… …
707/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
709unsigned int 625unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 627{
712 unsigned int n, s; 628 unsigned int n, s;
713 629
714 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
716 if (n > 0 && s < count) 633 if (n > 0 && s < count)
717 { 634 {
718 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
722 s += n; 639 s += n;
723 } 640 }
641
724 if (count > s) 642 if (count > s)
725 { 643 {
726 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 645 count = s;
728 } 646 }
647
729 for (; count--;) 648 for (; count--;)
730 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
731 return 0; 653 return 0;
732} 654}
733#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
734 656
735void 657void
… …
739 if (want_full_refresh) 661 if (want_full_refresh)
740 { 662 {
741 want_full_refresh = 0; 663 want_full_refresh = 0;
742 scr_clear (); 664 scr_clear ();
743 scr_touch (false); 665 scr_touch (false);
744 want_refresh = 1;
745 } 666 }
746#endif 667#endif
747 668
748 if (want_refresh) 669 if (want_refresh)
749 { 670 {
750 scr_refresh (refresh_type); 671 scr_refresh (refresh_type);
751 scrollbar_show (1); 672 scrollbar_show (1);
752#ifdef USE_XIM 673#ifdef USE_XIM
753 IMSendSpot (); 674 IMSendSpot ();
754#endif 675#endif
755
756 } 676 }
757 677
758 display->flush (); 678 display->flush ();
679
680 flush_ev.stop ();
759} 681}
760 682
761void 683void
762rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
763{ 685{
764 SET_R (this); 686 SET_R (this);
765 SET_LOCALE (locale); 687 SET_LOCALE (locale);
766 688
689 display->flush ();
690
691 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01);
693}
694
695void
696rxvt_term::flush_cb (time_watcher &w)
697{
698 SET_R (this);
699 SET_LOCALE (locale);
700
701 refresh_limit = 1;
702 refresh_count = 0;
767 flush (); 703 flush ();
768} 704}
769 705
770#ifdef CURSOR_BLINK 706#ifdef CURSOR_BLINK
771void 707void
… …
789 w.start (w.at + TEXT_BLINK_INTERVAL); 725 w.start (w.at + TEXT_BLINK_INTERVAL);
790 } 726 }
791} 727}
792#endif 728#endif
793 729
730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
731void
732rxvt_term::cont_scroll_cb (time_watcher &w)
733{
734 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 }
741}
742#endif
743
744#ifdef SELECTION_SCROLLING
745void
746rxvt_term::sel_scroll_cb (time_watcher &w)
747{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 }
755}
756#endif
757
758#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
759void
760rxvt_term::slip_wheel_cb (time_watcher &w)
761{
762 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed))
765 {
766 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 }
770}
771#endif
772
794bool 773bool
795rxvt_term::pty_fill () 774rxvt_term::pty_fill ()
796{ 775{
797 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 776 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777
778 if (CBUFSIZ == n)
779 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
781 n = 0;
782 }
798 783
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 784 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 785 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 786 cmdbuf_endp = cmdbuf_ptr + n;
802 787
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
804 789
805 if (n > 0) 790 if (n > 0)
806 { 791 {
807 cmdbuf_endp += n; 792 cmdbuf_endp += n;
808 return true; 793 return true;
809 } 794 }
810 else if (n < 0 && errno != EAGAIN) 795 else if (n < 0 && errno != EAGAIN)
811 destroy (); 796 destroy ();
812 797
813 return false; 798 return false;
814} 799}
815 800
816void 801void
817rxvt_term::pty_cb (io_watcher &w, short revents) 802rxvt_term::pty_cb (io_watcher &w, short revents)
… …
820 SET_LOCALE (locale); 805 SET_LOCALE (locale);
821 806
822 if (revents & EVENT_WRITE) 807 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 808 tt_write (0, 0);
824 else if (revents & EVENT_READ) 809 else if (revents & EVENT_READ)
825 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us 810 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ()) 811 while (pty_fill ())
831 { 812 if (cmd_parse ())
832 if (!seen_input)
833 {
834 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch ();
837 }
838
839 uint32_t ch = NOCHAR;
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break; 813 break;
848
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch;
858
859 for (;;)
860 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else
866 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (! (Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true;
878 flag = false;
879 ch = NOCHAR;
880 break;
881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 }
898 }
899
900 scr_add_lines (buf, nlines, str - buf);
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
914 refresh_limit++;
915
916 scr_refresh (refresh_type);
917 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 }
936 }
937 }
938 }
939} 814}
940 815
941// read the next character, currently handles UTF-8 816void
942// will probably handle all sorts of other stuff in the future 817rxvt_term::pointer_unblank ()
943uint32_t
944rxvt_term::next_char ()
945{ 818{
946 while (cmdbuf_ptr < cmdbuf_endp) 819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
947 { 820 recolour_cursor ();
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++;
950 821
951 wchar_t wc; 822#ifdef POINTER_BLANK
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 823 hidden_pointer = 0;
953 824
954 if (len == (size_t)-2) 825 if (Options & Opt_pointerBlank)
955 return NOCHAR; 826 pointer_ev.start (NOW + pointerBlankDelay);
956 827#endif
957 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959
960 // assume wchar == unicode
961 cmdbuf_ptr += len;
962 return wc;
963 }
964
965 return NOCHAR;
966}
967
968/* rxvt_cmd_getc () - Return next input character */
969/*
970 * Return the next input character after first passing any keyboard input
971 * to the command.
972 */
973uint32_t
974rxvt_term::cmd_getc ()
975{
976 for (;;)
977 {
978 uint32_t c = next_char ();
979 if (c != NOCHAR)
980 return c;
981
982 // incomplete sequences should occur rarely, still, a better solution
983 // would be preferred. either setjmp/longjmp or better design.
984 fcntl (cmd_fd, F_SETFL, 0);
985 pty_fill ();
986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
987 }
988} 828}
989 829
990#ifdef POINTER_BLANK 830#ifdef POINTER_BLANK
991void 831void
992rxvt_term::pointer_unblank ()
993{
994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
995 recolour_cursor ();
996
997 hidden_pointer = 0;
998
999 if (Options & Opt_pointerBlank)
1000 pointer_ev.start (NOW + pointerBlankDelay);
1001}
1002
1003void
1004rxvt_term::pointer_blank () 832rxvt_term::pointer_blank ()
1005{ 833{
1006 if (! (Options & Opt_pointerBlank)) 834 if (! (Options & Opt_pointerBlank))
1007 return; 835 return;
1008 836
… …
1021 pointer_blank (); 849 pointer_blank ();
1022} 850}
1023#endif 851#endif
1024 852
1025void 853void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 854rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 855{
1028 int button_number, key_state = 0; 856 int button_number, key_state = 0;
1029 int x, y; 857 int x, y;
1030 858
1031 x = ev.x; 859 x = ev.x;
1032 y = ev.y; 860 y = ev.y;
1033 pixel_position (&x, &y); 861 pixel_position (&x, &y);
1034 862
… …
1203 break; 1031 break;
1204 1032
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1034 case KeyRelease:
1207 { 1035 {
1208 if (! (ev.xkey.state & ControlMask)) 1036 if (!(ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 1037 slip_wheel_ev.stop ();
1210 else 1038 else
1211 { 1039 {
1212 KeySym ks; 1040 KeySym ks;
1213 1041
1214 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 1043 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 1044 mouse_slip_wheel_speed = 0;
1217 } 1045 }
… …
1237 && (ev.xclient.data.l[0] == DndFile 1065 && (ev.xclient.data.l[0] == DndFile
1238 || ev.xclient.data.l[0] == DndDir 1066 || ev.xclient.data.l[0] == DndDir
1239 || ev.xclient.data.l[0] == DndLink)) 1067 || ev.xclient.data.l[0] == DndLink))
1240 { 1068 {
1241 /* Get Dnd data */ 1069 /* Get Dnd data */
1242 Atom ActualType; 1070 Atom ActualType;
1243 int ActualFormat; 1071 int ActualFormat;
1244 unsigned char *data; 1072 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1073 unsigned long Size, RemainingBytes;
1246 1074
1247 XGetWindowProperty (display->display, display->root, 1075 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1076 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1077 0L, 1000000L,
1250 False, AnyPropertyType, 1078 False, AnyPropertyType,
… …
1253 &data); 1081 &data);
1254 XChangeProperty (display->display, display->root, 1082 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1083 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1084 8, PropModeReplace,
1257 data, STRLEN (data)); 1085 data, STRLEN (data));
1086 XFree (data);
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1087 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1089 }
1261#endif /* OFFIX_DND */ 1090#endif /* OFFIX_DND */
1262 break; 1091 break;
1263 1092
1264 case MappingNotify: 1093 case MappingNotify:
1265 XRefreshKeyboardMapping (& (ev.xmapping)); 1094 XRefreshKeyboardMapping (&ev.xmapping);
1266 break; 1095 break;
1267 1096
1268 /* 1097 /*
1269 * XXX: this is not the _current_ arrangement 1098 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1099 * Here's my conclusion:
… …
1301#endif 1130#endif
1302#ifdef CURSOR_BLINK 1131#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1132 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif 1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 {
1138 PixColors = PixColorsFocused;
1139 set_colorfgbg ();
1140 scr_clear ();
1141 scr_touch (true);
1142 }
1143#endif
1306 1144
1307 } 1145 }
1308 break; 1146 break;
1309 1147
1310 case FocusOut: 1148 case FocusOut:
… …
1319#ifdef CURSOR_BLINK 1157#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1158 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1159 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1160 hidden_cursor = 0;
1323#endif 1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1324 1171
1325 } 1172 }
1326 break; 1173 break;
1327 1174
1328 case ConfigureNotify: 1175 case ConfigureNotify:
… …
1337 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1185 }
1339 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1187
1341 if (szHint.width != width || szHint.height != height) 1188 if (szHint.width != width || szHint.height != height)
1342 {
1343 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1189 resize_all_windows (width, height, 1);
1345 } 1190
1346#ifdef DEBUG_SIZE
1347 else
1348 {
1349 D_SIZE ((stderr, "Size: Not resizing"));
1350 }
1351#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1192 if (Options & Opt_transparent)
1354 { 1193 {
1355 check_our_parents (); 1194 check_our_parents ();
1356 if (am_transparent) 1195 if (am_transparent)
1357 want_full_refresh = 1; 1196 want_refresh = want_full_refresh = 1;
1358 } 1197 }
1359#endif 1198#endif
1360
1361 } 1199 }
1362 break; 1200 break;
1363 1201
1364 case SelectionClear: 1202 case SelectionClear:
1365 display->set_selection_owner (0); 1203 selection_clear ();
1366 break; 1204 break;
1367 1205
1368 case SelectionNotify: 1206 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1207 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1208 selection_paste (ev.xselection.requestor,
… …
1397 1235
1398 case GraphicsExpose: 1236 case GraphicsExpose:
1399 case Expose: 1237 case Expose:
1400 if (ev.xany.window == TermWin.vt) 1238 if (ev.xany.window == TermWin.vt)
1401 { 1239 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1240 do
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1241 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1242 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1406 // don't understand this, so commented it out 1244
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1407 scr_expose (ev.xexpose.x, ev.xexpose.y, 1248 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev.xexpose.width, ev.xexpose.height, False); 1249 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev.xexpose.x, 0, 1250
1410 // ev.xexpose.width, TermWin.height, False); 1251 scr_refresh (refresh_type);
1411#endif
1412 want_refresh = 1;
1413 } 1252 }
1414 else 1253 else
1415 { 1254 {
1416 XEvent unused_event; 1255 XEvent unused_event;
1417 1256
1418 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1419 Expose, 1258 ;
1420 &unused_event)) ;
1421 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1422 GraphicsExpose, 1260 ;
1423 &unused_event)) ; 1261
1424 if (isScrollbarWindow (ev.xany.window)) 1262 if (isScrollbarWindow (ev.xany.window))
1425 { 1263 {
1426 scrollBar.setIdle (); 1264 scrollBar.setIdle ();
1427 scrollbar_show (0); 1265 scrollbar_show (0);
1428 } 1266 }
1429#ifdef MENUBAR 1267#ifdef MENUBAR
1430 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1431 menubar_expose (); 1269 menubar_expose ();
1432#endif 1270#endif
1433#ifdef RXVT_GRAPHICS
1434 Gr_expose (ev.xany.window);
1435#endif
1436 1271
1272#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window);
1275#endif
1437 } 1276 }
1438 break; 1277 break;
1439 1278
1440 case MotionNotify: 1279 case MotionNotify:
1441#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
… …
1443 pointer_unblank (); 1282 pointer_unblank ();
1444#endif 1283#endif
1445#if MENUBAR 1284#if MENUBAR
1446 if (isMenuBarWindow (ev.xany.window)) 1285 if (isMenuBarWindow (ev.xany.window))
1447 { 1286 {
1448 menubar_control (& (ev.xbutton)); 1287 menubar_control (ev.xbutton);
1449 break; 1288 break;
1450 } 1289 }
1451#endif 1290#endif
1452 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1453 break; 1292 break;
… …
1475 if (ev.xbutton.y < TermWin.int_bwidth 1314 if (ev.xbutton.y < TermWin.int_bwidth
1476 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1477 { 1316 {
1478 int dist; 1317 int dist;
1479 1318
1480 pending_scroll_selection=1;
1481
1482 /* don't clobber the current delay if we are 1319 /* don't clobber the current delay if we are
1483 * already in the middle of scrolling. 1320 * already in the middle of scrolling.
1484 */ 1321 */
1485 if (scroll_selection_delay<=0) 1322 if (!sel_scroll_ev.active)
1486 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1487 1324
1488 /* save the event params so we can highlight 1325 /* save the event params so we can highlight
1489 * the selection in the pending-scroll loop 1326 * the selection in the pending-scroll loop
1490 */ 1327 */
1491 selection_save_x=ev.xbutton.x; 1328 selection_save_x=ev.xbutton.x;
… …
1513 else 1350 else
1514 { 1351 {
1515 /* we are within the text window, so we 1352 /* we are within the text window, so we
1516 * shouldn't be scrolling 1353 * shouldn't be scrolling
1517 */ 1354 */
1518 pending_scroll_selection = 0; 1355 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop();
1519 } 1357 }
1520#endif 1358#endif
1521#ifdef MOUSE_THRESHOLD 1359#ifdef MOUSE_THRESHOLD
1522 1360
1523 } 1361 }
… …
1573 return; 1411 return;
1574 } 1412 }
1575 1413
1576 /* FALLTHROUGH */ 1414 /* FALLTHROUGH */
1577 case ReparentNotify: 1415 case ReparentNotify:
1578 if ((Options & Opt_transparent) && check_our_parents ()) 1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1579 if (am_transparent)
1580 want_full_refresh = 1; 1417 want_refresh = want_full_refresh = 1;
1581 break; 1418 break;
1582#endif 1419#endif
1583 } 1420 }
1584} 1421}
1585 1422
1586void 1423void
1587rxvt_term::button_press (const XButtonEvent &ev) 1424rxvt_term::button_press (XButtonEvent &ev)
1588{ 1425{
1589 int reportmode = 0, clickintime; 1426 int reportmode = 0, clickintime;
1590 1427
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1429 if (!bypass_keystate)
… …
1594 /* 1431 /*
1595 * VT window processing of button press 1432 * VT window processing of button press
1596 */ 1433 */
1597 if (ev.window == TermWin.vt) 1434 if (ev.window == TermWin.vt)
1598 { 1435 {
1599#if RXVT_GRAPHICS
1600 if (ev.subwindow != None)
1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else
1603#endif
1604
1605 {
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1437 if (reportmode)
1438 {
1439 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime)
1608 { 1444 {
1609 /* mouse report from vt window */ 1445 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1446 MEvent.clicks++;
1611 MEvent.state = ev.state; 1447 if (MEvent.clicks > 1)
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1448 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1449 /* only report double clicks */
1620 MEvent.clicks = 2; 1450 MEvent.clicks = 2;
1621 mouse_report (ev); 1451 mouse_report (ev);
1622 1452
1623 /* don't report the release */ 1453 /* don't report the release */
1624 MEvent.clicks = 0; 1454 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1455 MEvent.button = AnyButton;
1626 }
1627 } 1456 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev.button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 } 1457 }
1641 else 1458 else
1642 { 1459 {
1460 /* different button, or time expired */
1461 MEvent.clicks = 1;
1462 MEvent.button = ev.button;
1463 mouse_report (ev);
1464 }
1465#else
1466 MEvent.button = ev.button;
1467 mouse_report (ev);
1468#endif /* MOUSE_REPORT_DOUBLECLICK */
1469
1470 }
1471 else
1472 {
1643 if (ev.button != MEvent.button) 1473 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1474 MEvent.clicks = 0;
1645 switch (ev.button) 1475 switch (ev.button)
1646 { 1476 {
1647 case Button1: 1477 case Button1:
1648 /* allow shift+left click to extend selection */ 1478 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1480 {
1651 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev.x, ev.y, 1);
1655 }
1656 else
1657 {
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev.x, ev.y);
1664 }
1665
1666 MEvent.button = Button1;
1667 break;
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1481 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1482 selection_rotate (ev.x, ev.y);
1672 else 1483 else
1673 selection_extend (ev.x, ev.y, 1); 1484 selection_extend (ev.x, ev.y, 1);
1485 }
1486 else
1487 {
1488 if (MEvent.button == Button1 && clickintime)
1489 MEvent.clicks++;
1490 else
1491 MEvent.clicks = 1;
1492
1493 selection_click (MEvent.clicks, ev.x, ev.y);
1494 }
1495
1496 MEvent.button = Button1;
1497 break;
1498
1499 case Button3:
1500 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y);
1502 else
1503 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1504 MEvent.button = Button3;
1675 break; 1505 break;
1676 }
1677 } 1506 }
1507 }
1678 MEvent.time = ev.time; 1508 MEvent.time = ev.time;
1679 return; 1509 return;
1680 }
1681 } 1510 }
1682 1511
1683 /* 1512 /*
1684 * Scrollbar window processing of button press 1513 * Scrollbar window processing of button press
1685 */ 1514 */
… …
1749 upordown = 1; /* down */ 1578 upordown = 1; /* down */
1750 } 1579 }
1751 if (upordown) 1580 if (upordown)
1752 { 1581 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1754 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1755#endif 1584#endif
1756 if (scr_page (upordown < 0 ? UP : DN, 1)) 1585 if (scr_page (upordown < 0 ? UP : DN, 1))
1757 { 1586 {
1758 if (upordown < 0) 1587 if (upordown < 0)
1759 scrollBar.setUp (); 1588 scrollBar.setUp ();
… …
1775 break; 1604 break;
1776 case R_SB_ALIGN_BOTTOM: 1605 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 1606 csrO = scrollBar.bot - scrollBar.top;
1778 break; 1607 break;
1779 } 1608 }
1609
1780 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider (ev.y) 1611 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider (ev.y)) 1612 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position (ev.y) - csrO, 1613 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1784 scrollbar_size ()); 1614
1785 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1786 break; 1616 break;
1787 1617
1788 case Button1: 1618 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1813 scr_page ((ev.button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 1644 (TermWin.nrow
1815 * scrollbar_position (ev.y) 1645 * scrollbar_position (ev.y)
1816 / scrollbar_size ())); 1646 / scrollbar_size ()));
1817 } 1647 }
1648
1818 break; 1649 break;
1819 } 1650 }
1820 } 1651 }
1821 return; 1652 return;
1822 } 1653 }
… …
1828 menubar_control (ev); 1659 menubar_control (ev);
1829#endif 1660#endif
1830} 1661}
1831 1662
1832void 1663void
1833rxvt_term::button_release (const XButtonEvent &ev) 1664rxvt_term::button_release (XButtonEvent &ev)
1834{ 1665{
1835 int reportmode = 0; 1666 int reportmode = 0;
1836 1667
1837 csrO = 0; /* reset csr Offset */ 1668 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1669 if (!bypass_keystate)
… …
1846 refresh_type &= ~SMOOTH_REFRESH; 1677 refresh_type &= ~SMOOTH_REFRESH;
1847#endif 1678#endif
1848 1679
1849 } 1680 }
1850#ifdef SELECTION_SCROLLING 1681#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1682 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop();
1852#endif 1684#endif
1853 if (ev.window == TermWin.vt) 1685 if (ev.window == TermWin.vt)
1854 { 1686 {
1855#ifdef RXVT_GRAPHICS
1856 if (ev.subwindow != None)
1857 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1858 else
1859#endif
1860
1861 {
1862 if (reportmode) 1687 if (reportmode)
1688 {
1689 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4)
1692 return;
1693#ifdef MOUSE_REPORT_DOUBLECLICK
1694 /* only report the release of 'slow' single clicks */
1695 if (MEvent.button != AnyButton
1696 && (ev.button != MEvent.button
1697 || (ev.time - MEvent.time
1698 > MULTICLICK_TIME / 2)))
1863 { 1699 {
1864 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */
1866 if (ev.button >= 4)
1867 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev.button != MEvent.button
1872 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1874 {
1875 MEvent.clicks = 0; 1700 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 1701 MEvent.button = AnyButton;
1881 mouse_report (ev); 1702 mouse_report (ev);
1703 }
1704#else /* MOUSE_REPORT_DOUBLECLICK */
1705 MEvent.button = AnyButton;
1706 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 1707#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 1708 return;
1884 } 1709 }
1885 /* 1710 /*
1886 * dumb hack to compensate for the failure of click-and-drag 1711 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1712 * when overriding mouse reporting
1888 */ 1713 */
1889 if (PrivateModes & PrivMode_mouse_report 1714 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1715 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1) 1716 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0); 1717 selection_extend (ev.x, ev.y, 0);
1893 1718
1894 switch (ev.button) 1719 switch (ev.button)
1720 {
1721 case Button1:
1722 case Button3:
1723 selection_make (ev.time);
1724 break;
1725 case Button2:
1726 selection_request (ev.time, ev.x, ev.y);
1727 break;
1728#ifdef MOUSE_WHEEL
1729 case Button4:
1730 case Button5:
1895 { 1731 {
1896 case Button1: 1732 int i;
1897 case Button3: 1733 page_dirn v;
1898 selection_make (ev.time); 1734
1735 v = ev.button == Button4 ? UP : DN;
1736
1737 if (ev.state & ShiftMask)
1899 break; 1738 i = 1;
1900 case Button2: 1739 else if (Options & Opt_mouseWheelScrollPage)
1901 selection_request (ev.time, ev.x, ev.y); 1740 i = TermWin.nrow - 1;
1741 else
1902 break; 1742 i = 5;
1743
1903#ifdef MOUSE_WHEEL 1744# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 1745 if (ev.state & ControlMask)
1905 case Button5:
1906 { 1746 {
1907 int i;
1908 page_dirn v;
1909
1910 v = (ev.button == Button4) ? UP : DN;
1911 if (ev.state & ShiftMask)
1912 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1;
1915 else
1916 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING
1918 if (ev.state & ControlMask)
1919 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1); 1747 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1750
1751 if (slip_wheel_ev.at < NOW)
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753
1754 slip_wheel_ev.start ();
1922 } 1755 }
1756 else
1757 {
1923# endif 1758# endif
1924# ifdef JUMP_MOUSE_WHEEL 1759# ifdef JUMP_MOUSE_WHEEL
1925 scr_page (v, i); 1760 scr_page (v, i);
1926 scr_refresh (SMOOTH_REFRESH); 1761 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 1762 scrollbar_show (1);
… …
1931 scr_page (v, 1); 1766 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH); 1767 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 1768 scrollbar_show (1);
1934 } 1769 }
1935# endif 1770# endif
1936 1771# ifdef MOUSE_SLIP_WHEELING
1937 } 1772 }
1938 break;
1939#endif 1773#endif
1940
1941 } 1774 }
1775 break;
1776#endif
1942 } 1777 }
1943 } 1778 }
1944#ifdef MENUBAR 1779#ifdef MENUBAR
1945 else if (isMenuBarWindow (ev.window)) 1780 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1781 menubar_control (ev);
1947#endif 1782#endif
1948} 1783}
1949 1784
1950
1951#ifdef TRANSPARENT 1785#ifdef TRANSPARENT
1786#if TINTING
1787/* taken from aterm-0.4.2 */
1788
1789typedef uint32_t RUINT32T;
1790
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{
1793 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i;
1799
1800 Visual* visual = display->visual;
1801
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803
1804 /* for convenience */
1805 mask_r = visual->red_mask;
1806 mask_g = visual->green_mask;
1807 mask_b = visual->blue_mask;
1808
1809 /* boring lookup table pre-initialization */
1810 switch (srcImage->bits_per_pixel) {
1811 case 15:
1812 if ((mask_r != 0x7c00) ||
1813 (mask_g != 0x03e0) ||
1814 (mask_b != 0x001f))
1815 return;
1816 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1817 lookup_r = lookup;
1818 lookup_g = lookup+32;
1819 lookup_b = lookup+32+32;
1820 sh_r = 10;
1821 sh_g = 5;
1822 sh_b = 0;
1823 break;
1824 case 16:
1825 if ((mask_r != 0xf800) ||
1826 (mask_g != 0x07e0) ||
1827 (mask_b != 0x001f))
1828 return;
1829 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1830 lookup_r = lookup;
1831 lookup_g = lookup+32;
1832 lookup_b = lookup+32+64;
1833 sh_r = 11;
1834 sh_g = 5;
1835 sh_b = 0;
1836 break;
1837 case 24:
1838 if ((mask_r != 0xff0000) ||
1839 (mask_g != 0x00ff00) ||
1840 (mask_b != 0x0000ff))
1841 return;
1842 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1843 lookup_r = lookup;
1844 lookup_g = lookup+256;
1845 lookup_b = lookup+256+256;
1846 sh_r = 16;
1847 sh_g = 8;
1848 sh_b = 0;
1849 break;
1850 case 32:
1851 if ((mask_r != 0xff0000) ||
1852 (mask_g != 0x00ff00) ||
1853 (mask_b != 0x0000ff))
1854 return;
1855 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1856 lookup_r = lookup;
1857 lookup_g = lookup+256;
1858 lookup_b = lookup+256+256;
1859 sh_r = 16;
1860 sh_g = 8;
1861 sh_b = 0;
1862 break;
1863 default:
1864 return; /* we do not support this color depth */
1865 }
1866
1867 /* prepare limits for color transformation (each channel is handled separately) */
1868 if (shade < 0) {
1869 shade = -shade;
1870 if (shade < 0) shade = 0;
1871 if (shade > 100) shade = 100;
1872
1873 lower_lim_r = 65535-rm;
1874 lower_lim_g = 65535-gm;
1875 lower_lim_b = 65535-bm;
1876
1877 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1878 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1879 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1880
1881 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1882 } else {
1883 if (shade < 0) shade = 0;
1884 if (shade > 100) shade = 100;
1885
1886 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1887
1888 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1889 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1890 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1891 }
1892
1893 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1894 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1895 {
1896 unsigned int tmp;
1897
1898 tmp = lower_lim_r;
1899 lower_lim_r = lower_lim_b;
1900 lower_lim_b = tmp;
1901
1902 tmp = upper_lim_r;
1903 upper_lim_r = upper_lim_b;
1904 upper_lim_b = tmp;
1905 }
1906
1907 /* fill our lookup tables */
1908 for (i = 0; i <= mask_r>>sh_r; i++)
1909 {
1910 RUINT32T tmp;
1911 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1912 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1913 lookup_r[i] = (tmp/65535)<<sh_r;
1914 }
1915 for (i = 0; i <= mask_g>>sh_g; i++)
1916 {
1917 RUINT32T tmp;
1918 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1919 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1920 lookup_g[i] = (tmp/65535)<<sh_g;
1921 }
1922 for (i = 0; i <= mask_b>>sh_b; i++)
1923 {
1924 RUINT32T tmp;
1925 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1926 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1927 lookup_b[i] = (tmp/65535)<<sh_b;
1928 }
1929
1930 /* apply table to input image (replacing colors by newly calculated ones) */
1931 switch (srcImage->bits_per_pixel)
1932 {
1933 case 15:
1934 {
1935 unsigned short *p1, *pf, *p, *pl;
1936 p1 = (unsigned short *) srcImage->data;
1937 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1938 while (p1 < pf)
1939 {
1940 p = p1;
1941 pl = p1 + srcImage->width;
1942 for (; p < pl; p++)
1943 {
1944 *p = lookup_r[(*p & 0x7c00)>>10] |
1945 lookup_g[(*p & 0x03e0)>> 5] |
1946 lookup_b[(*p & 0x001f)];
1947 }
1948 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1949 }
1950 break;
1951 }
1952 case 16:
1953 {
1954 unsigned short *p1, *pf, *p, *pl;
1955 p1 = (unsigned short *) srcImage->data;
1956 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1957 while (p1 < pf)
1958 {
1959 p = p1;
1960 pl = p1 + srcImage->width;
1961 for (; p < pl; p++)
1962 {
1963 *p = lookup_r[(*p & 0xf800)>>11] |
1964 lookup_g[(*p & 0x07e0)>> 5] |
1965 lookup_b[(*p & 0x001f)];
1966 }
1967 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1968 }
1969 break;
1970 }
1971 case 24:
1972 {
1973 unsigned char *p1, *pf, *p, *pl;
1974 p1 = (unsigned char *) srcImage->data;
1975 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1976 while (p1 < pf)
1977 {
1978 p = p1;
1979 pl = p1 + srcImage->width * 3;
1980 for (; p < pl; p += 3)
1981 {
1982 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1983 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1984 p[2] = lookup_r[(p[2] & 0x0000ff)];
1985 }
1986 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1987 }
1988 break;
1989 }
1990 case 32:
1991 {
1992 RUINT32T *p1, *pf, *p, *pl;
1993 p1 = (RUINT32T *) srcImage->data;
1994 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1995
1996 while (p1 < pf)
1997 {
1998 p = p1;
1999 pl = p1 + srcImage->width;
2000 for (; p < pl; p++)
2001 {
2002 *p = lookup_r[(*p & 0xff0000)>>16] |
2003 lookup_g[(*p & 0x00ff00)>> 8] |
2004 lookup_b[(*p & 0x0000ff)] |
2005 (*p & ~0xffffff);
2006 }
2007 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2008 }
2009 break;
2010 }
2011 }
2012
2013 free (lookup);
2014}
2015#endif
2016
1952/* 2017/*
1953 * Check our parents are still who we think they are. 2018 * Check our parents are still who we think they are.
1954 * Do transparency updates if required 2019 * Do transparency updates if required
1955 */ 2020 */
1956int 2021int
1957rxvt_term::check_our_parents () 2022rxvt_term::check_our_parents ()
1958{ 2023{
1959 int i, pchanged, aformat, have_pixmap, rootdepth; 2024 int i, pchanged, aformat, have_pixmap, rootdepth;
1960 unsigned long nitems, bytes_after; 2025 unsigned long nitems, bytes_after;
1961 Atom atype; 2026 Atom atype;
1962 unsigned char *prop = NULL; 2027 unsigned char *prop = NULL;
1963 Window root, oldp, *list; 2028 Window root, oldp, *list;
1964 Pixmap rootpixmap = None; 2029 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 2030 XWindowAttributes wattr, wrootattr;
1966 2031
1967 pchanged = 0; 2032 pchanged = 0;
1968 2033
1969 if (! (Options & Opt_transparent)) 2034 if (!(Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 2035 return pchanged; /* Don't try any more */
1971 2036
1972 XGetWindowAttributes (display->display, display->root, &wrootattr); 2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 2038 rootdepth = wrootattr.depth;
1974 2039
1975 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
1976 if (rootdepth != wattr.depth) 2042 if (rootdepth != wattr.depth)
1977 { 2043 {
1978 if (am_transparent) 2044 if (am_transparent)
1979 { 2045 {
1980 pchanged = 1; 2046 pchanged = 1;
1981 XSetWindowBackground (display->display, TermWin.vt, 2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1982 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 2048 am_transparent = am_pixmap_trans = 0;
1984 } 2049 }
2050
1985 return pchanged; /* Don't try any more */ 2051 return pchanged; /* Don't try any more */
1986 } 2052 }
1987 2053
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 2054 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync (display->display, False); 2055 XSync (display->display, False);
… …
1991 /* 2057 /*
1992 * Make the frame window set by the window manager have 2058 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 2059 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 2060 * windows for each client, so we have to take care about that.
1995 */ 2061 */
1996 i = (xa[XA_XROOTPMAPID] != 0 2062 i = (xa[XA_XROOTPMAPID]
1997 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 2065 &nitems, &bytes_after, &prop) == Success);
2066
2000 if (!i || prop == NULL) 2067 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success);
2072
2073 if (!i || prop == NULL
2074#if TINTING
2075 || !rs[Rs_color + Color_tint]
2076#endif
2077 )
2001 have_pixmap = 0; 2078 have_pixmap = 0;
2002 else 2079 else
2003 { 2080 {
2004 have_pixmap = 1; 2081 have_pixmap = 1;
2005 rootpixmap = * ((Pixmap *)prop); 2082 rootpixmap = *(Pixmap *)prop;
2006 XFree (prop); 2083 XFree (prop);
2007 } 2084 }
2085
2008 if (have_pixmap) 2086 if (have_pixmap)
2009 { 2087 {
2010 /* 2088 /*
2011 * Copy display->root pixmap transparency 2089 * Copy display->root pixmap transparency
2012 */ 2090 */
2013 int sx, sy, nx, ny; 2091 int sx, sy, nx, ny;
2014 unsigned int nw, nh; 2092 unsigned int nw, nh;
2015 Window cr; 2093 Window cr;
2016 XImage *image; 2094 XImage *image;
2017 GC gc; 2095 GC gc;
2018 XGCValues gcvalue; 2096 XGCValues gcvalue;
2019 2097
2020 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 2099 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 2100 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 2101 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 2102 nx = ny = 0;
2103
2025 if (sx < 0) 2104 if (sx < 0)
2026 { 2105 {
2027 nw += sx; 2106 nw += sx;
2028 nx = -sx; 2107 nx = -sx;
2029 sx = 0; 2108 sx = 0;
2030 } 2109 }
2110
2031 if (sy < 0) 2111 if (sy < 0)
2032 { 2112 {
2033 nh += sy; 2113 nh += sy;
2034 ny = -sy; 2114 ny = -sy;
2035 sy = 0; 2115 sy = 0;
2036 } 2116 }
2117
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 2120 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 ZPixmap); 2122
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2124 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2125 allowedxerror = 0;
2126
2045 if (image == NULL) 2127 if (image == NULL)
2046 { 2128 {
2047 if (am_transparent && am_pixmap_trans) 2129 if (am_transparent && am_pixmap_trans)
2048 { 2130 {
2049 pchanged = 1; 2131 pchanged = 1;
… …
2051 { 2133 {
2052 XFreePixmap (display->display, TermWin.pixmap); 2134 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 2135 TermWin.pixmap = None;
2054 } 2136 }
2055 } 2137 }
2138
2056 am_pixmap_trans = 0; 2139 am_pixmap_trans = 0;
2057 } 2140 }
2058 else 2141 else
2059 { 2142 {
2060 if (TermWin.pixmap != None) 2143 if (TermWin.pixmap != None)
2061 XFreePixmap (display->display, TermWin.pixmap); 2144 XFreePixmap (display->display, TermWin.pixmap);
2145
2146#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint))
2148 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2153
2154 ShadeXImage (display, image, shade, rm, gm, bm);
2155 }
2156#endif
2157
2062 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 2159 szHint.width, szHint.height, image->depth);
2065 (unsigned int)image->depth);
2066 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 2162 nx, ny, image->width, image->height);
2070 XFreeGC (display->display, gc); 2163 XFreeGC (display->display, gc);
2071 XDestroyImage (image); 2164 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2073 TermWin.pixmap); 2166 XClearWindow (display->display, TermWin.parent[0]);
2167
2074 if (!am_transparent || !am_pixmap_trans) 2168 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 2169 pchanged = 1;
2170
2076 am_transparent = am_pixmap_trans = 1; 2171 am_transparent = am_pixmap_trans = 1;
2077 } 2172 }
2078 } 2173 }
2174
2079 if (!am_pixmap_trans) 2175 if (!am_pixmap_trans)
2080 { 2176 {
2081 unsigned int n; 2177 unsigned int n;
2082 /* 2178 /*
2083 * InheritPixmap transparency 2179 * InheritPixmap transparency
2084 */ 2180 */
2085 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2087 i++)
2088 { 2183 {
2089 oldp = TermWin.parent[i]; 2184 oldp = TermWin.parent[i];
2090 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2186 &TermWin.parent[i], &list, &n);
2092 XFree (list); 2187 XFree (list);
2093 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2094 if (TermWin.parent[i] == display->root) 2190 if (TermWin.parent[i] == display->root)
2095 { 2191 {
2096 if (oldp != None) 2192 if (oldp != None)
2097 pchanged = 1; 2193 pchanged = 1;
2194
2098 break; 2195 break;
2099 } 2196 }
2197
2100 if (oldp != TermWin.parent[i]) 2198 if (oldp != TermWin.parent[i])
2101 pchanged = 1; 2199 pchanged = 1;
2102 } 2200 }
2201
2103 n = 0; 2202 n = 0;
2203
2104 if (pchanged) 2204 if (pchanged)
2105 { 2205 {
2106 for (; n < (unsigned int)i; n++) 2206 for (; n < (unsigned int)i; n++)
2107 { 2207 {
2108 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2112 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2213 break;
2114 } 2214 }
2115 } 2215 }
2116 } 2216 }
2117 if (n > (int) (sizeof (TermWin.parent) 2217
2118 / sizeof (TermWin.parent[0]))) 2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2119 { 2219 {
2120 D_X ((stderr, "InheritPixmap Turning off")); 2220 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground (display->display, TermWin.parent[0], 2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2122 PixColors[Color_fg]);
2123 XSetWindowBackground (display->display, TermWin.vt, 2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2124 PixColors[Color_bg]);
2125 am_transparent = 0; 2223 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2224 /* XXX: also turn off Opt_transparent? */
2127 } 2225 }
2128 else 2226 else
2129 { 2227 {
2228#if WAIT_FOR_WM
2130 /* wait (an arbitrary period) for the WM to do its thing 2229 /* wait (an arbitrary period) for the WM to do its thing
2131 * needed for fvwm2.2.2 (and before?) */ 2230 * needed for fvwm2.2.2 (and before?) */
2132# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt;
2134
2135 rqt.tv_sec = 1;
2136 rqt.tv_nsec = 0;
2137 nanosleep (&rqt, NULL);
2138# else
2139 sleep (1); 2231 sleep (1);
2140# endif 2232#endif
2141 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2143 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2144 ParentRelative); 2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2145 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2146 ParentRelative);
2147 am_transparent = 1; 2241 am_transparent = 1;
2148 } 2242 }
2243
2149 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2245 TermWin.parent[i] = None;
2151 } 2246 }
2247
2248 // this is experimental
2249 if (scrollBar.win)
2250 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle ();
2254 scrollbar_show (0);
2255 }
2256
2152 return pchanged; 2257 return pchanged;
2153} 2258}
2154#endif 2259#endif
2155 2260
2156/*}}} */ 2261/*}}} */
2262
2263bool
2264rxvt_term::cmd_parse ()
2265{
2266 bool flag = false;
2267 unicode_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here
2269
2270 for (;;)
2271 {
2272 if (ch == NOCHAR)
2273 {
2274 seq_begin = cmdbuf_ptr;
2275 ch = next_char ();
2276 }
2277
2278 if (ch == NOCHAR) // TODO: improve
2279 break;
2280
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 {
2283 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false;
2286 int nlines = 0;
2287 unicode_t *str = buf;
2288
2289 for (;;)
2290 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break;
2293
2294 *str++ = ch;
2295
2296 if (ch == C0_LF)
2297 {
2298 nlines++;
2299 refresh_count++;
2300
2301 if (!(Options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 {
2304 refreshnow = true;
2305 ch = NOCHAR;
2306 break;
2307 }
2308
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2310 if (nlines >= TermWin.nrow - 1)
2311 {
2312 scr_add_lines (buf, nlines, str - buf);
2313 nlines = 0;
2314 str = buf;
2315 }
2316 }
2317
2318 if (str >= buf + UBUFSIZ)
2319 {
2320 ch = NOCHAR;
2321 break;
2322 }
2323
2324 seq_begin = cmdbuf_ptr;
2325 ch = next_char ();
2326 }
2327
2328 scr_add_lines (buf, nlines, str - buf);
2329
2330 /*
2331 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */
2336 if (refreshnow)
2337 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true;
2343 scr_refresh (refresh_type);
2344 }
2345 }
2346
2347 }
2348 else
2349 {
2350 try
2351 {
2352 process_nonprinting (ch);
2353 }
2354 catch (const class out_of_input &o)
2355 {
2356 // we ran out of input, retry later
2357 cmdbuf_ptr = seq_begin;
2358 break;
2359 }
2360
2361 ch = NOCHAR;
2362 }
2363 }
2364
2365 return flag;
2366}
2367
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character
2378unicode_t
2379rxvt_term::next_char ()
2380{
2381 while (cmdbuf_ptr < cmdbuf_endp)
2382 {
2383 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++;
2386
2387 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389
2390 if (len == (size_t)-2)
2391 {
2392 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp;
2394 break;
2395 }
2396
2397 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399
2400 // assume wchar == unicode
2401 cmdbuf_ptr += len;
2402 return wc;
2403 }
2404
2405 return NOCHAR;
2406}
2407
2408/* rxvt_cmd_getc () - Return next input character */
2409/*
2410 * Return the next input character after first passing any keyboard input
2411 * to the command.
2412 */
2413unicode_t
2414rxvt_term::cmd_getc ()
2415{
2416 unicode_t c = next_char ();
2417
2418 if (c == NOCHAR)
2419 throw out_of_input;
2420
2421 return c;
2422}
2423
2424unicode_t
2425rxvt_term::cmd_get8 ()
2426{
2427 unicode_t c = next_octet ();
2428
2429 if (c == NOCHAR)
2430 throw out_of_input;
2431
2432 return c;
2433}
2157 2434
2158/*{{{ print pipe */ 2435/*{{{ print pipe */
2159/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2161FILE * 2438FILE *
2162rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2163{ 2440{
2164 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2442
2166 if (stream == NULL) 2443 if (stream == NULL)
2167 rxvt_print_error ("can't open printer pipe"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2445
2168 return stream; 2446 return stream;
2169} 2447}
2170 2448
2171int 2449int
2172rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2173{ 2451{
2174 fflush (stream); 2452 fflush (stream);
2175 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */
2179# else
2180 return pclose (stream); 2453 return pclose (stream);
2181# endif
2182} 2454}
2183 2455
2184/* 2456/*
2185 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2186 */ 2458 */
2187void 2459void
2188rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2189{ 2461{
2190 int done; 2462 int done;
2191 FILE *fd; 2463 FILE *fd;
2192 2464
2193 if ((fd = popen_printer ()) == NULL) 2465 if ((fd = popen_printer ()) == NULL)
2194 return; 2466 return;
2195 2467
2196 /* 2468 /*
2197 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2198 * is received. 2470 * is received.
2199 */ 2471 */
2200 for (done = 0; !done;) 2472 for (done = 0; !done;)
2201 { 2473 {
2202 unsigned char buf[8]; 2474 unsigned char buf[8];
2203 unsigned char ch; 2475 unicode_t ch;
2204 unsigned int i, len; 2476 unsigned int i, len;
2205 2477
2206 if ((ch = cmd_getc ()) != C0_ESC) 2478 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2479 {
2208 if (putc (ch, fd) == EOF) 2480 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2481 break; /* done = 1 */
… …
2224 { 2496 {
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2498 break; /* done = 1 */
2227 } 2499 }
2228 } 2500 }
2501
2229 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2230 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2231 { 2504 {
2232 done = 1; 2505 done = 1;
2233 break; 2506 break;
2234 } 2507 }
2235 } 2508 }
2236 } 2509 }
2510
2237 pclose_printer (fd); 2511 pclose_printer (fd);
2238} 2512}
2239#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2240/*}}} */ 2514/*}}} */
2241 2515
2242/* *INDENT-OFF* */ 2516/* *INDENT-OFF* */
2243enum { 2517enum {
2244 C1_40 = 0x40, 2518 C1_40 = 0x40,
2245 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2519 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2246 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2520 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2247 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2521 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2248 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2522 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2249}; 2523};
2250/* *INDENT-ON* */ 2524/* *INDENT-ON* */
2251 2525
2252/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2253void 2527void
2254rxvt_term::process_nonprinting (unsigned char ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2255{ 2529{
2256 switch (ch) 2530 switch (ch)
2257 { 2531 {
2532 case C0_ESC:
2533 process_escape_seq ();
2534 break;
2258 case C0_ENQ: /* terminal Status */ 2535 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2536 if (rs[Rs_answerbackstring])
2260 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2539 else
2264 tt_write ((unsigned char *)VT100_ANS, 2540 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN (VT100_ANS)); 2541 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2542 break;
2267 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2268 scr_bell (); 2544 scr_bell ();
2269 break; 2545 break;
2270 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2285 scr_charset_choose (1); 2561 scr_charset_choose (1);
2286 break; 2562 break;
2287 case C0_SI: /* shift in - acs */ 2563 case C0_SI: /* shift in - acs */
2288 scr_charset_choose (0); 2564 scr_charset_choose (0);
2289 break; 2565 break;
2566
2567#ifdef EIGHT_BIT_CONTROLS
2568 // 8-bit controls
2569 case 0x90: /* DCS */
2570 process_dcs_seq ();
2571 break;
2572 case 0x9b: /* CSI */
2573 process_csi_seq ();
2574 break;
2575 case 0x9d: /* CSI */
2576 process_osc_seq ();
2577 break;
2578#endif
2290 } 2579 }
2291} 2580}
2292/*}}} */ 2581/*}}} */
2293 2582
2294 2583
2295/*{{{ process VT52 escape sequences */ 2584/*{{{ process VT52 escape sequences */
2296void 2585void
2297rxvt_term::process_escape_vt52 (unsigned char ch) 2586rxvt_term::process_escape_vt52 (unicode_t ch)
2298{ 2587{
2299 int row, col; 2588 int row, col;
2300 2589
2301 switch (ch) 2590 switch (ch)
2302 { 2591 {
… …
2354 2643
2355/*{{{ process escape sequences */ 2644/*{{{ process escape sequences */
2356void 2645void
2357rxvt_term::process_escape_seq () 2646rxvt_term::process_escape_seq ()
2358{ 2647{
2359 unsigned char ch = cmd_getc (); 2648 unicode_t ch = cmd_getc ();
2360 2649
2361 if (PrivateModes & PrivMode_vt52) 2650 if (PrivateModes & PrivMode_vt52)
2362 { 2651 {
2363 process_escape_vt52 (ch); 2652 process_escape_vt52 (ch);
2364 return; 2653 return;
… …
2381 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
2382 break; 2671 break;
2383 case '+': 2672 case '+':
2384 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
2385 break; 2674 break;
2386#ifdef MULTICHAR_SET
2387 case '$':
2388 scr_charset_set (-2, (unsigned int)cmd_getc ());
2389 break;
2390#endif
2391#ifndef NO_FRILLS 2675#ifndef NO_FRILLS
2392 case '6': 2676 case '6':
2393 scr_backindex (); 2677 scr_backindex ();
2394 break; 2678 break;
2395#endif 2679#endif
… …
2417 break; 2701 break;
2418 2702
2419 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2420 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2421 { 2705 {
2422 uint32_t nlcr[] = { '\n', '\r' }; 2706 unicode_t nlcr[] = { C0_LF, C0_CR };
2423 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, 1, 2);
2424 } 2708 }
2425 break; 2709 break;
2426 2710
2427 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2438 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2439 scr_index (DN); 2723 scr_index (DN);
2440 break; 2724 break;
2441 2725
2442 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2443 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /*case C1_SS2: scr_single_shift (2); break; */
2444 2728
2445 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2446 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /*case C1_SS3: scr_single_shift (3); break; */
2447 2731
2448 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2449 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2450 process_dcs_seq (); 2734 process_dcs_seq ();
2451 break; 2735 break;
… …
2466 process_osc_seq (); 2750 process_osc_seq ();
2467 break; 2751 break;
2468 2752
2469 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2470 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2471 scr_poweron (); 2756 scr_poweron ();
2472 scrollbar_show (1); 2757 scrollbar_show (1);
2473 break; 2758 break;
2474 2759
2475 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2487 2772
2488/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2489/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2490enum { 2775enum {
2491 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2492 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2493 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2494 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2495 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2780 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2496 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2781 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2497 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2512 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2518 }; 2803 };
2519/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2520 2805
2521void 2806void
2522rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
2523{ 2808{
2524 unsigned char ch, priv, i; 2809 unicode_t ch, priv, i;
2525 unsigned int nargs, p; 2810 unsigned int nargs, p;
2526 int n, ndef; 2811 int n, ndef;
2527 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2528 2813
2529 for (nargs = ESC_ARGS; nargs > 0;) 2814 for (nargs = ESC_ARGS; nargs > 0;)
2530 arg[--nargs] = 0; 2815 arg[--nargs] = 0;
2531 2816
2532 priv = 0; 2817 priv = 0;
… …
2534 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2535 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
2536 priv = ch; 2821 priv = ch;
2537 ch = cmd_getc (); 2822 ch = cmd_getc ();
2538 } 2823 }
2824
2539 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2541 { 2827 {
2542 if (isdigit (ch)) 2828 if (isdigit (ch))
2543 { 2829 {
… …
2550 { 2836 {
2551 if (nargs < ESC_ARGS) 2837 if (nargs < ESC_ARGS)
2552 arg[nargs++] = n; 2838 arg[nargs++] = n;
2553 n = -1; 2839 n = -1;
2554 } 2840 }
2555 else if (ch == '\b') 2841 else if (IS_CONTROL (ch))
2556 {
2557 scr_backspace ();
2558 }
2559 else if (ch == C0_ESC)
2560 {
2561 process_escape_seq ();
2562 return;
2563 }
2564 else if (ch < ' ')
2565 {
2566 process_nonprinting (ch); 2842 process_nonprinting (ch);
2567 } 2843
2568 ch = cmd_getc (); 2844 ch = cmd_getc ();
2569 } 2845 }
2570 2846
2571 if (ch > CSI_7F) 2847 if (ch > CSI_7F)
2572 return; 2848 return;
… …
2730 tt_printf ("\033[0n"); 3006 tt_printf ("\033[0n");
2731 break; 3007 break;
2732 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
2733 scr_report_position (); 3009 scr_report_position ();
2734 break; 3010 break;
2735#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure)
2737 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 3014 break;
2739#endif
2740 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2742 break; 3017 break;
2743 } 3018 }
2744 break; 3019 break;
2745 3020
2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3021 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2814#endif 3089#endif
2815 3090
2816 case CSI_78: /* DECREQTPARM */ 3091 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 3092 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3093 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 3094 break;
2820 3095
2821 default: 3096 default:
2822 break; 3097 break;
2823 } 3098 }
2824} 3099}
… …
2827#ifndef NO_FRILLS 3102#ifndef NO_FRILLS
2828/* ARGSUSED */ 3103/* ARGSUSED */
2829void 3104void
2830rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3105rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2831{ 3106{
2832 int x, y; 3107 int x, y;
2833#if 0
2834 char *s;
2835#endif
2836 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
2837 Window wdummy; 3109 Window wdummy;
2838 3110
2839 if (nargs == 0) 3111 if (nargs == 0)
2840 return; 3112 return;
3113
2841 switch (args[0]) 3114 switch (args[0])
2842 { 3115 {
2843 /* 3116 /*
2844 * commands 3117 * commands
2845 */ 3118 */
2846 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
2847 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 3121 break;
2849 case 2: /* iconify window */ 3122 case 2: /* iconify window */
2850 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (display->display, TermWin.parent[0],
… …
2867 break; 3140 break;
2868 case 8: /* set size (chars) */ 3141 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int) (args[1] * TermWin.fheight)); 3143 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 3144 break;
3145
3146 //case 9: NYI, TODO, restore maximized window or maximize window
2872 default: 3147 default:
2873 if (args[0] >= 24) /* set height (chars) */ 3148 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 3149 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int) (args[1] * TermWin.fheight)); 3150 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 3151 break;
3152
3153
2877 /* 3154 /*
2878 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
2879 */ 3156 */
2880 case 11: /* report window state */ 3157 case 11: /* report window state */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 3160 break;
2884 case 13: /* report window position */ 3161 case 13: /* report window position */
2885 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
2889 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 3167 break;
2891 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 3171 break;
2895 case 18: /* report window size (chars) */ 3172 case 18: /* report text area size (chars) */
2896 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 3174 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 3175 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break;
2899 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 {
3181 char *s;
2900 XGetIconName (display->display, TermWin.parent[0], &s); 3182 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3184 }
2902 break; 3185 break;
2903 case 21: /* report window title */ 3186 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 {
3189 char *s;
2904 XFetchName (display->display, TermWin.parent[0], &s); 3190 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3192 }
2906 break; 3193 break;
2907#endif
2908
2909 } 3194 }
2910} 3195}
2911#endif 3196#endif
2912 3197
2913/*----------------------------------------------------------------------*/ 3198/*----------------------------------------------------------------------*/
2914/* 3199/*
2915 * get input up until STRING TERMINATOR (or BEL) 3200 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free ()d 3201 * ends_how is terminator used. returned input must be free()'d
2917 */ 3202 */
2918unsigned char * 3203unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 3204rxvt_term::get_to_st (unicode_t &ends_how)
2920{ 3205{
2921 int seen_esc = 0; /* seen escape? */ 3206 unicode_t prev = 0, ch;
2922 unsigned int n = 0; 3207 unsigned int n = 0;
2923 unsigned char *s; 3208 unsigned char *s;
2924 unsigned char ch, string[STRING_MAX]; 3209 unsigned char string[STRING_MAX];
2925 3210
2926 for (; (ch = cmd_getc ());) 3211 while ((ch = cmd_getc ()) != NOCHAR)
2927 { 3212 {
2928 if (ch == C0_BEL
2929 || ch == CHAR_ST
2930 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2931 break;
2932 if (ch == C0_ESC) 3213 if (prev == C0_ESC)
2933 {
2934 seen_esc = 1;
2935 continue;
2936 } 3214 {
2937 else if (ch == '\t') 3215 if (ch == 0x5c) /* 7bit ST */
2938 ch = ' '; /* translate '\t' to space */ 3216 break;
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3217 else
3218 return NULL;
3219 }
3220 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break;
3222 else if (ch < 0x20)
2940 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3224
2941 if (n < sizeof (string) - 1) 3225 if (n >= sizeof (string) - 1)
3226 // stop at some sane length
3227 return NULL;
3228
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
2942 string[n++] = ch; 3235 string[n++] = prev = ch;
2943 seen_esc = 0;
2944 } 3236 }
3237
2945 string[n++] = '\0'; 3238 string[n++] = '\0';
3239
2946 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 3241 return NULL;
3242
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY (s, string, n); 3244 STRNCPY (s, string, n);
2950 return s; 3245 return s;
2951} 3246}
2952 3247
2953/*----------------------------------------------------------------------*/ 3248/*----------------------------------------------------------------------*/
… …
2955 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2956 */ 3251 */
2957void 3252void
2958rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
2959{ 3254{
2960 unsigned char eh, *s; 3255 unsigned char *s;
3256 unicode_t eh;
3257
2961 /* 3258 /*
2962 * Not handled yet 3259 * Not handled yet
2963 */ 3260 */
2964 s = get_to_st (&eh); 3261 s = get_to_st (eh);
2965 if (s) 3262 if (s)
2966 free (s); 3263 free (s);
3264
2967 return; 3265 return;
2968} 3266}
2969 3267
2970/*----------------------------------------------------------------------*/ 3268/*----------------------------------------------------------------------*/
2971/* 3269/*
2972 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3270 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2973 */ 3271 */
2974void 3272void
2975rxvt_term::process_osc_seq () 3273rxvt_term::process_osc_seq ()
2976{ 3274{
2977 unsigned char ch, eh, *s; 3275 unicode_t ch, eh;
2978 int arg; 3276 int arg;
2979 3277
2980 ch = cmd_getc (); 3278 ch = cmd_getc ();
2981 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
2983 3281
2984 if (ch == ';') 3282 if (ch == ';')
2985 { 3283 {
2986 s = get_to_st (&eh); 3284 unsigned char *s = get_to_st (eh);
3285
2987 if (s) 3286 if (s)
2988 { 3287 {
2989 /*
2990 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here
2992 */
2993 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s);
2996#else
2997 (void)0;
2998#endif
2999 else
3000 xterm_seq (arg, (char *)s, eh); 3288 process_xterm_seq (arg, (char *)s, eh);
3001 free (s); 3289 free (s);
3002 } 3290 }
3003 } 3291 }
3004} 3292}
3293
3294void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{
3297 if (str[0] == '?' && !str[1])
3298 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 }
3306 else
3307 set_window_color (color, str);
3308}
3309
3005/* 3310/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3007 * 0 = change iconName/title 3312 * 0 = change iconName/title
3008 * 1 = change iconName 3313 * 1 = change iconName
3009 * 2 = change title 3314 * 2 = change title
3010 * 4 = change color 3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3011 * 12 = change text color 3318 * 12 = change text color
3012 * 13 = change mouse foreground color 3319 * 13 = change mouse foreground color
3013 * 17 = change highlight character colour 3320 * 17 = change highlight character colour
3014 * 18 = change bold character color 3321 * 18 = change bold character color
3015 * 19 = change underlined character color 3322 * 19 = change underlined character color
3016 * 46 = change logfile (not implemented) 3323 * 46 = change logfile (not implemented)
3017 * 50 = change font 3324 * 50 = change font
3018 * 3325 *
3019 * rxvt extensions: 3326 * rxvt extensions:
3020 * 10 = menu (may change in future)
3021 * 20 = bg pixmap 3327 * 20 = bg pixmap
3022 * 39 = change default fg color 3328 * 39 = change default fg color
3023 * 49 = change default bg color 3329 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3025 */ 3334 */
3026void 3335void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3028{ 3337{
3029 int changed = 0; 3338 int changed = 0;
3030 int color; 3339 int color;
3031 char *buf, *name; 3340 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1];
3032 3342
3033 assert (str != NULL); 3343 assert (str != NULL);
3034 switch (op) 3344 switch (op)
3035 { 3345 {
3036 case XTerm_name: 3346 case XTerm_name:
3037 set_title (str); 3347 set_title (str);
3038 /* FALLTHROUGH */ 3348 /* FALLTHROUGH */
3039 case XTerm_iconName: 3349 case XTerm_iconName:
3040 set_iconName (str); 3350 set_icon_name (str);
3041 break; 3351 break;
3042 case XTerm_title: 3352 case XTerm_title:
3043 set_title (str); 3353 set_title (str);
3044 break; 3354 break;
3355 case XTerm_property:
3356 if (str[0] == '?')
3357 {
3358 Atom prop = XInternAtom (display->display, str + 1, True);
3359 Atom actual_type;
3360 int actual_format;
3361 unsigned long nitems;
3362 unsigned long bytes_after;
3363 unsigned char *value = 0;
3364 const char *str = "";
3365
3366 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None
3372 && actual_format == 8)
3373 str = (const char *)(value);
3374
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3376
3377 XFree (value);
3378 }
3379 else
3380 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382
3383 if (eq)
3384 {
3385 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0],
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 }
3391 else
3392 XDeleteProperty (display->display, TermWin.parent[0],
3393 display->atom (str));
3394 }
3395 break;
3396
3045 case XTerm_Color: 3397 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3398 for (buf = (char *)str; buf && *buf;)
3047 { 3399 {
3048 if ((name = STRCHR (buf, ';')) == NULL) 3400 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 3401 break;
3402
3050 *name++ = '\0'; 3403 *name++ = '\0';
3051 color = atoi (buf); 3404 color = atoi (buf);
3405
3052 if (color < 0 || color >= TOTAL_COLORS) 3406 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 3407 break;
3408
3054 if ((buf = STRCHR (name, ';')) != NULL) 3409 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 3410 *buf++ = '\0';
3411
3412 if (name[0] == '?' && !name[1])
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3056 set_window_color (color + minCOLOR, name); 3422 set_window_color (color + minCOLOR, name);
3057 } 3423 }
3424 break;
3425 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3427 break;
3428 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3058 break; 3430 break;
3059#ifndef NO_CURSORCOLOR 3431#ifndef NO_CURSORCOLOR
3060 case XTerm_Color_cursor: 3432 case XTerm_Color_cursor:
3061 set_window_color (Color_cursor, str); 3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3062 break; 3434 break;
3063#endif 3435#endif
3064 case XTerm_Color_pointer: 3436 case XTerm_Color_pointer_fg:
3065 set_window_color (Color_pointer, str); 3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3438 break;
3439 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3066 break; 3441 break;
3067#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3068 case XTerm_Color_BD: 3443 case XTerm_Color_BD:
3069 set_window_color (Color_BD, str); 3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3070 break; 3445 break;
3071 case XTerm_Color_UL: 3446 case XTerm_Color_UL:
3072 set_window_color (Color_UL, str); 3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3073 break; 3448 break;
3074 case XTerm_Color_RV: 3449 case XTerm_Color_RV:
3075 set_window_color (Color_RV, str); 3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3076 break; 3451 break;
3077#endif 3452#endif
3078 3453
3079 case XTerm_Menu:
3080 /*
3081 * rxvt_menubar_dispatch () violates the constness of the string,
3082 * so DON'T do it here
3083 */
3084 break;
3085 case XTerm_Pixmap: 3454 case XTerm_Pixmap:
3086 if (*str != ';') 3455 if (*str != ';')
3087 { 3456 {
3088#if XPM_BACKGROUND 3457#if XPM_BACKGROUND
3089 scale_pixmap (""); /* reset to default scaling */ 3458 scale_pixmap (""); /* reset to default scaling */
… …
3112 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3113 break; 3482 break;
3114 case XTerm_restoreBG: 3483 case XTerm_restoreBG:
3115 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3116 break; 3485 break;
3486
3117 case XTerm_logfile: 3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3118 break; 3489 break;
3490
3119 case XTerm_font: 3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3120 change_font (0, str); 3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3121 break; 3535 break;
3536#endif
3122#if 0 3537#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3538 case XTerm_dumpscreen: /* no error notices */
3124 { 3539 {
3125 int fd; 3540 int fd;
3126 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3542 {
3128 scr_dump (fd); 3543 scr_dump (fd);
3129 close (fd); 3544 close (fd);
3130 } 3545 }
3131 } 3546 }
3132 break; 3547 break;
3133#endif 3548#endif
3134
3135 } 3549 }
3136} 3550}
3137/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3138 3552
3139/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3553/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3147 * so no need for fancy checking 3561 * so no need for fancy checking
3148 */ 3562 */
3149int 3563int
3150rxvt_term::privcases (int mode, unsigned long bit) 3564rxvt_term::privcases (int mode, unsigned long bit)
3151{ 3565{
3152 int state; 3566 int state;
3153 3567
3154 if (mode == 's') 3568 if (mode == 's')
3155 { 3569 {
3156 SavedModes |= (PrivateModes & bit); 3570 SavedModes |= (PrivateModes & bit);
3157 return -1; 3571 return -1;
… …
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3577 else
3164 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode (state, bit); 3579 PrivMode (state, bit);
3166 } 3580 }
3581
3167 return state; 3582 return state;
3168} 3583}
3169 3584
3170/* we're not using priv _yet_ */ 3585/* we're not using priv _yet_ */
3171void 3586void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3588{
3174 unsigned int i, j; 3589 unsigned int i, j;
3175 int state; 3590 int state;
3591
3176 static const struct 3592 static const struct
3177 { 3593 {
3178 const int argval; 3594 const int argval;
3179 const unsigned long bit; 3595 const unsigned long bit;
3180 } 3596 }
3597
3181 argtopriv[] = { 3598 argtopriv[] = {
3182 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
3183 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3184 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
3185 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
… …
3191 { menuBar_esc, PrivMode_menuBar }, 3608 { menuBar_esc, PrivMode_menuBar },
3192#endif 3609#endif
3193#ifdef scrollBar_esc 3610#ifdef scrollBar_esc
3194 { scrollBar_esc, PrivMode_scrollBar }, 3611 { scrollBar_esc, PrivMode_scrollBar },
3195#endif 3612#endif
3613 // 18, 19 printing-related
3196 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3197 { 35, PrivMode_ShiftKeys }, 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension
3198 { 40, PrivMode_132OK }, 3617 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI
3620 // 46 start logging
3199 { 47, PrivMode_Screen }, 3621 { 47, PrivMode_Screen },
3200 { 66, PrivMode_aplKP }, 3622 { 66, PrivMode_aplKP },
3201#ifndef NO_BACKSPACE_KEY 3623#ifndef NO_BACKSPACE_KEY
3202 { 67, PrivMode_BackSpace }, 3624 { 67, PrivMode_BackSpace },
3203#endif 3625#endif
3204 { 1000, PrivMode_MouseX11 }, 3626 { 1000, PrivMode_MouseX11 },
3627 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3628 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3629 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3205 { 1010, PrivMode_TtyOutputInh }, 3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3206 { 1011, PrivMode_Keypress }, 3631 { 1011, PrivMode_Keypress }, // rxvt extension
3632 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI
3207 { 1047, PrivMode_Screen }, 3635 { 1047, PrivMode_Screen },
3636 // 1048 save and restore cursor
3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3209 }; 3639 };
3210 3640
3211 if (nargs == 0) 3641 if (nargs == 0)
3212 return; 3642 return;
3213 3643
… …
3228 state = privcases (mode, argtopriv[j].bit); 3658 state = privcases (mode, argtopriv[j].bit);
3229 break; 3659 break;
3230 } 3660 }
3231 3661
3232 /* extra handling for values with state unkept */ 3662 /* extra handling for values with state unkept */
3233 if (state == -1)
3234 switch (arg[i]) 3663 switch (arg[i])
3235 { 3664 {
3236 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3666 if (Options & Opt_secondaryScreen)
3237 if (mode == 0) 3667 if (mode == 0)
3238 scr_cursor (RESTORE); 3668 scr_cursor (RESTORE);
3239 else if (mode == 1) 3669 else if (mode == 1)
3240 scr_cursor (SAVE); 3670 scr_cursor (SAVE);
3241 /* FALLTHROUGH */
3242 default:
3243 continue; /* for (;i;) */
3244 }
3245
3246 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i])
3248 {
3249 /* case 1: - application cursor keys */
3250 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode
3254 */
3255 PrivMode (1, PrivMode_vt52);
3256 break; 3671 break;
3672 }
3673
3674 if (state >= 0)
3675 /* extra handling for values with valid 0 or 1 state */
3676 switch (arg[i])
3677 {
3678 /* case 1: - application cursor keys */
3679 case 2: /* VT52 mode */
3680 /* oddball mode. should be set regardless of set/reset
3681 * parameter. Return from VT52 mode with an ESC < from
3682 * within VT52 mode
3683 */
3684 PrivMode (1, PrivMode_vt52);
3685 break;
3257 case 3: /* 80/132 */ 3686 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3687 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3260 (unsigned int)TermWin.height);
3261 break; 3689 break;
3262 case 4: /* smooth scrolling */ 3690 case 4: /* smooth scrolling */
3263 if (state) 3691 if (state)
3264 Options &= ~Opt_jumpScroll; 3692 Options &= ~Opt_jumpScroll;
3265 else 3693 else
3266 Options |= Opt_jumpScroll; 3694 Options |= Opt_jumpScroll;
3267 break; 3695 break;
3268 case 5: /* reverse video */ 3696 case 5: /* reverse video */
3269 scr_rvideo_mode (state); 3697 scr_rvideo_mode (state);
3270 break; 3698 break;
3271 case 6: /* relative/absolute origins */ 3699 case 6: /* relative/absolute origins */
3272 scr_relative_origin (state); 3700 scr_relative_origin (state);
3273 break; 3701 break;
3274 case 7: /* autowrap */ 3702 case 7: /* autowrap */
3275 scr_autowrap (state); 3703 scr_autowrap (state);
3276 break; 3704 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3705 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3706 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3280 PrivateModes &= ~ (PrivMode_MouseX11); 3708 PrivateModes &= ~PrivMode_MouseX11;
3281 break; 3709 break;
3282#ifdef menuBar_esc 3710#ifdef menuBar_esc
3283 case menuBar_esc: 3711 case menuBar_esc:
3284#ifdef MENUBAR 3712#ifdef MENUBAR
3285 map_menuBar (state); 3713 map_menuBar (state);
3286#endif 3714#endif
3287 break; 3715 break;
3288#endif 3716#endif
3289#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3290 case scrollBar_esc: 3718 case scrollBar_esc:
3291 if (scrollbar_mapping (state)) 3719 if (scrollbar_mapping (state))
3292 { 3720 {
3293 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3294 scr_touch (true); 3722 scr_touch (true);
3295 } 3723 }
3296 break; 3724 break;
3297#endif 3725#endif
3298 case 25: /* visible/invisible cursor */ 3726 case 25: /* visible/invisible cursor */
3299 scr_cursor_visible (state); 3727 scr_cursor_visible (state);
3300 break; 3728 break;
3301 /* case 35: - shift keys */ 3729 /* case 35: - shift keys */
3302 /* case 40: - 80 <--> 132 mode */ 3730 /* case 40: - 80 <--> 132 mode */
3303 case 47: /* secondary screen */ 3731 case 47: /* secondary screen */
3304 scr_change_screen (state); 3732 scr_change_screen (state);
3305 break; 3733 break;
3306 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3310 PrivateModes &= ~ (PrivMode_MouseX10); 3738 PrivateModes &= ~PrivMode_MouseX10;
3311 break; 3739 break;
3312#if 0 3740#if 0
3313 case 1001: 3741 case 1001:
3314 break; /* X11 mouse highlighting */ 3742 break; /* X11 mouse highlighting */
3315#endif 3743#endif
3316 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3317 if (state) 3745 if (state)
3318 Options &= ~Opt_scrollTtyOutput; 3746 Options &= ~Opt_scrollTtyOutput;
3319 else 3747 else
3320 Options |= Opt_scrollTtyOutput; 3748 Options |= Opt_scrollTtyOutput;
3321 break; 3749 break;
3322 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3323 if (state) 3751 if (state)
3324 Options |= Opt_scrollTtyKeypress; 3752 Options |= Opt_scrollTtyKeypress;
3325 else 3753 else
3326 Options &= ~Opt_scrollTtyKeypress; 3754 Options &= ~Opt_scrollTtyKeypress;
3327 break; 3755 break;
3328 case 1047: /* secondary screen w/ clearing */ 3756 case 1047: /* secondary screen w/ clearing last */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3757 if (Options & Opt_secondaryScreen)
3330 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
3331 scr_erase_screen (2); 3759 scr_erase_screen (2);
3332 scr_change_screen (state); 3760 scr_change_screen (state);
3333 /* FALLTHROUGH */
3334 default:
3335 break; 3761 break;
3762 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY)
3766 scr_erase_screen (2);
3767 break;
3768 default:
3769 break;
3336 } 3770 }
3337 } 3771 }
3338} 3772}
3339/*}}} */ 3773/*}}} */
3340 3774
3341/*{{{ process sgr sequences */ 3775/*{{{ process sgr sequences */
3342void 3776void
3343rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3777rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3344{ 3778{
3345 unsigned int i; 3779 unsigned int i;
3346 short rendset; 3780 short rendset;
3347 int rendstyle; 3781 int rendstyle;
3348 3782
3349 if (nargs == 0) 3783 if (nargs == 0)
3350 { 3784 {
3351 scr_rendition (0, ~RS_None); 3785 scr_rendition (0, ~RS_None);
3352 return; 3786 return;
3353 } 3787 }
3788
3354 for (i = 0; i < nargs; i++) 3789 for (i = 0; i < nargs; i++)
3355 { 3790 {
3356 rendset = -1; 3791 rendset = -1;
3357 switch (arg[i]) 3792 switch (arg[i])
3358 { 3793 {
… …
3360 rendset = 0, rendstyle = ~RS_None; 3795 rendset = 0, rendstyle = ~RS_None;
3361 break; 3796 break;
3362 case 1: 3797 case 1:
3363 rendset = 1, rendstyle = RS_Bold; 3798 rendset = 1, rendstyle = RS_Bold;
3364 break; 3799 break;
3800 //case 2: // faint or second colour
3365 case 4: 3801 case 4:
3366 rendset = 1, rendstyle = RS_Uline; 3802 rendset = 1, rendstyle = RS_Uline;
3367 break; 3803 break;
3368 case 5: 3804 case 5: // slowly blinking
3805 case 6: // rapidly blinking
3369 rendset = 1, rendstyle = RS_Blink; 3806 rendset = 1, rendstyle = RS_Blink;
3370 break; 3807 break;
3808 //case 6: // scoansi light background
3371 case 7: 3809 case 7:
3372 rendset = 1, rendstyle = RS_RVid; 3810 rendset = 1, rendstyle = RS_RVid;
3811 break;
3812 case 8:
3813 // invisible. NYI
3814 break;
3815 //case 9: // crossed out
3816 //case 10: // scoansi acs off, primary font
3817 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font
3819 //...
3820 //case 19: // ninth alt font
3821 //case 20: // gothic
3822 case 21: // disable bold, faint
3823 rendset = 0, rendstyle = RS_Bold;
3373 break; 3824 break;
3374 case 22: 3825 case 22:
3375 rendset = 0, rendstyle = RS_Bold; 3826 rendset = 0, rendstyle = RS_Bold;
3376 break; 3827 break;
3828 //case 23: disable italic
3377 case 24: 3829 case 24:
3378 rendset = 0, rendstyle = RS_Uline; 3830 rendset = 0, rendstyle = RS_Uline;
3379 break; 3831 break;
3380 case 25: 3832 case 25:
3381 rendset = 0, rendstyle = RS_Blink; 3833 rendset = 0, rendstyle = RS_Blink;
3382 break; 3834 break;
3383 case 27: 3835 case 27:
3384 rendset = 0, rendstyle = RS_RVid; 3836 rendset = 0, rendstyle = RS_RVid;
3385 break; 3837 break;
3838 //case 28: // visible. NYI
3839 //case 29: // not crossed-out
3386 } 3840 }
3841
3387 if (rendset != -1) 3842 if (rendset != -1)
3388 { 3843 {
3389 scr_rendition (rendset, rendstyle); 3844 scr_rendition (rendset, rendstyle);
3390 continue; /* for (;i;) */ 3845 continue; /* for (;i;) */
3391 } 3846 }
… …
3398 case 33: 3853 case 33:
3399 case 34: 3854 case 34:
3400 case 35: 3855 case 35:
3401 case 36: 3856 case 36:
3402 case 37: 3857 case 37:
3403 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3404 Color_fg);
3405 break; 3859 break;
3406#ifdef TTY_256COLOR 3860#ifdef TTY_256COLOR
3407 case 38: 3861 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3862 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3863 {
3410 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3411 Color_fg);
3412 i += 2; 3865 i += 2;
3413 } 3866 }
3414 break; 3867 break;
3415#endif 3868#endif
3416 case 39: /* default fg */ 3869 case 39: /* default fg */
… …
3423 case 43: 3876 case 43:
3424 case 44: 3877 case 44:
3425 case 45: 3878 case 45:
3426 case 46: 3879 case 46:
3427 case 47: 3880 case 47:
3428 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3429 Color_bg);
3430 break; 3882 break;
3431#ifdef TTY_256COLOR 3883#ifdef TTY_256COLOR
3432 case 48: 3884 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3885 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3886 {
3435 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3436 Color_bg);
3437 i += 2; 3888 i += 2;
3438 } 3889 }
3439 break; 3890 break;
3440#endif 3891#endif
3441 case 49: /* default bg */ 3892 case 49: /* default bg */
… …
3470 } 3921 }
3471 } 3922 }
3472} 3923}
3473/*}}} */ 3924/*}}} */
3474 3925
3475/*{{{ process Rob Nation's own graphics mode sequences */ 3926/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3476void 3927void
3477rxvt_term::process_graphics () 3928rxvt_term::process_graphics ()
3478{ 3929{
3479 unsigned char ch, cmd = cmd_getc (); 3930 unicode_t ch, cmd = cmd_getc ();
3480 3931
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3932 if (cmd == 'Q')
3483 { /* query graphics */ 3933 { /* query graphics */
3484 tt_printf ("\033G0\n"); /* no graphics */ 3934 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3935 return;
3486 } 3936 }
3487 /* swallow other graphics sequences until terminating ':' */ 3937 /* swallow other graphics sequences until terminating ':' */
3488 do 3938 do
3489 ch = cmd_getc (); 3939 ch = cmd_getc ();
3490 while (ch != ':'); 3940 while (ch != ':');
3491#else
3492 unsigned int nargs;
3493 int args[NGRX_PTS];
3494 unsigned char *text = NULL;
3495
3496 if (cmd == 'Q')
3497 { /* query graphics */
3498 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3499 return;
3500 }
3501 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3502 {
3503 int neg;
3504
3505 ch = cmd_getc ();
3506 neg = (ch == '-');
3507 if (neg || ch == '+')
3508 ch = cmd_getc ();
3509
3510 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg)
3513 args[nargs] = -args[nargs];
3514
3515 nargs++;
3516 args[nargs] = 0;
3517 if (ch != ';')
3518 break;
3519 }
3520
3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3523 int i, len = args[4];
3524
3525 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3526
3527 if (text != NULL)
3528 {
3529 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc ();
3531 text[len] = '\0';
3532 }
3533 }
3534 Gr_do_graphics (cmd, nargs, args, text);
3535#endif
3536} 3941}
3537/*}}} */ 3942/*}}} */
3538 3943
3539/* ------------------------------------------------------------------------- */ 3944/* ------------------------------------------------------------------------- */
3540 3945

Diff Legend

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