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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.131 by root, Fri Aug 13 22:38:57 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
… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 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
62#ifndef NO_FRILLS
63
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL
67
68static unsigned short iso14755_symtab[] = {
69 // keysym, unicode
70 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191,
73 XK_KP_Up, 0x2191,
74 XK_Right, 0x2192,
75 XK_KP_Right, 0x2192,
76 XK_Down, 0x2193,
77 XK_KP_Down, 0x2193,
78 XK_Linefeed, 0x21b4,
79 XK_Return, 0x21b5,
80 XK_KP_Enter, 0x21b5,
81
82 XK_Prior, 0x21de,
83 XK_Next, 0x21df,
84 XK_Tab, 0x21e5,
85 XK_ISO_Left_Tab, 0x21e6,
86 XK_Shift_L, 0x21e7,
87 XK_Shift_R, 0x21e7,
88
89 XK_Shift_Lock, 0x21eb,
90 XK_ISO_Lock, 0x21eb,
91 XK_ISO_Lock, 0x21eb,
92 XK_Caps_Lock, 0x21ec,
93 XK_Num_Lock, 0x21ed,
94 XK_ISO_Level3_Shift, 0x21ee,
95 XK_ISO_Level3_Lock, 0x21ef,
96 XK_ISO_Group_Lock, 0x21f0,
97 XK_Home, 0x21f1,
98 XK_End, 0x21f2,
99
100 XK_Execute, 0x2318,
101 XK_Begin, 0x2320,
102 XK_Delete, 0x2326,
103 XK_Clear, 0x2327,
104 XK_BackSpace, 0x232b,
105 XK_Insert, 0x2380,
106 XK_Control_L, 0x2388,
107 XK_Control_R, 0x2388,
108 XK_Pause, 0x2389,
109 XK_Break, 0x238a,
110 XK_Escape, 0x238b,
111 XK_Undo, 0x238c,
112 XK_Print, 0x2399,
113
114 XK_space, 0x2423,
115 XK_KP_Space, 0x2422,
116 0,
117};
118
119void
120rxvt_term::commit_iso14755 ()
121{
122 wchar_t ch[2];
123
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask
125 ch[1] = 0;
126
127 if (iso14755buf & ISO_14755_KEYCODE_VALID)
128 {
129 char mb[16];
130 int len;
131
132 // allow verbatim 0-bytes and control-bytes to be entered
133 if (ch[0] >= 0x20)
134 len = wcstombs (mb, ch, 16);
135 else
136 {
137 mb[0] = ch[0];
138 len = 1;
139 }
140
141 if (len > 0)
142 tt_write ((unsigned char *)mb, len);
143 else
144 scr_bell ();
145 }
146
147 iso14755buf = 0;
148}
149
150int
151rxvt_term::hex_keyval (XKeyEvent &ev)
152{
153 // check wether this event corresponds to a hex digit
154 // if the modifiers had not been pressed.
155 for (int index = 0; index < 8; index++)
156 {
157 KeySym k = XLookupKeysym (&ev, index);
158
159 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
160 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
161 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
162 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
163 }
164
165 return -1;
166}
167#endif
168
57/*{{{ Convert the keypress event into a string */ 169/*{{{ Convert the keypress event into a string */
58void 170void
59rxvt_term::lookup_key (XKeyEvent &ev) 171rxvt_term::lookup_key (XKeyEvent &ev)
60{ 172{
61 int ctrl, meta, shft, len; 173 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 200#ifdef USE_XIM
89 if (Input_Context) 201 if (Input_Context)
90 { 202 {
91 Status status_return; 203 Status status_return;
92 204
205#if 0
93#ifdef X_HAVE_UTF8_STRING 206#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 207 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 208 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 209 KBUFSZ, &keysym, &status_return);
97 else 210 else
211#endif
98#endif 212#endif
99 { 213 {
100 wchar_t wkbuf[KBUFSZ + 1]; 214 wchar_t wkbuf[KBUFSZ + 1];
101 215
102 // the XOpenIM manpage lies about hardcoding the locale 216 // the XOpenIM manpage lies about hardcoding the locale
… …
110 SET_LOCALE (locale); 224 SET_LOCALE (locale);
111 225
112 if (status_return == XLookupChars 226 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 227 || status_return == XLookupBoth)
114 { 228 {
229 /* make sure the user can type ctrl-@, i.e. NUL */
230 if (len == 1 && *wkbuf == 0)
231 {
232 kbuf[0] = 0;
233 len = 1;
234 }
235 else
236 {
115 wkbuf[len] = 0; 237 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 238 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 239 if (len < 0)
118 len = 0; 240 len = 0;
241 }
119 } 242 }
120 else 243 else
121 len = 0; 244 len = 0;
122 } 245 }
123 246
… …
131 valid_keysym = keysym != NoSymbol; 254 valid_keysym = keysym != NoSymbol;
132 } 255 }
133 256
134 if (valid_keysym) 257 if (valid_keysym)
135 { 258 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 259 if (TermWin.saveLines)
158 { 260 {
159#ifdef UNSHIFTED_SCROLLKEYS 261#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 262 if (!ctrl && !meta)
161 {
162#else 263#else
163 if (IS_SCROLL_MOD) 264 if (IS_SCROLL_MOD)
265#endif
164 { 266 {
165#endif
166 int lnsppg; 267 int lnsppg;
167 268
168#ifdef PAGING_CONTEXT_LINES 269#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
170#else 271#else
… …
227 { 328 {
228 /* normal XTerm key bindings */ 329 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 330 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 331 selection_request (ev.time, 0, 0);
231 return; 332 return;
333#if TODO // TODO
232 /* rxvt extras */ 334 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 335 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 336 change_font (FONT_UP);
235 return; 337 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 339 change_font (FONT_DN);
238 return; 340 return;
341#endif
239 } 342 }
240 } 343 }
241 } 344 }
345
346#ifndef NO_FRILLS
347 // ISO 14755 support
348 if (shft && ctrl)
349 {
350 int hv;
351
352 if (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter)
354 {
355 commit_iso14755 ();
356 return;
357 }
358 else if ((hv = hex_keyval (ev)) >= 0)
359 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID;
361 return;
362 }
363 else
364 iso14755buf = 0;
365 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
368 iso14755buf |= ISO_14755_ACTIVE;
369#endif
370
242#ifdef PRINTPIPE 371#ifdef PRINTPIPE
243 if (keysym == XK_Print) 372 if (keysym == XK_Print)
244 { 373 {
245 scr_printscreen (ctrl | shft); 374 scr_printscreen (ctrl | shft);
246 return;
247 }
248#endif
249#ifdef GREEK_SUPPORT
250 if (keysym == ks_greekmodeswith)
251 {
252 greek_mode = !greek_mode;
253 if (greek_mode)
254 {
255 xterm_seq (XTerm_title,
256 (greek_getmode () == GREEK_ELOT928
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
258 greek_reset ();
259 }
260 else
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return; 375 return;
263 } 376 }
264#endif 377#endif
265 378
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 379 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
268#ifdef KEYSYM_RESOURCE 381#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 383 {
271 unsigned int l; 384 unsigned int l;
272 const unsigned char *kbuf0; 385 const unsigned char *kbuf0;
273 const unsigned char ch = C0_ESC;
274 386
275 kbuf0 = (Keysym_map[keysym & 0xFF]); 387 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++; 388 l = (unsigned int)*kbuf0++;
277 389
278 /* escape prefix */ 390 /* escape prefix */
279 if (meta) 391 if (meta
280# ifdef META8_OPTION 392# ifdef META8_OPTION
281 if (meta_char == C0_ESC) 393 && meta_char == C0_ESC
282# endif 394# endif
395 )
396 {
397 const unsigned char ch = C0_ESC;
283 tt_write (&ch, 1); 398 tt_write (&ch, 1);
399 }
400
284 tt_write (kbuf0, l); 401 tt_write (kbuf0, l);
285 return; 402 return;
286 } 403 }
287 else 404 else
288#endif 405#endif
… …
298 ^ !!ctrl) ? '\b' : '\177'; 415 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 416 kbuf[1] = '\0';
300 } 417 }
301 else 418 else
302 STRCPY (kbuf, key_backspace); 419 STRCPY (kbuf, key_backspace);
303# ifdef MULTICHAR_SET
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
305 {
306 int col, row;
307
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 }
314# endif
315 break; 420 break;
316#endif 421#endif
317#ifndef NO_DELETE_KEY 422#ifndef NO_DELETE_KEY
318 case XK_Delete: 423 case XK_Delete:
319 STRCPY (kbuf, key_delete); 424 STRCPY (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 425 break;
333#endif 426#endif
334 case XK_Tab: 427 case XK_Tab:
335 if (shft) 428 if (shft)
336 STRCPY (kbuf, "\033[Z"); 429 STRCPY (kbuf, "\033[Z");
… …
347 newlen = 0; 440 newlen = 0;
348 } 441 }
349 break; 442 break;
350 443
351#ifdef XK_KP_Left 444#ifdef XK_KP_Left
352 case XK_KP_Up: /* \033Ox or standard */ 445 case XK_KP_Up: /* \033Ox or standard */
353 case XK_KP_Down: /* \033Or or standard */ 446 case XK_KP_Down: /* \033Or or standard */
354 case XK_KP_Right: /* \033Ov or standard */ 447 case XK_KP_Right: /* \033Ov or standard */
355 case XK_KP_Left: /* \033Ot or standard */ 448 case XK_KP_Left: /* \033Ot or standard */
356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
357 { 450 {
… …
378 kbuf[1] = 'O'; 471 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 472 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 473 }
381 else if (PrivateModes & PrivMode_aplCUR) 474 else if (PrivateModes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 475 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 476 break;
419 477
420#ifndef UNSHIFTED_SCROLLKEYS 478#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 479# ifdef XK_KP_Prior
422 case XK_KP_Prior: 480 case XK_KP_Prior:
… …
611 break; 669 break;
612 } 670 }
613 if (newlen) 671 if (newlen)
614 len = STRLEN (kbuf); 672 len = STRLEN (kbuf);
615 } 673 }
674
616 /* 675 /*
617 * Pass meta for all function keys, if 'meta' option set 676 * Pass meta for all function keys, if 'meta' option set
618 */ 677 */
619#ifdef META8_OPTION 678#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 679 if (meta && (meta_char == 0x80) && len > 0)
… …
635 { 694 {
636 unsigned char *ch; 695 unsigned char *ch;
637 696
638 for (ch = kbuf; ch < kbuf + len; ch++) 697 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 698 *ch |= 0x80;
699
640 meta = 0; 700 meta = 0;
641 } 701 }
642#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif 702#endif
647 /* nil */ ; 703 /* nil */ ;
648 } 704 }
649 } 705 }
650 706
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 729 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 730
675 /* escape prefix */ 731 /* escape prefix */
676 if (meta 732 if (meta
677#ifdef META8_OPTION 733#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 734 && meta_char == C0_ESC
679#endif 735#endif
680 ) 736 )
681 { 737 {
682 const unsigned char ch = C0_ESC; 738 const unsigned char ch = C0_ESC;
683
684 tt_write (&ch, 1); 739 tt_write (&ch, 1);
685 } 740 }
741
686#ifdef DEBUG_CMD 742#if defined(DEBUG_CMD)
687 if (debug_key)
688 { /* Display keyboard buffer contents */ 743 /* Display keyboard buffer contents */
689 char *p; 744 unsigned char *p;
690 int i; 745 int i;
691 746
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 747 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++) 748 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 749 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n"); 750 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */ 751#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 752 tt_write (kbuf, (unsigned int)len);
699} 753}
700/*}}} */ 754/*}}} */
701 755
… …
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */ 758/* attempt to `write' count to the input buffer */
705unsigned int 759unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 760rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
707{ 761{
708 unsigned int n, s; 762 unsigned int n, s;
709 763
710 n = cmdbuf_ptr - cmdbuf_base; 764 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766
712 if (n > 0 && s < count) 767 if (n > 0 && s < count)
713 { 768 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 769 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 771 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 772 cmdbuf_endp -= n;
718 s += n; 773 s += n;
719 } 774 }
775
720 if (count > s) 776 if (count > s)
721 { 777 {
722 rxvt_print_error ("data loss: cmd_write too large"); 778 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 779 count = s;
724 } 780 }
781
725 for (; count--;) 782 for (; count--;)
726 *cmdbuf_endp++ = *str++; 783 *cmdbuf_endp++ = *str++;
784
785 cmd_parse ();
786
727 return 0; 787 return 0;
728} 788}
729#endif /* MENUBAR_MAX */ 789#endif /* MENUBAR_MAX */
730 790
731void 791void
… …
735 if (want_full_refresh) 795 if (want_full_refresh)
736 { 796 {
737 want_full_refresh = 0; 797 want_full_refresh = 0;
738 scr_clear (); 798 scr_clear ();
739 scr_touch (false); 799 scr_touch (false);
740 want_refresh = 1;
741 } 800 }
742#endif 801#endif
743 802
744 if (want_refresh) 803 if (want_refresh)
745 { 804 {
746 scr_refresh (refresh_type); 805 scr_refresh (refresh_type);
747 scrollbar_show (1); 806 scrollbar_show (1);
748#ifdef USE_XIM 807#ifdef USE_XIM
749 IMSendSpot (); 808 IMSendSpot ();
750#endif 809#endif
751
752 } 810 }
753 811
754 display->flush (); 812 display->flush ();
813
814 flush_ev.stop ();
755} 815}
756 816
757void 817void
758rxvt_term::check_cb (check_watcher &w) 818rxvt_term::check_cb (check_watcher &w)
759{ 819{
760 SET_R (this); 820 SET_R (this);
761 SET_LOCALE (locale); 821 SET_LOCALE (locale);
762 822
823 display->flush ();
824
825 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01);
827}
828
829void
830rxvt_term::flush_cb (time_watcher &w)
831{
832 SET_R (this);
833 SET_LOCALE (locale);
834
835 refresh_limit = 1;
836 refresh_count = 0;
763 flush (); 837 flush ();
764} 838}
765 839
766#ifdef CURSOR_BLINK 840#ifdef CURSOR_BLINK
767void 841void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 859 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 860 }
787} 861}
788#endif 862#endif
789 863
864#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
865void
866rxvt_term::cont_scroll_cb (time_watcher &w)
867{
868 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
874 }
875}
876#endif
877
878#ifdef SELECTION_SCROLLING
879void
880rxvt_term::sel_scroll_cb (time_watcher &w)
881{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 }
889}
890#endif
891
892#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
893void
894rxvt_term::slip_wheel_cb (time_watcher &w)
895{
896 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed))
899 {
900 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 }
904}
905#endif
906
790bool 907bool
791rxvt_term::pty_fill () 908rxvt_term::pty_fill ()
792{ 909{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 910 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911
912 if (CBUFSIZ == n)
913 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
915 n = 0;
916 }
794 917
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 918 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 919 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 920 cmdbuf_endp = cmdbuf_ptr + n;
798 921
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
800 923
801 if (n > 0) 924 if (n > 0)
802 { 925 {
803 cmdbuf_endp += n; 926 cmdbuf_endp += n;
804 return true; 927 return true;
805 } 928 }
806 else if (n < 0 && errno != EAGAIN) 929 else if (n < 0 && errno != EAGAIN)
807 destroy (); 930 destroy ();
808 931
809 return false; 932 return false;
810} 933}
811 934
812void 935void
813rxvt_term::pty_cb (io_watcher &w, short revents) 936rxvt_term::pty_cb (io_watcher &w, short revents)
… …
816 SET_LOCALE (locale); 939 SET_LOCALE (locale);
817 940
818 if (revents & EVENT_WRITE) 941 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 942 tt_write (0, 0);
820 else if (revents & EVENT_READ) 943 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us 944 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ()) 945 while (pty_fill ())
827 { 946 if (cmd_parse ())
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break; 947 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935} 948}
936 949
937// read the next character, currently handles UTF-8 950void
938// will probably handle all sorts of other stuff in the future 951rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 952{
942 while (cmdbuf_ptr < cmdbuf_endp) 953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
943 { 954 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 955
947 wchar_t wc; 956#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 957 hidden_pointer = 0;
949 958
950 if (len == (size_t)-2) 959 if (Options & Opt_pointerBlank)
951 return NOCHAR; 960 pointer_ev.start (NOW + pointerBlankDelay);
952 961#endif
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 962}
985 963
986#ifdef POINTER_BLANK 964#ifdef POINTER_BLANK
987void 965void
988rxvt_term::pointer_unblank ()
989{
990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
991 recolour_cursor ();
992
993 hidden_pointer = 0;
994
995 if (Options & Opt_pointerBlank)
996 pointer_ev.start (NOW + pointerBlankDelay);
997}
998
999void
1000rxvt_term::pointer_blank () 966rxvt_term::pointer_blank ()
1001{ 967{
1002 if (! (Options & Opt_pointerBlank)) 968 if (! (Options & Opt_pointerBlank))
1003 return; 969 return;
1004 970
… …
1017 pointer_blank (); 983 pointer_blank ();
1018} 984}
1019#endif 985#endif
1020 986
1021void 987void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 988rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 989{
1024 int button_number, key_state = 0; 990 int button_number, key_state = 0;
1025 int x, y; 991 int x, y;
1026 992
1027 x = ev.x; 993 x = ev.x;
1028 y = ev.y; 994 y = ev.y;
1029 pixel_position (&x, &y); 995 pixel_position (&x, &y);
1030 996
… …
1193#endif 1159#endif
1194 1160
1195 switch (ev.type) 1161 switch (ev.type)
1196 { 1162 {
1197 case KeyPress: 1163 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT))
1198 lookup_key (ev.xkey); 1165 lookup_key (ev.xkey);
1166
1167 break;
1168
1169 case KeyRelease:
1170 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS)
1172 KeySym ks;
1173
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif
1176
1177#ifndef NO_FRILLS
1178 // ISO 14755 support
1179 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT)
1181 {
1182 // iso14755 part 5.2 handling: release time
1183 // first: controls
1184 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f)))
1187 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 ();
1190 return; // case-break;
1191 }
1192
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks)
1195 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1];
1197 commit_iso14755 ();
1198 return; // case-break;
1199 }
1200
1201 iso14755buf = 0;
1202 scr_bell ();
1199 break; 1203 break;
1204 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 {
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID)
1208 commit_iso14755 ();
1209 else if (iso14755buf & ISO_14755_ACTIVE)
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair
1211 }
1212#endif
1200 1213
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1215 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1218 mouse_slip_wheel_speed = 0;
1206 else 1219#endif
1207 {
1208 KeySym ks;
1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break; 1220 break;
1215 } 1221 }
1216#endif
1217 1222
1218 case ButtonPress: 1223 case ButtonPress:
1219 button_press (ev.xbutton); 1224 button_press (ev.xbutton);
1220 break; 1225 break;
1221 1226
… …
1233 && (ev.xclient.data.l[0] == DndFile 1238 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1239 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1240 || ev.xclient.data.l[0] == DndLink))
1236 { 1241 {
1237 /* Get Dnd data */ 1242 /* Get Dnd data */
1238 Atom ActualType; 1243 Atom ActualType;
1239 int ActualFormat; 1244 int ActualFormat;
1240 unsigned char *data; 1245 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1246 unsigned long Size, RemainingBytes;
1242 1247
1243 XGetWindowProperty (display->display, display->root, 1248 XGetWindowProperty (display->display, display->root,
1244 xa[XA_DNDSELECTION], 1249 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1250 0L, 1000000L,
1246 False, AnyPropertyType, 1251 False, AnyPropertyType,
… …
1249 &data); 1254 &data);
1250 XChangeProperty (display->display, display->root, 1255 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1256 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1257 8, PropModeReplace,
1253 data, STRLEN (data)); 1258 data, STRLEN (data));
1259 XFree (data);
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1260 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1262 }
1257#endif /* OFFIX_DND */ 1263#endif /* OFFIX_DND */
1258 break; 1264 break;
1259 1265
1260 case MappingNotify: 1266 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1267 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1268 break;
1263 1269
1264 /* 1270 /*
1265 * XXX: this is not the _current_ arrangement 1271 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1272 * Here's my conclusion:
… …
1297#endif 1303#endif
1298#ifdef CURSOR_BLINK 1304#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink) 1305 if (Options & Opt_cursorBlink)
1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1301#endif 1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 {
1311 PixColors = PixColorsFocused;
1312 set_colorfgbg ();
1313 scr_clear ();
1314 scr_touch (true);
1315 }
1316#endif
1302 1317
1303 } 1318 }
1304 break; 1319 break;
1305 1320
1306 case FocusOut: 1321 case FocusOut:
… …
1315#ifdef CURSOR_BLINK 1330#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink) 1331 if (Options & Opt_cursorBlink)
1317 cursor_blink_ev.stop (); 1332 cursor_blink_ev.stop ();
1318 hidden_cursor = 0; 1333 hidden_cursor = 0;
1319#endif 1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1320 1344
1321 } 1345 }
1322 break; 1346 break;
1323 1347
1324 case ConfigureNotify: 1348 case ConfigureNotify:
… …
1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1334 } 1358 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336 1360
1337 if (szHint.width != width || szHint.height != height) 1361 if (szHint.width != width || szHint.height != height)
1338 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1340 resize_all_windows (width, height, 1); 1362 resize_all_windows (width, height, 1);
1341 } 1363
1342#ifdef DEBUG_SIZE
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent) 1365 if (Options & Opt_transparent)
1350 { 1366 {
1351 check_our_parents (); 1367 check_our_parents ();
1352 if (am_transparent) 1368 if (am_transparent)
1353 want_full_refresh = 1; 1369 want_refresh = want_full_refresh = 1;
1354 } 1370 }
1355#endif 1371#endif
1356
1357 } 1372 }
1358 break; 1373 break;
1359 1374
1375 case PropertyNotify:
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379
1380 break;
1381
1360 case SelectionClear: 1382 case SelectionClear:
1361 display->set_selection_owner (0); 1383 selection_clear ();
1362 break; 1384 break;
1363 1385
1364 case SelectionNotify: 1386 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1387 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1388 selection_paste (ev.xselection.requestor,
… …
1393 1415
1394 case GraphicsExpose: 1416 case GraphicsExpose:
1395 case Expose: 1417 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1418 if (ev.xany.window == TermWin.vt)
1397 { 1419 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1420 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1421 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1422 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1424
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1428 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1429 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1430
1406 // ev.xexpose.width, TermWin.height, False); 1431 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1432 }
1410 else 1433 else
1411 { 1434 {
1412 XEvent unused_event; 1435 XEvent unused_event;
1413 1436
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1415 Expose, 1438 ;
1416 &unused_event)) ;
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1418 GraphicsExpose, 1440 ;
1419 &unused_event)) ; 1441
1420 if (isScrollbarWindow (ev.xany.window)) 1442 if (isScrollbarWindow (ev.xany.window))
1421 { 1443 {
1422 scrollBar.setIdle (); 1444 scrollBar.setIdle ();
1423 scrollbar_show (0); 1445 scrollbar_show (0);
1424 } 1446 }
1425#ifdef MENUBAR 1447#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1449 menubar_expose ();
1428#endif 1450#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1451
1452#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0])
1454 XClearWindow (display->display, ev.xany.window);
1455#endif
1433 } 1456 }
1434 break; 1457 break;
1435 1458
1436 case MotionNotify: 1459 case MotionNotify:
1437#ifdef POINTER_BLANK 1460#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1462 pointer_unblank ();
1440#endif 1463#endif
1441#if MENUBAR 1464#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1465 if (isMenuBarWindow (ev.xany.window))
1443 { 1466 {
1444 menubar_control (& (ev.xbutton)); 1467 menubar_control (ev.xbutton);
1445 break; 1468 break;
1446 } 1469 }
1447#endif 1470#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1472 break;
… …
1471 if (ev.xbutton.y < TermWin.int_bwidth 1494 if (ev.xbutton.y < TermWin.int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1473 { 1496 {
1474 int dist; 1497 int dist;
1475 1498
1476 pending_scroll_selection=1;
1477
1478 /* don't clobber the current delay if we are 1499 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1500 * already in the middle of scrolling.
1480 */ 1501 */
1481 if (scroll_selection_delay<=0) 1502 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1504
1484 /* save the event params so we can highlight 1505 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1506 * the selection in the pending-scroll loop
1486 */ 1507 */
1487 selection_save_x=ev.xbutton.x; 1508 selection_save_x=ev.xbutton.x;
… …
1509 else 1530 else
1510 { 1531 {
1511 /* we are within the text window, so we 1532 /* we are within the text window, so we
1512 * shouldn't be scrolling 1533 * shouldn't be scrolling
1513 */ 1534 */
1514 pending_scroll_selection = 0; 1535 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop();
1515 } 1537 }
1516#endif 1538#endif
1517#ifdef MOUSE_THRESHOLD 1539#ifdef MOUSE_THRESHOLD
1518 1540
1519 } 1541 }
… …
1538 } 1560 }
1539 break; 1561 break;
1540 } 1562 }
1541} 1563}
1542 1564
1565#if TRANSPARENT
1543void 1566void
1544rxvt_term::rootwin_cb (XEvent &ev) 1567rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1568{
1546 SET_R (this); 1569 SET_R (this);
1547 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1548 1571
1549 switch (ev.type) 1572 switch (ev.type)
1550 { 1573 {
1551 case PropertyNotify: 1574 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /* 1575 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1576 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on. 1577 * use the property to determine the pixmap. We use it later on.
1564 */ 1578 */
1565 if (xa[XA_XROOTPMAPID] == 0) 1579 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567 1581
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return; 1583 return;
1570 }
1571 1584
1572 /* FALLTHROUGH */ 1585 /* FALLTHROUGH */
1573 case ReparentNotify: 1586 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1588 want_refresh = want_full_refresh = 1;
1577 break; 1589 break;
1578#endif
1579 } 1590 }
1580} 1591}
1592#endif
1581 1593
1582void 1594void
1583rxvt_term::button_press (const XButtonEvent &ev) 1595rxvt_term::button_press (XButtonEvent &ev)
1584{ 1596{
1585 int reportmode = 0, clickintime; 1597 int reportmode = 0, clickintime;
1586 1598
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1600 if (!bypass_keystate)
… …
1590 /* 1602 /*
1591 * VT window processing of button press 1603 * VT window processing of button press
1592 */ 1604 */
1593 if (ev.window == TermWin.vt) 1605 if (ev.window == TermWin.vt)
1594 { 1606 {
1595#if RXVT_GRAPHICS
1596 if (ev.subwindow != None)
1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1598 else
1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode) 1608 if (reportmode)
1609 {
1610 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime)
1604 { 1615 {
1605 /* mouse report from vt window */ 1616 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1617 MEvent.clicks++;
1607 MEvent.state = ev.state; 1618 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1619 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1620 /* only report double clicks */
1616 MEvent.clicks = 2; 1621 MEvent.clicks = 2;
1617 mouse_report (ev); 1622 mouse_report (ev);
1618 1623
1619 /* don't report the release */ 1624 /* don't report the release */
1620 MEvent.clicks = 0; 1625 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1626 MEvent.button = AnyButton;
1622 }
1623 } 1627 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1628 }
1637 else 1629 else
1638 { 1630 {
1631 /* different button, or time expired */
1632 MEvent.clicks = 1;
1633 MEvent.button = ev.button;
1634 mouse_report (ev);
1635 }
1636#else
1637 MEvent.button = ev.button;
1638 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */
1640
1641 }
1642 else
1643 {
1639 if (ev.button != MEvent.button) 1644 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1645 MEvent.clicks = 0;
1641 switch (ev.button) 1646 switch (ev.button)
1642 { 1647 {
1643 case Button1: 1648 case Button1:
1644 /* allow shift+left click to extend selection */ 1649 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1646 { 1651 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1652 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1653 selection_rotate (ev.x, ev.y);
1668 else 1654 else
1669 selection_extend (ev.x, ev.y, 1); 1655 selection_extend (ev.x, ev.y, 1);
1656 }
1657 else
1658 {
1659 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++;
1661 else
1662 MEvent.clicks = 1;
1663
1664 selection_click (MEvent.clicks, ev.x, ev.y);
1665 }
1666
1667 MEvent.button = Button1;
1668 break;
1669
1670 case Button3:
1671 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y);
1673 else
1674 selection_extend (ev.x, ev.y, 1);
1670 MEvent.button = Button3; 1675 MEvent.button = Button3;
1671 break; 1676 break;
1672 }
1673 } 1677 }
1678 }
1674 MEvent.time = ev.time; 1679 MEvent.time = ev.time;
1675 return; 1680 return;
1676 }
1677 } 1681 }
1678 1682
1679 /* 1683 /*
1680 * Scrollbar window processing of button press 1684 * Scrollbar window processing of button press
1681 */ 1685 */
… …
1745 upordown = 1; /* down */ 1749 upordown = 1; /* down */
1746 } 1750 }
1747 if (upordown) 1751 if (upordown)
1748 { 1752 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1754 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1755#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1756 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1757 {
1754 if (upordown < 0) 1758 if (upordown < 0)
1755 scrollBar.setUp (); 1759 scrollBar.setUp ();
… …
1771 break; 1775 break;
1772 case R_SB_ALIGN_BOTTOM: 1776 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1777 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1778 break;
1775 } 1779 }
1780
1776 if (scrollBar.style == R_SB_XTERM 1781 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 1782 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 1783 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 1784 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 1785
1781 scrollBar.setMotion (); 1786 scrollBar.setMotion ();
1782 break; 1787 break;
1783 1788
1784 case Button1: 1789 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1790 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1809 scr_page ((ev.button == Button1 ? DN : UP), 1814 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 1815 (TermWin.nrow
1811 * scrollbar_position (ev.y) 1816 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 1817 / scrollbar_size ()));
1813 } 1818 }
1819
1814 break; 1820 break;
1815 } 1821 }
1816 } 1822 }
1817 return; 1823 return;
1818 } 1824 }
… …
1824 menubar_control (ev); 1830 menubar_control (ev);
1825#endif 1831#endif
1826} 1832}
1827 1833
1828void 1834void
1829rxvt_term::button_release (const XButtonEvent &ev) 1835rxvt_term::button_release (XButtonEvent &ev)
1830{ 1836{
1831 int reportmode = 0; 1837 int reportmode = 0;
1832 1838
1833 csrO = 0; /* reset csr Offset */ 1839 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1840 if (!bypass_keystate)
… …
1842 refresh_type &= ~SMOOTH_REFRESH; 1848 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 1849#endif
1844 1850
1845 } 1851 }
1846#ifdef SELECTION_SCROLLING 1852#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 1853 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop();
1848#endif 1855#endif
1849 if (ev.window == TermWin.vt) 1856 if (ev.window == TermWin.vt)
1850 { 1857 {
1851#ifdef RXVT_GRAPHICS
1852 if (ev.subwindow != None)
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1854 else
1855#endif
1856
1857 {
1858 if (reportmode) 1858 if (reportmode)
1859 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1859 { 1870 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 1871 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 1872 MEvent.button = AnyButton;
1877 mouse_report (ev); 1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1878#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 1879 return;
1880 } 1880 }
1881 /* 1881 /*
1882 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 1883 * when overriding mouse reporting
1884 */ 1884 */
1885 if (PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1886 && bypass_keystate 1886 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1889 1889
1890 switch (ev.button) 1890 switch (ev.button)
1891 {
1892 case Button1:
1893 case Button3:
1894 selection_make (ev.time);
1895 break;
1896 case Button2:
1897 selection_request (ev.time, ev.x, ev.y);
1898 break;
1899#ifdef MOUSE_WHEEL
1900 case Button4:
1901 case Button5:
1891 { 1902 {
1892 case Button1: 1903 int i;
1893 case Button3: 1904 page_dirn v;
1894 selection_make (ev.time); 1905
1906 v = ev.button == Button4 ? UP : DN;
1907
1908 if (ev.state & ShiftMask)
1895 break; 1909 i = 1;
1896 case Button2: 1910 else if (Options & Opt_mouseWheelScrollPage)
1897 selection_request (ev.time, ev.x, ev.y); 1911 i = TermWin.nrow - 1;
1912 else
1898 break; 1913 i = 5;
1914
1899#ifdef MOUSE_WHEEL 1915# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 1916 if (ev.state & ControlMask)
1901 case Button5:
1902 { 1917 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 mouse_slip_wheel_speed += (v ? -1 : 1); 1918 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1920 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1921
1922 if (slip_wheel_ev.at < NOW)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924
1925 slip_wheel_ev.start ();
1918 } 1926 }
1927 else
1928 {
1919# endif 1929# endif
1920# ifdef JUMP_MOUSE_WHEEL 1930# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 1931 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 1932 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 1933 scrollbar_show (1);
… …
1927 scr_page (v, 1); 1937 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 1938 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 1939 scrollbar_show (1);
1930 } 1940 }
1931# endif 1941# endif
1932 1942# ifdef MOUSE_SLIP_WHEELING
1933 } 1943 }
1934 break;
1935#endif 1944#endif
1936
1937 } 1945 }
1946 break;
1947#endif
1938 } 1948 }
1939 } 1949 }
1940#ifdef MENUBAR 1950#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 1951 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 1952 menubar_control (ev);
1943#endif 1953#endif
1944} 1954}
1945 1955
1946
1947#ifdef TRANSPARENT 1956#ifdef TRANSPARENT
1957#if TINTING
1958/* taken from aterm-0.4.2 */
1959
1960typedef uint32_t RUINT32T;
1961
1962void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1963{
1964 int sh_r, sh_g, sh_b;
1965 RUINT32T mask_r, mask_g, mask_b;
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i;
1970
1971 Visual* visual = display->visual;
1972
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974
1975 /* for convenience */
1976 mask_r = visual->red_mask;
1977 mask_g = visual->green_mask;
1978 mask_b = visual->blue_mask;
1979
1980 /* boring lookup table pre-initialization */
1981 switch (srcImage->bits_per_pixel) {
1982 case 15:
1983 if ((mask_r != 0x7c00) ||
1984 (mask_g != 0x03e0) ||
1985 (mask_b != 0x001f))
1986 return;
1987 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1988 lookup_r = lookup;
1989 lookup_g = lookup+32;
1990 lookup_b = lookup+32+32;
1991 sh_r = 10;
1992 sh_g = 5;
1993 sh_b = 0;
1994 break;
1995 case 16:
1996 if ((mask_r != 0xf800) ||
1997 (mask_g != 0x07e0) ||
1998 (mask_b != 0x001f))
1999 return;
2000 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2001 lookup_r = lookup;
2002 lookup_g = lookup+32;
2003 lookup_b = lookup+32+64;
2004 sh_r = 11;
2005 sh_g = 5;
2006 sh_b = 0;
2007 break;
2008 case 24:
2009 if ((mask_r != 0xff0000) ||
2010 (mask_g != 0x00ff00) ||
2011 (mask_b != 0x0000ff))
2012 return;
2013 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2014 lookup_r = lookup;
2015 lookup_g = lookup+256;
2016 lookup_b = lookup+256+256;
2017 sh_r = 16;
2018 sh_g = 8;
2019 sh_b = 0;
2020 break;
2021 case 32:
2022 if ((mask_r != 0xff0000) ||
2023 (mask_g != 0x00ff00) ||
2024 (mask_b != 0x0000ff))
2025 return;
2026 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2027 lookup_r = lookup;
2028 lookup_g = lookup+256;
2029 lookup_b = lookup+256+256;
2030 sh_r = 16;
2031 sh_g = 8;
2032 sh_b = 0;
2033 break;
2034 default:
2035 return; /* we do not support this color depth */
2036 }
2037
2038 /* prepare limits for color transformation (each channel is handled separately) */
2039 if (shade < 0) {
2040 shade = -shade;
2041 if (shade < 0) shade = 0;
2042 if (shade > 100) shade = 100;
2043
2044 lower_lim_r = 65535-rm;
2045 lower_lim_g = 65535-gm;
2046 lower_lim_b = 65535-bm;
2047
2048 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2049 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2050 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2051
2052 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2053 } else {
2054 if (shade < 0) shade = 0;
2055 if (shade > 100) shade = 100;
2056
2057 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2058
2059 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2060 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2061 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2062 }
2063
2064 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2065 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2066 {
2067 unsigned int tmp;
2068
2069 tmp = lower_lim_r;
2070 lower_lim_r = lower_lim_b;
2071 lower_lim_b = tmp;
2072
2073 tmp = upper_lim_r;
2074 upper_lim_r = upper_lim_b;
2075 upper_lim_b = tmp;
2076 }
2077
2078 /* fill our lookup tables */
2079 for (i = 0; i <= mask_r>>sh_r; i++)
2080 {
2081 RUINT32T tmp;
2082 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2083 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2084 lookup_r[i] = (tmp/65535)<<sh_r;
2085 }
2086 for (i = 0; i <= mask_g>>sh_g; i++)
2087 {
2088 RUINT32T tmp;
2089 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2090 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2091 lookup_g[i] = (tmp/65535)<<sh_g;
2092 }
2093 for (i = 0; i <= mask_b>>sh_b; i++)
2094 {
2095 RUINT32T tmp;
2096 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2097 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2098 lookup_b[i] = (tmp/65535)<<sh_b;
2099 }
2100
2101 /* apply table to input image (replacing colors by newly calculated ones) */
2102 switch (srcImage->bits_per_pixel)
2103 {
2104 case 15:
2105 {
2106 unsigned short *p1, *pf, *p, *pl;
2107 p1 = (unsigned short *) srcImage->data;
2108 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2109 while (p1 < pf)
2110 {
2111 p = p1;
2112 pl = p1 + srcImage->width;
2113 for (; p < pl; p++)
2114 {
2115 *p = lookup_r[(*p & 0x7c00)>>10] |
2116 lookup_g[(*p & 0x03e0)>> 5] |
2117 lookup_b[(*p & 0x001f)];
2118 }
2119 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2120 }
2121 break;
2122 }
2123 case 16:
2124 {
2125 unsigned short *p1, *pf, *p, *pl;
2126 p1 = (unsigned short *) srcImage->data;
2127 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2128 while (p1 < pf)
2129 {
2130 p = p1;
2131 pl = p1 + srcImage->width;
2132 for (; p < pl; p++)
2133 {
2134 *p = lookup_r[(*p & 0xf800)>>11] |
2135 lookup_g[(*p & 0x07e0)>> 5] |
2136 lookup_b[(*p & 0x001f)];
2137 }
2138 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2139 }
2140 break;
2141 }
2142 case 24:
2143 {
2144 unsigned char *p1, *pf, *p, *pl;
2145 p1 = (unsigned char *) srcImage->data;
2146 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2147 while (p1 < pf)
2148 {
2149 p = p1;
2150 pl = p1 + srcImage->width * 3;
2151 for (; p < pl; p += 3)
2152 {
2153 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2154 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2155 p[2] = lookup_r[(p[2] & 0x0000ff)];
2156 }
2157 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2158 }
2159 break;
2160 }
2161 case 32:
2162 {
2163 RUINT32T *p1, *pf, *p, *pl;
2164 p1 = (RUINT32T *) srcImage->data;
2165 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2166
2167 while (p1 < pf)
2168 {
2169 p = p1;
2170 pl = p1 + srcImage->width;
2171 for (; p < pl; p++)
2172 {
2173 *p = lookup_r[(*p & 0xff0000)>>16] |
2174 lookup_g[(*p & 0x00ff00)>> 8] |
2175 lookup_b[(*p & 0x0000ff)] |
2176 (*p & ~0xffffff);
2177 }
2178 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2179 }
2180 break;
2181 }
2182 }
2183
2184 free (lookup);
2185}
2186#endif
2187
1948/* 2188/*
1949 * Check our parents are still who we think they are. 2189 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2190 * Do transparency updates if required
1951 */ 2191 */
1952int 2192int
1953rxvt_term::check_our_parents () 2193rxvt_term::check_our_parents ()
1954{ 2194{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2195 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2196 unsigned long nitems, bytes_after;
1957 Atom atype; 2197 Atom atype;
1958 unsigned char *prop = NULL; 2198 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2199 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2200 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2201 XWindowAttributes wattr, wrootattr;
1962 2202
1963 pchanged = 0; 2203 pchanged = 0;
1964 2204
1965 if (! (Options & Opt_transparent)) 2205 if (!(Options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2206 return pchanged; /* Don't try any more */
1967 2207
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2208 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2209 rootdepth = wrootattr.depth;
1970 2210
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2212
1972 if (rootdepth != wattr.depth) 2213 if (rootdepth != wattr.depth)
1973 { 2214 {
1974 if (am_transparent) 2215 if (am_transparent)
1975 { 2216 {
1976 pchanged = 1; 2217 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2219 am_transparent = am_pixmap_trans = 0;
1980 } 2220 }
2221
1981 return pchanged; /* Don't try any more */ 2222 return pchanged; /* Don't try any more */
1982 } 2223 }
1983 2224
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2225 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2226 XSync (display->display, False);
… …
1987 /* 2228 /*
1988 * Make the frame window set by the window manager have 2229 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2230 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2231 * windows for each client, so we have to take care about that.
1991 */ 2232 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2233 i = (xa[XA_XROOTPMAPID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2236 &nitems, &bytes_after, &prop) == Success);
2237
1996 if (!i || prop == NULL) 2238 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success);
2243
2244 if (!i || prop == NULL
2245#if TINTING
2246 || !rs[Rs_color + Color_tint]
2247#endif
2248 )
1997 have_pixmap = 0; 2249 have_pixmap = 0;
1998 else 2250 else
1999 { 2251 {
2000 have_pixmap = 1; 2252 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2253 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2254 XFree (prop);
2003 } 2255 }
2256
2004 if (have_pixmap) 2257 if (have_pixmap)
2005 { 2258 {
2006 /* 2259 /*
2007 * Copy display->root pixmap transparency 2260 * Copy display->root pixmap transparency
2008 */ 2261 */
2009 int sx, sy, nx, ny; 2262 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2263 unsigned int nw, nh;
2011 Window cr; 2264 Window cr;
2012 XImage *image; 2265 XImage *image;
2013 GC gc; 2266 GC gc;
2014 XGCValues gcvalue; 2267 XGCValues gcvalue;
2015 2268
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2270 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2271 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2272 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2273 nx = ny = 0;
2274
2021 if (sx < 0) 2275 if (sx < 0)
2022 { 2276 {
2023 nw += sx; 2277 nw += sx;
2024 nx = -sx; 2278 nx = -sx;
2025 sx = 0; 2279 sx = 0;
2026 } 2280 }
2281
2027 if (sy < 0) 2282 if (sy < 0)
2028 { 2283 {
2029 nh += sy; 2284 nh += sy;
2030 ny = -sy; 2285 ny = -sy;
2031 sy = 0; 2286 sy = 0;
2032 } 2287 }
2288
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1; 2291 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2293
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2295 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2296 allowedxerror = 0;
2297
2041 if (image == NULL) 2298 if (image == NULL)
2042 { 2299 {
2043 if (am_transparent && am_pixmap_trans) 2300 if (am_transparent && am_pixmap_trans)
2044 { 2301 {
2045 pchanged = 1; 2302 pchanged = 1;
… …
2047 { 2304 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2305 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None; 2306 TermWin.pixmap = None;
2050 } 2307 }
2051 } 2308 }
2309
2052 am_pixmap_trans = 0; 2310 am_pixmap_trans = 0;
2053 } 2311 }
2054 else 2312 else
2055 { 2313 {
2056 if (TermWin.pixmap != None) 2314 if (TermWin.pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2315 XFreePixmap (display->display, TermWin.pixmap);
2316
2317#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint))
2319 {
2320 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2324
2325 ShadeXImage (display, image, shade, rm, gm, bm);
2326 }
2327#endif
2328
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2330 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2333 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2334 XFreeGC (display->display, gc);
2067 XDestroyImage (image); 2335 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2069 TermWin.pixmap); 2337 XClearWindow (display->display, TermWin.parent[0]);
2338
2070 if (!am_transparent || !am_pixmap_trans) 2339 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2340 pchanged = 1;
2341
2072 am_transparent = am_pixmap_trans = 1; 2342 am_transparent = am_pixmap_trans = 1;
2073 } 2343 }
2074 } 2344 }
2345
2075 if (!am_pixmap_trans) 2346 if (!am_pixmap_trans)
2076 { 2347 {
2077 unsigned int n; 2348 unsigned int n;
2078 /* 2349 /*
2079 * InheritPixmap transparency 2350 * InheritPixmap transparency
2080 */ 2351 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2354 {
2085 oldp = TermWin.parent[i]; 2355 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2356 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2357 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2358 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360
2090 if (TermWin.parent[i] == display->root) 2361 if (TermWin.parent[i] == display->root)
2091 { 2362 {
2092 if (oldp != None) 2363 if (oldp != None)
2093 pchanged = 1; 2364 pchanged = 1;
2365
2094 break; 2366 break;
2095 } 2367 }
2368
2096 if (oldp != TermWin.parent[i]) 2369 if (oldp != TermWin.parent[i])
2097 pchanged = 1; 2370 pchanged = 1;
2098 } 2371 }
2372
2099 n = 0; 2373 n = 0;
2374
2100 if (pchanged) 2375 if (pchanged)
2101 { 2376 {
2102 for (; n < (unsigned int)i; n++) 2377 for (; n < (unsigned int)i; n++)
2103 { 2378 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2109 break; 2384 break;
2110 } 2385 }
2111 } 2386 }
2112 } 2387 }
2113 if (n > (int) (sizeof (TermWin.parent) 2388
2114 / sizeof (TermWin.parent[0]))) 2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2115 { 2390 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2391 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt, 2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2394 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2395 /* XXX: also turn off Opt_transparent? */
2123 } 2396 }
2124 else 2397 else
2125 { 2398 {
2399#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2400 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2401 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130
2131 rqt.tv_sec = 1;
2132 rqt.tv_nsec = 0;
2133 nanosleep (&rqt, NULL);
2134# else
2135 sleep (1); 2402 sleep (1);
2136# endif 2403#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2405 for (n = 0; n < (unsigned int)i; n++)
2406 {
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2140 ParentRelative); 2408 XClearWindow (display->display, TermWin.parent[n]);
2409 }
2410
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2142 ParentRelative);
2143 am_transparent = 1; 2412 am_transparent = 1;
2144 } 2413 }
2414
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2416 TermWin.parent[i] = None;
2147 } 2417 }
2418
2419 // this is experimental
2420 if (scrollBar.win)
2421 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle ();
2425 scrollbar_show (0);
2426 }
2427
2148 return pchanged; 2428 return pchanged;
2149} 2429}
2150#endif 2430#endif
2151 2431
2152/*}}} */ 2432/*}}} */
2433
2434bool
2435rxvt_term::cmd_parse ()
2436{
2437 bool flag = false;
2438 unicode_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here
2440
2441 for (;;)
2442 {
2443 if (ch == NOCHAR)
2444 {
2445 seq_begin = cmdbuf_ptr;
2446 ch = next_char ();
2447 }
2448
2449 if (ch == NOCHAR) // TODO: improve
2450 break;
2451
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 {
2454 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false;
2457 int nlines = 0;
2458 unicode_t *str = buf;
2459
2460 for (;;)
2461 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break;
2464
2465 *str++ = ch;
2466
2467 if (ch == C0_LF)
2468 {
2469 nlines++;
2470 refresh_count++;
2471
2472 if (!(Options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 {
2475 refreshnow = true;
2476 ch = NOCHAR;
2477 break;
2478 }
2479
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2481 if (nlines >= TermWin.nrow - 1)
2482 {
2483 scr_add_lines (buf, nlines, str - buf);
2484 nlines = 0;
2485 str = buf;
2486 }
2487 }
2488
2489 if (str >= buf + UBUFSIZ)
2490 {
2491 ch = NOCHAR;
2492 break;
2493 }
2494
2495 seq_begin = cmdbuf_ptr;
2496 ch = next_char ();
2497 }
2498
2499 scr_add_lines (buf, nlines, str - buf);
2500
2501 /*
2502 * If there have been a lot of new lines, then update the screen
2503 * What the heck I'll cheat and only refresh less than every page-full.
2504 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling.
2506 */
2507 if (refreshnow)
2508 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++;
2511 else
2512 {
2513 flag = true;
2514 scr_refresh (refresh_type);
2515 }
2516 }
2517
2518 }
2519 else
2520 {
2521 try
2522 {
2523 process_nonprinting (ch);
2524 }
2525 catch (const class out_of_input &o)
2526 {
2527 // we ran out of input, retry later
2528 cmdbuf_ptr = seq_begin;
2529 break;
2530 }
2531
2532 ch = NOCHAR;
2533 }
2534 }
2535
2536 return flag;
2537}
2538
2539// read the next octet
2540unicode_t
2541rxvt_term::next_octet ()
2542{
2543 return cmdbuf_ptr < cmdbuf_endp
2544 ? *cmdbuf_ptr++
2545 : NOCHAR;
2546}
2547
2548// read the next character
2549unicode_t
2550rxvt_term::next_char ()
2551{
2552 while (cmdbuf_ptr < cmdbuf_endp)
2553 {
2554 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++;
2557
2558 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560
2561 if (len == (size_t)-2)
2562 {
2563 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp;
2565 break;
2566 }
2567
2568 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570
2571 // assume wchar == unicode
2572 cmdbuf_ptr += len;
2573 return wc;
2574 }
2575
2576 return NOCHAR;
2577}
2578
2579/* rxvt_cmd_getc () - Return next input character */
2580/*
2581 * Return the next input character after first passing any keyboard input
2582 * to the command.
2583 */
2584unicode_t
2585rxvt_term::cmd_getc ()
2586{
2587 unicode_t c = next_char ();
2588
2589 if (c == NOCHAR)
2590 throw out_of_input;
2591
2592 return c;
2593}
2594
2595unicode_t
2596rxvt_term::cmd_get8 ()
2597{
2598 unicode_t c = next_octet ();
2599
2600 if (c == NOCHAR)
2601 throw out_of_input;
2602
2603 return c;
2604}
2153 2605
2154/*{{{ print pipe */ 2606/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2607/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2608#ifdef PRINTPIPE
2157FILE * 2609FILE *
2158rxvt_term::popen_printer () 2610rxvt_term::popen_printer ()
2159{ 2611{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2612 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2613
2162 if (stream == NULL) 2614 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2615 rxvt_warn ("can't open printer pipe, not printing.\n");
2616
2164 return stream; 2617 return stream;
2165} 2618}
2166 2619
2167int 2620int
2168rxvt_term::pclose_printer (FILE *stream) 2621rxvt_term::pclose_printer (FILE *stream)
2169{ 2622{
2170 fflush (stream); 2623 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2624 return pclose (stream);
2177# endif
2178} 2625}
2179 2626
2180/* 2627/*
2181 * simulate attached vt100 printer 2628 * simulate attached vt100 printer
2182 */ 2629 */
2183void 2630void
2184rxvt_term::process_print_pipe () 2631rxvt_term::process_print_pipe ()
2185{ 2632{
2186 int done; 2633 int done;
2187 FILE *fd; 2634 FILE *fd;
2188 2635
2189 if ((fd = popen_printer ()) == NULL) 2636 if ((fd = popen_printer ()) == NULL)
2190 return; 2637 return;
2191 2638
2192 /* 2639 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2640 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2641 * is received.
2195 */ 2642 */
2196 for (done = 0; !done;) 2643 for (done = 0; !done;)
2197 { 2644 {
2198 unsigned char buf[8]; 2645 unsigned char buf[8];
2199 unsigned char ch; 2646 unicode_t ch;
2200 unsigned int i, len; 2647 unsigned int i, len;
2201 2648
2202 if ((ch = cmd_getc ()) != C0_ESC) 2649 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2650 {
2204 if (putc (ch, fd) == EOF) 2651 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2652 break; /* done = 1 */
… …
2220 { 2667 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2668 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2669 break; /* done = 1 */
2223 } 2670 }
2224 } 2671 }
2672
2225 for (i = 0; i < len; i++) 2673 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2674 if (putc (buf[i], fd) == EOF)
2227 { 2675 {
2228 done = 1; 2676 done = 1;
2229 break; 2677 break;
2230 } 2678 }
2231 } 2679 }
2232 } 2680 }
2681
2233 pclose_printer (fd); 2682 pclose_printer (fd);
2234} 2683}
2235#endif /* PRINTPIPE */ 2684#endif /* PRINTPIPE */
2236/*}}} */ 2685/*}}} */
2237 2686
2238/* *INDENT-OFF* */ 2687/* *INDENT-OFF* */
2239enum { 2688enum {
2240 C1_40 = 0x40, 2689 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2690 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2691 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2692 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2693 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2694};
2246/* *INDENT-ON* */ 2695/* *INDENT-ON* */
2247 2696
2248/*{{{ process non-printing single characters */ 2697/*{{{ process non-printing single characters */
2249void 2698void
2250rxvt_term::process_nonprinting (unsigned char ch) 2699rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2700{
2252 switch (ch) 2701 switch (ch)
2253 { 2702 {
2703 case C0_ESC:
2704 process_escape_seq ();
2705 break;
2254 case C0_ENQ: /* terminal Status */ 2706 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2707 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2259 else 2710 else
2260 tt_write ((unsigned char *)VT100_ANS, 2711 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2712 (unsigned int)STRLEN (VT100_ANS));
2262 break; 2713 break;
2263 case C0_BEL: /* bell */ 2714 case C0_BEL: /* bell */
2264 scr_bell (); 2715 scr_bell ();
2265 break; 2716 break;
2266 case C0_BS: /* backspace */ 2717 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2732 scr_charset_choose (1);
2282 break; 2733 break;
2283 case C0_SI: /* shift in - acs */ 2734 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2735 scr_charset_choose (0);
2285 break; 2736 break;
2737
2738#ifdef EIGHT_BIT_CONTROLS
2739 // 8-bit controls
2740 case 0x90: /* DCS */
2741 process_dcs_seq ();
2742 break;
2743 case 0x9b: /* CSI */
2744 process_csi_seq ();
2745 break;
2746 case 0x9d: /* CSI */
2747 process_osc_seq ();
2748 break;
2749#endif
2286 } 2750 }
2287} 2751}
2288/*}}} */ 2752/*}}} */
2289 2753
2290 2754
2291/*{{{ process VT52 escape sequences */ 2755/*{{{ process VT52 escape sequences */
2292void 2756void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2757rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2758{
2295 int row, col; 2759 int row, col;
2296 2760
2297 switch (ch) 2761 switch (ch)
2298 { 2762 {
… …
2350 2814
2351/*{{{ process escape sequences */ 2815/*{{{ process escape sequences */
2352void 2816void
2353rxvt_term::process_escape_seq () 2817rxvt_term::process_escape_seq ()
2354{ 2818{
2355 unsigned char ch = cmd_getc (); 2819 unicode_t ch = cmd_getc ();
2356 2820
2357 if (PrivateModes & PrivMode_vt52) 2821 if (PrivateModes & PrivMode_vt52)
2358 { 2822 {
2359 process_escape_vt52 (ch); 2823 process_escape_vt52 (ch);
2360 return; 2824 return;
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2841 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2842 break;
2379 case '+': 2843 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2844 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2845 break;
2382#ifdef MULTICHAR_SET
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS 2846#ifndef NO_FRILLS
2388 case '6': 2847 case '6':
2389 scr_backindex (); 2848 scr_backindex ();
2390 break; 2849 break;
2391#endif 2850#endif
… …
2413 break; 2872 break;
2414 2873
2415 /* 8.3.87: NEXT LINE */ 2874 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 2875 case C1_NEL: /* ESC E */
2417 { 2876 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 2877 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 2878 scr_add_lines (nlcr, 1, 2);
2420 } 2879 }
2421 break; 2880 break;
2422 2881
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 2882 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 2893 case C1_RI: /* ESC M */
2435 scr_index (DN); 2894 scr_index (DN);
2436 break; 2895 break;
2437 2896
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 2897 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 2898 /*case C1_SS2: scr_single_shift (2); break; */
2440 2899
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 2900 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 2901 /*case C1_SS3: scr_single_shift (3); break; */
2443 2902
2444 /* 8.3.27: DEVICE CONTROL STRING */ 2903 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 2904 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 2905 process_dcs_seq ();
2447 break; 2906 break;
… …
2462 process_osc_seq (); 2921 process_osc_seq ();
2463 break; 2922 break;
2464 2923
2465 /* 8.3.106: RESET TO INITIAL STATE */ 2924 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 2925 case 'c':
2926 mbstate.reset ();
2467 scr_poweron (); 2927 scr_poweron ();
2468 scrollbar_show (1); 2928 scrollbar_show (1);
2469 break; 2929 break;
2470 2930
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2931 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 2943
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2944/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 2945/* *INDENT-OFF* */
2486enum { 2946enum {
2487 CSI_ICH = 0x40, 2947 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2948 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2489 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2949 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2490 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2950 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2491 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2951 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2492 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2952 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2493 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2953 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2968 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2969 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2970 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2971 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2972 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2973 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 2974 };
2515/* *INDENT-ON* */ 2975/* *INDENT-ON* */
2516 2976
2517void 2977void
2518rxvt_term::process_csi_seq () 2978rxvt_term::process_csi_seq ()
2519{ 2979{
2520 unsigned char ch, priv, i; 2980 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 2981 unsigned int nargs, p;
2522 int n, ndef; 2982 int n, ndef;
2523 int arg[ESC_ARGS]; 2983 int arg[ESC_ARGS];
2524 2984
2525 for (nargs = ESC_ARGS; nargs > 0;) 2985 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 2986 arg[--nargs] = 0;
2527 2987
2528 priv = 0; 2988 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 2990 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 2991 { /* '<' '=' '>' '?' */
2532 priv = ch; 2992 priv = ch;
2533 ch = cmd_getc (); 2993 ch = cmd_getc ();
2534 } 2994 }
2995
2535 /* read any numerical arguments */ 2996 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 2997 for (n = -1; ch < CSI_ICH; )
2537 { 2998 {
2538 if (isdigit (ch)) 2999 if (isdigit (ch))
2539 { 3000 {
… …
2546 { 3007 {
2547 if (nargs < ESC_ARGS) 3008 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3009 arg[nargs++] = n;
2549 n = -1; 3010 n = -1;
2550 } 3011 }
2551 else if (ch == '\b') 3012 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 3013 process_nonprinting (ch);
2563 } 3014
2564 ch = cmd_getc (); 3015 ch = cmd_getc ();
2565 } 3016 }
2566 3017
2567 if (ch > CSI_7F) 3018 if (ch > CSI_7F)
2568 return; 3019 return;
… …
2726 tt_printf ("\033[0n"); 3177 tt_printf ("\033[0n");
2727 break; 3178 break;
2728 case 6: /* CPR requested */ 3179 case 6: /* CPR requested */
2729 scr_report_position (); 3180 scr_report_position ();
2730 break; 3181 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3182 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3184 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2734 break; 3185 break;
2735#endif
2736 case 8: /* unofficial extension */ 3186 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3188 break;
2739 } 3189 }
2740 break; 3190 break;
2741 3191
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3192 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2810#endif 3260#endif
2811 3261
2812 case CSI_78: /* DECREQTPARM */ 3262 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3263 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3264 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3265 break;
2816 3266
2817 default: 3267 default:
2818 break; 3268 break;
2819 } 3269 }
2820} 3270}
… …
2823#ifndef NO_FRILLS 3273#ifndef NO_FRILLS
2824/* ARGSUSED */ 3274/* ARGSUSED */
2825void 3275void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3276rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3277{
2828 int x, y; 3278 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3279 XWindowAttributes wattr;
2833 Window wdummy; 3280 Window wdummy;
2834 3281
2835 if (nargs == 0) 3282 if (nargs == 0)
2836 return; 3283 return;
3284
2837 switch (args[0]) 3285 switch (args[0])
2838 { 3286 {
2839 /* 3287 /*
2840 * commands 3288 * commands
2841 */ 3289 */
2842 case 1: /* deiconify window */ 3290 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3291 XMapWindow (display->display, TermWin.parent[0]);
2844 break; 3292 break;
2845 case 2: /* iconify window */ 3293 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3294 XIconifyWindow (display->display, TermWin.parent[0],
… …
2863 break; 3311 break;
2864 case 8: /* set size (chars) */ 3312 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3314 (unsigned int) (args[1] * TermWin.fheight));
2867 break; 3315 break;
3316
3317 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3318 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3319 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3320 set_widthheight ((unsigned int)TermWin.width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3321 (unsigned int) (args[1] * TermWin.fheight));
2872 break; 3322 break;
3323
3324
2873 /* 3325 /*
2874 * reports - some output format copied from XTerm 3326 * reports - some output format copied from XTerm
2875 */ 3327 */
2876 case 11: /* report window state */ 3328 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3331 break;
2880 case 13: /* report window position */ 3332 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3335 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3336 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3337 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3338 break;
2887 case 14: /* report window size (pixels) */ 3339 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3342 break;
2891 case 18: /* report window size (chars) */ 3343 case 18: /* report text area size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2893 break; 3345 break;
2894#if 0 /* XXX: currently disabled due to security concerns */ 3346 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3348 break;
2895 case 20: /* report icon label */ 3349 case 20: /* report icon label */
3350 {
3351 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3352 XGetIconName (display->display, TermWin.parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s);
3355 }
2898 break; 3356 break;
2899 case 21: /* report window title */ 3357 case 21: /* report window title */
3358 {
3359 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3360 XFetchName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s);
3363 }
2902 break; 3364 break;
2903#endif
2904
2905 } 3365 }
2906} 3366}
2907#endif 3367#endif
2908 3368
2909/*----------------------------------------------------------------------*/ 3369/*----------------------------------------------------------------------*/
2910/* 3370/*
2911 * get input up until STRING TERMINATOR (or BEL) 3371 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3372 * ends_how is terminator used. returned input must be free()'d
2913 */ 3373 */
2914unsigned char * 3374unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3375rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3376{
2917 int seen_esc = 0; /* seen escape? */ 3377 unicode_t prev = 0, ch;
2918 unsigned int n = 0; 3378 unsigned int n = 0;
2919 unsigned char *s; 3379 unsigned char *s;
2920 unsigned char ch, string[STRING_MAX]; 3380 unsigned char string[STRING_MAX];
2921 3381
2922 for (; (ch = cmd_getc ());) 3382 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3383 {
2924 if (ch == C0_BEL
2925 || ch == CHAR_ST
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2927 break;
2928 if (ch == C0_ESC) 3384 if (prev == C0_ESC)
2929 {
2930 seen_esc = 1;
2931 continue;
2932 } 3385 {
2933 else if (ch == '\t') 3386 if (ch == 0x5c) /* 7bit ST */
2934 ch = ' '; /* translate '\t' to space */ 3387 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3388 else
3389 return NULL;
3390 }
3391 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break;
3393 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3394 return NULL; /* other control character - exit */
3395
2937 if (n < sizeof (string) - 1) 3396 if (n >= sizeof (string) - 1)
3397 // stop at some sane length
3398 return NULL;
3399
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
2938 string[n++] = ch; 3406 string[n++] = prev = ch;
2939 seen_esc = 0;
2940 } 3407 }
3408
2941 string[n++] = '\0'; 3409 string[n++] = '\0';
3410
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2943 return NULL; 3412 return NULL;
3413
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3414 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3415 STRNCPY (s, string, n);
2946 return s; 3416 return s;
2947} 3417}
2948 3418
2949/*----------------------------------------------------------------------*/ 3419/*----------------------------------------------------------------------*/
… …
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3422 */
2953void 3423void
2954rxvt_term::process_dcs_seq () 3424rxvt_term::process_dcs_seq ()
2955{ 3425{
2956 unsigned char eh, *s; 3426 unsigned char *s;
3427 unicode_t eh;
3428
2957 /* 3429 /*
2958 * Not handled yet 3430 * Not handled yet
2959 */ 3431 */
2960 s = get_to_st (&eh); 3432 s = get_to_st (eh);
2961 if (s) 3433 if (s)
2962 free (s); 3434 free (s);
3435
2963 return; 3436 return;
2964} 3437}
2965 3438
2966/*----------------------------------------------------------------------*/ 3439/*----------------------------------------------------------------------*/
2967/* 3440/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3441 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3442 */
2970void 3443void
2971rxvt_term::process_osc_seq () 3444rxvt_term::process_osc_seq ()
2972{ 3445{
2973 unsigned char ch, eh, *s; 3446 unicode_t ch, eh;
2974 int arg; 3447 int arg;
2975 3448
2976 ch = cmd_getc (); 3449 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3450 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3451 arg = arg * 10 + (ch - '0');
2979 3452
2980 if (ch == ';') 3453 if (ch == ';')
2981 { 3454 {
2982 s = get_to_st (&eh); 3455 unsigned char *s = get_to_st (eh);
3456
2983 if (s) 3457 if (s)
2984 { 3458 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3459 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3460 free (s);
2998 } 3461 }
2999 } 3462 }
3000} 3463}
3464
3465void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{
3468 if (str[0] == '?' && !str[1])
3469 {
3470 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 }
3474 else
3475 set_window_color (color, str);
3476}
3477
3001/* 3478/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title 3480 * 0 = change iconName/title
3004 * 1 = change iconName 3481 * 1 = change iconName
3005 * 2 = change title 3482 * 2 = change title
3006 * 4 = change color 3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
3007 * 12 = change text color 3486 * 12 = change text color
3008 * 13 = change mouse foreground color 3487 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour 3488 * 17 = change highlight character colour
3010 * 18 = change bold character color 3489 * 18 = change bold character color
3011 * 19 = change underlined character color 3490 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented) 3491 * 46 = change logfile (not implemented)
3013 * 50 = change font 3492 * 50 = change font
3014 * 3493 *
3015 * rxvt extensions: 3494 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap 3495 * 20 = bg pixmap
3018 * 39 = change default fg color 3496 * 39 = change default fg color
3019 * 49 = change default bg color 3497 * 49 = change default bg color
3020 * 55 = dump scrollback buffer and all of screen 3498 * 55 = dump scrollback buffer and all of screen
3499 * 701 = change locale
3500 * 702 = find font
3501 * 703 = menu
3021 */ 3502 */
3022void 3503void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3024{ 3505{
3025 int changed = 0; 3506 int changed = 0;
3026 int color; 3507 int color;
3027 char *buf, *name; 3508 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1];
3028 3510
3029 assert (str != NULL); 3511 assert (str != NULL);
3030 switch (op) 3512 switch (op)
3031 { 3513 {
3032 case XTerm_name: 3514 case XTerm_name:
3033 set_title (str); 3515 set_title (str);
3034 /* FALLTHROUGH */ 3516 /* FALLTHROUGH */
3035 case XTerm_iconName: 3517 case XTerm_iconName:
3036 set_iconName (str); 3518 set_icon_name (str);
3037 break; 3519 break;
3038 case XTerm_title: 3520 case XTerm_title:
3039 set_title (str); 3521 set_title (str);
3040 break; 3522 break;
3523 case XTerm_property:
3524 if (str[0] == '?')
3525 {
3526 Atom prop = XInternAtom (display->display, str + 1, True);
3527 Atom actual_type;
3528 int actual_format;
3529 unsigned long nitems;
3530 unsigned long bytes_after;
3531 unsigned char *value = 0;
3532 const char *str = "";
3533
3534 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None
3540 && actual_format == 8)
3541 str = (const char *)(value);
3542
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3544
3545 XFree (value);
3546 }
3547 else
3548 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550
3551 if (eq)
3552 {
3553 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0],
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 }
3559 else
3560 XDeleteProperty (display->display, TermWin.parent[0],
3561 display->atom (str));
3562 }
3563 break;
3564
3041 case XTerm_Color: 3565 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3566 for (buf = (char *)str; buf && *buf;)
3043 { 3567 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3568 if ((name = STRCHR (buf, ';')) == NULL)
3045 break; 3569 break;
3570
3046 *name++ = '\0'; 3571 *name++ = '\0';
3047 color = atoi (buf); 3572 color = atoi (buf);
3573
3048 if (color < 0 || color >= TOTAL_COLORS) 3574 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3575 break;
3576
3050 if ((buf = STRCHR (name, ';')) != NULL) 3577 if ((buf = STRCHR (name, ';')) != NULL)
3051 *buf++ = '\0'; 3578 *buf++ = '\0';
3579
3580 if (name[0] == '?' && !name[1])
3581 {
3582 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 }
3586 else
3052 set_window_color (color + minCOLOR, name); 3587 set_window_color (color + minCOLOR, name);
3053 } 3588 }
3589 break;
3590 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3592 break;
3593 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3595 break;
3055#ifndef NO_CURSORCOLOR 3596#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3597 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3599 break;
3059#endif 3600#endif
3060 case XTerm_Color_pointer: 3601 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3603 break;
3604 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3606 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3607#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3608 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3610 break;
3067 case XTerm_Color_UL: 3611 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3613 break;
3070 case XTerm_Color_RV: 3614 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3616 break;
3073#endif 3617#endif
3074 3618
3075 case XTerm_Menu:
3076 /*
3077 * rxvt_menubar_dispatch () violates the constness of the string,
3078 * so DON'T do it here
3079 */
3080 break;
3081 case XTerm_Pixmap: 3619 case XTerm_Pixmap:
3082 if (*str != ';') 3620 if (*str != ';')
3083 { 3621 {
3084#if XPM_BACKGROUND 3622#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3623 scale_pixmap (""); /* reset to default scaling */
… …
3108 set_window_color (Color_fg, str); 3646 set_window_color (Color_fg, str);
3109 break; 3647 break;
3110 case XTerm_restoreBG: 3648 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3649 set_window_color (Color_bg, str);
3112 break; 3650 break;
3651
3113 case XTerm_logfile: 3652 case XTerm_logfile:
3653 // TODO, when secure mode?
3114 break; 3654 break;
3655
3115 case XTerm_font: 3656 case XTerm_font:
3657 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3660 ? TermWin.fontset->fontdesc : "",
3661 resp);
3662 else
3116 change_font (0, str); 3663 change_font (str);
3664 break;
3665
3666#ifndef NO_FRILLS
3667 case XTerm_locale:
3668 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3670 else
3671 {
3672 set_locale (str);
3673# ifdef USE_XIM
3674 im_cb ();
3675# endif
3676 }
3677 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif
3689
3690#ifdef MENUBAR
3691 case XTerm_Menu:
3692 if (Options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3117 break; 3694 break;
3695#endif
3118#if 0 3696#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3697 case XTerm_dumpscreen: /* no error notices */
3120 { 3698 {
3121 int fd; 3699 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3701 {
3124 scr_dump (fd); 3702 scr_dump (fd);
3125 close (fd); 3703 close (fd);
3126 } 3704 }
3127 } 3705 }
3128 break; 3706 break;
3129#endif 3707#endif
3130
3131 } 3708 }
3132} 3709}
3133/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3134 3711
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3712/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3720 * so no need for fancy checking
3144 */ 3721 */
3145int 3722int
3146rxvt_term::privcases (int mode, unsigned long bit) 3723rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3724{
3148 int state; 3725 int state;
3149 3726
3150 if (mode == 's') 3727 if (mode == 's')
3151 { 3728 {
3152 SavedModes |= (PrivateModes & bit); 3729 SavedModes |= (PrivateModes & bit);
3153 return -1; 3730 return -1;
… …
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3736 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3161 PrivMode (state, bit); 3738 PrivMode (state, bit);
3162 } 3739 }
3740
3163 return state; 3741 return state;
3164} 3742}
3165 3743
3166/* we're not using priv _yet_ */ 3744/* we're not using priv _yet_ */
3167void 3745void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 3747{
3170 unsigned int i, j; 3748 unsigned int i, j;
3171 int state; 3749 int state;
3750
3172 static const struct 3751 static const struct
3173 { 3752 {
3174 const int argval; 3753 const int argval;
3175 const unsigned long bit; 3754 const unsigned long bit;
3176 } 3755 }
3756
3177 argtopriv[] = { 3757 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3758 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3759 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3760 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3761 { 4, PrivMode_smoothScroll },
… …
3187 { menuBar_esc, PrivMode_menuBar }, 3767 { menuBar_esc, PrivMode_menuBar },
3188#endif 3768#endif
3189#ifdef scrollBar_esc 3769#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3770 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3771#endif
3772 // 18, 19 printing-related
3192 { 25, PrivMode_VisibleCursor }, 3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3193 { 35, PrivMode_ShiftKeys }, 3775 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3776 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI
3779 // 46 start logging
3195 { 47, PrivMode_Screen }, 3780 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3781 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3782#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3783 { 67, PrivMode_BackSpace },
3199#endif 3784#endif
3200 { 1000, PrivMode_MouseX11 }, 3785 { 1000, PrivMode_MouseX11 },
3786 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3787 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3788 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 3789 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 3790 { 1011, PrivMode_Keypress }, // rxvt extension
3791 // 1035 enable modifiers for alt, numlock NYI
3792 // 1036 send ESC for meta keys NYI
3793 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 3794 { 1047, PrivMode_Screen },
3795 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3796 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3797 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 3798 };
3206 3799
3207 if (nargs == 0) 3800 if (nargs == 0)
3208 return; 3801 return;
3209 3802
… …
3224 state = privcases (mode, argtopriv[j].bit); 3817 state = privcases (mode, argtopriv[j].bit);
3225 break; 3818 break;
3226 } 3819 }
3227 3820
3228 /* extra handling for values with state unkept */ 3821 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3822 switch (arg[i])
3231 { 3823 {
3232 case 1048: /* alternative cursor save */ 3824 case 1048: /* alternative cursor save */
3825 if (Options & Opt_secondaryScreen)
3233 if (mode == 0) 3826 if (mode == 0)
3234 scr_cursor (RESTORE); 3827 scr_cursor (RESTORE);
3235 else if (mode == 1) 3828 else if (mode == 1)
3236 scr_cursor (SAVE); 3829 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 3830 break;
3831 }
3832
3833 if (state >= 0)
3834 /* extra handling for values with valid 0 or 1 state */
3835 switch (arg[i])
3836 {
3837 /* case 1: - application cursor keys */
3838 case 2: /* VT52 mode */
3839 /* oddball mode. should be set regardless of set/reset
3840 * parameter. Return from VT52 mode with an ESC < from
3841 * within VT52 mode
3842 */
3843 PrivMode (1, PrivMode_vt52);
3844 break;
3253 case 3: /* 80/132 */ 3845 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 3846 if (PrivateModes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3256 (unsigned int)TermWin.height);
3257 break; 3848 break;
3258 case 4: /* smooth scrolling */ 3849 case 4: /* smooth scrolling */
3259 if (state) 3850 if (state)
3260 Options &= ~Opt_jumpScroll; 3851 Options &= ~Opt_jumpScroll;
3261 else 3852 else
3262 Options |= Opt_jumpScroll; 3853 Options |= Opt_jumpScroll;
3263 break; 3854 break;
3264 case 5: /* reverse video */ 3855 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 3856 scr_rvideo_mode (state);
3266 break; 3857 break;
3267 case 6: /* relative/absolute origins */ 3858 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 3859 scr_relative_origin (state);
3269 break; 3860 break;
3270 case 7: /* autowrap */ 3861 case 7: /* autowrap */
3271 scr_autowrap (state); 3862 scr_autowrap (state);
3272 break; 3863 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 3864 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 3865 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 3867 PrivateModes &= ~PrivMode_MouseX11;
3277 break; 3868 break;
3278#ifdef menuBar_esc 3869#ifdef menuBar_esc
3279 case menuBar_esc: 3870 case menuBar_esc:
3280#ifdef MENUBAR 3871#ifdef MENUBAR
3281 map_menuBar (state); 3872 map_menuBar (state);
3282#endif 3873#endif
3283 break; 3874 break;
3284#endif 3875#endif
3285#ifdef scrollBar_esc 3876#ifdef scrollBar_esc
3286 case scrollBar_esc: 3877 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 3878 if (scrollbar_mapping (state))
3288 { 3879 {
3289 resize_all_windows (0, 0, 0); 3880 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 3881 scr_touch (true);
3291 } 3882 }
3292 break; 3883 break;
3293#endif 3884#endif
3294 case 25: /* visible/invisible cursor */ 3885 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 3886 scr_cursor_visible (state);
3296 break; 3887 break;
3297 /* case 35: - shift keys */ 3888 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 3889 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 3890 case 47: /* secondary screen */
3300 scr_change_screen (state); 3891 scr_change_screen (state);
3301 break; 3892 break;
3302 /* case 66: - application key pad */ 3893 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 3894 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 3895 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 3896 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 3897 PrivateModes &= ~PrivMode_MouseX10;
3307 break; 3898 break;
3308#if 0 3899#if 0
3309 case 1001: 3900 case 1001:
3310 break; /* X11 mouse highlighting */ 3901 break; /* X11 mouse highlighting */
3311#endif 3902#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 3903 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 3904 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 3905 Options &= ~Opt_scrollTtyOutput;
3315 else 3906 else
3316 Options |= Opt_scrollTtyOutput; 3907 Options |= Opt_scrollTtyOutput;
3317 break; 3908 break;
3318 case 1011: /* scroll to bottom on key press */ 3909 case 1011: /* scroll to bottom on key press */
3319 if (state) 3910 if (state)
3320 Options |= Opt_scrollTtyKeypress; 3911 Options |= Opt_scrollTtyKeypress;
3321 else 3912 else
3322 Options &= ~Opt_scrollTtyKeypress; 3913 Options &= ~Opt_scrollTtyKeypress;
3323 break; 3914 break;
3324 case 1047: /* secondary screen w/ clearing */ 3915 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3916 if (Options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 3917 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 3918 scr_erase_screen (2);
3328 scr_change_screen (state); 3919 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 3920 break;
3921 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY)
3925 scr_erase_screen (2);
3926 break;
3927 default:
3928 break;
3332 } 3929 }
3333 } 3930 }
3334} 3931}
3335/*}}} */ 3932/*}}} */
3336 3933
3337/*{{{ process sgr sequences */ 3934/*{{{ process sgr sequences */
3338void 3935void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3936rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 3937{
3341 unsigned int i; 3938 unsigned int i;
3342 short rendset; 3939 short rendset;
3343 int rendstyle; 3940 int rendstyle;
3344 3941
3345 if (nargs == 0) 3942 if (nargs == 0)
3346 { 3943 {
3347 scr_rendition (0, ~RS_None); 3944 scr_rendition (0, ~RS_None);
3348 return; 3945 return;
3349 } 3946 }
3947
3350 for (i = 0; i < nargs; i++) 3948 for (i = 0; i < nargs; i++)
3351 { 3949 {
3352 rendset = -1; 3950 rendset = -1;
3353 switch (arg[i]) 3951 switch (arg[i])
3354 { 3952 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 3954 rendset = 0, rendstyle = ~RS_None;
3357 break; 3955 break;
3358 case 1: 3956 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 3957 rendset = 1, rendstyle = RS_Bold;
3360 break; 3958 break;
3959 //case 2: // faint or second colour
3361 case 4: 3960 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 3961 rendset = 1, rendstyle = RS_Uline;
3363 break; 3962 break;
3364 case 5: 3963 case 5: // slowly blinking
3964 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 3965 rendset = 1, rendstyle = RS_Blink;
3366 break; 3966 break;
3967 //case 6: // scoansi light background
3367 case 7: 3968 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 3969 rendset = 1, rendstyle = RS_RVid;
3970 break;
3971 case 8:
3972 // invisible. NYI
3973 break;
3974 //case 9: // crossed out
3975 //case 10: // scoansi acs off, primary font
3976 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font
3978 //...
3979 //case 19: // ninth alt font
3980 //case 20: // gothic
3981 case 21: // disable bold, faint
3982 rendset = 0, rendstyle = RS_Bold;
3369 break; 3983 break;
3370 case 22: 3984 case 22:
3371 rendset = 0, rendstyle = RS_Bold; 3985 rendset = 0, rendstyle = RS_Bold;
3372 break; 3986 break;
3987 //case 23: disable italic
3373 case 24: 3988 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 3989 rendset = 0, rendstyle = RS_Uline;
3375 break; 3990 break;
3376 case 25: 3991 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 3992 rendset = 0, rendstyle = RS_Blink;
3378 break; 3993 break;
3379 case 27: 3994 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 3995 rendset = 0, rendstyle = RS_RVid;
3381 break; 3996 break;
3997 //case 28: // visible. NYI
3998 //case 29: // not crossed-out
3382 } 3999 }
4000
3383 if (rendset != -1) 4001 if (rendset != -1)
3384 { 4002 {
3385 scr_rendition (rendset, rendstyle); 4003 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4004 continue; /* for (;i;) */
3387 } 4005 }
… …
3394 case 33: 4012 case 33:
3395 case 34: 4013 case 34:
3396 case 35: 4014 case 35:
3397 case 36: 4015 case 36:
3398 case 37: 4016 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4018 break;
3402#ifdef TTY_256COLOR 4019#ifdef TTY_256COLOR
3403 case 38: 4020 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4021 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4022 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4024 i += 2;
3409 } 4025 }
3410 break; 4026 break;
3411#endif 4027#endif
3412 case 39: /* default fg */ 4028 case 39: /* default fg */
… …
3419 case 43: 4035 case 43:
3420 case 44: 4036 case 44:
3421 case 45: 4037 case 45:
3422 case 46: 4038 case 46:
3423 case 47: 4039 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4041 break;
3427#ifdef TTY_256COLOR 4042#ifdef TTY_256COLOR
3428 case 48: 4043 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4044 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4045 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4047 i += 2;
3434 } 4048 }
3435 break; 4049 break;
3436#endif 4050#endif
3437 case 49: /* default bg */ 4051 case 49: /* default bg */
… …
3466 } 4080 }
3467 } 4081 }
3468} 4082}
3469/*}}} */ 4083/*}}} */
3470 4084
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4085/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4086void
3473rxvt_term::process_graphics () 4087rxvt_term::process_graphics ()
3474{ 4088{
3475 unsigned char ch, cmd = cmd_getc (); 4089 unicode_t ch, cmd = cmd_getc ();
3476 4090
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4091 if (cmd == 'Q')
3479 { /* query graphics */ 4092 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4093 tt_printf ("\033G0\n"); /* no graphics */
3481 return; 4094 return;
3482 } 4095 }
3483 /* swallow other graphics sequences until terminating ':' */ 4096 /* swallow other graphics sequences until terminating ':' */
3484 do 4097 do
3485 ch = cmd_getc (); 4098 ch = cmd_getc ();
3486 while (ch != ':'); 4099 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 4100}
3533/*}}} */ 4101/*}}} */
3534 4102
3535/* ------------------------------------------------------------------------- */ 4103/* ------------------------------------------------------------------------- */
3536 4104

Diff Legend

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