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.59 by pcg, Wed Feb 25 15:39:48 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
… …
140 valid_keysym = keysym != NoSymbol; 254 valid_keysym = keysym != NoSymbol;
141 } 255 }
142 256
143 if (valid_keysym) 257 if (valid_keysym)
144 { 258 {
145 /* for some backwards compatibility */
146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
147# ifdef HOTKEY_CTRL
148 if (ctrl)
149# else
150 if (meta)
151# endif
152 {
153 if (keysym == ks_bigfont)
154 {
155 change_font (FONT_UP);
156 return;
157 }
158 else if (keysym == ks_smallfont)
159 {
160 change_font (FONT_DN);
161 return;
162 }
163 }
164#endif
165
166 if (TermWin.saveLines) 259 if (TermWin.saveLines)
167 { 260 {
168#ifdef UNSHIFTED_SCROLLKEYS 261#ifdef UNSHIFTED_SCROLLKEYS
169 if (!ctrl && !meta) 262 if (!ctrl && !meta)
170 {
171#else 263#else
172 if (IS_SCROLL_MOD) 264 if (IS_SCROLL_MOD)
265#endif
173 { 266 {
174#endif
175 int lnsppg; 267 int lnsppg;
176 268
177#ifdef PAGING_CONTEXT_LINES 269#ifdef PAGING_CONTEXT_LINES
178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
179#else 271#else
… …
236 { 328 {
237 /* normal XTerm key bindings */ 329 /* normal XTerm key bindings */
238 case XK_Insert: /* Shift+Insert = paste mouse selection */ 330 case XK_Insert: /* Shift+Insert = paste mouse selection */
239 selection_request (ev.time, 0, 0); 331 selection_request (ev.time, 0, 0);
240 return; 332 return;
333#if TODO // TODO
241 /* rxvt extras */ 334 /* rxvt extras */
242 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 335 case XK_KP_Add: /* Shift+KP_Add = bigger font */
243 change_font (FONT_UP); 336 change_font (FONT_UP);
244 return; 337 return;
245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
246 change_font (FONT_DN); 339 change_font (FONT_DN);
247 return; 340 return;
341#endif
248 } 342 }
249 } 343 }
250 } 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
251#ifdef PRINTPIPE 371#ifdef PRINTPIPE
252 if (keysym == XK_Print) 372 if (keysym == XK_Print)
253 { 373 {
254 scr_printscreen (ctrl | shft); 374 scr_printscreen (ctrl | shft);
255 return; 375 return;
… …
261#ifdef KEYSYM_RESOURCE 381#ifdef KEYSYM_RESOURCE
262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
263 { 383 {
264 unsigned int l; 384 unsigned int l;
265 const unsigned char *kbuf0; 385 const unsigned char *kbuf0;
266 const unsigned char ch = C0_ESC;
267 386
268 kbuf0 = (Keysym_map[keysym & 0xFF]); 387 kbuf0 = (Keysym_map[keysym & 0xFF]);
269 l = (unsigned int)*kbuf0++; 388 l = (unsigned int)*kbuf0++;
270 389
271 /* escape prefix */ 390 /* escape prefix */
272 if (meta) 391 if (meta
273# ifdef META8_OPTION 392# ifdef META8_OPTION
274 if (meta_char == C0_ESC) 393 && meta_char == C0_ESC
275# endif 394# endif
395 )
396 {
397 const unsigned char ch = C0_ESC;
276 tt_write (&ch, 1); 398 tt_write (&ch, 1);
399 }
400
277 tt_write (kbuf0, l); 401 tt_write (kbuf0, l);
278 return; 402 return;
279 } 403 }
280 else 404 else
281#endif 405#endif
… …
291 ^ !!ctrl) ? '\b' : '\177'; 415 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 416 kbuf[1] = '\0';
293 } 417 }
294 else 418 else
295 STRCPY (kbuf, key_backspace); 419 STRCPY (kbuf, key_backspace);
296# ifdef MULTICHAR_SET
297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
298 {
299 int col, row;
300
301 newlen = STRLEN (kbuf);
302 col = screen.cur.col - 1;
303 row = screen.cur.row + TermWin.saveLines;
304 if (IS_MULTI2 (screen.rend[row][col]))
305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
306 }
307# endif
308 break; 420 break;
309#endif 421#endif
310#ifndef NO_DELETE_KEY 422#ifndef NO_DELETE_KEY
311 case XK_Delete: 423 case XK_Delete:
312 STRCPY (kbuf, key_delete); 424 STRCPY (kbuf, key_delete);
313# ifdef MULTICHAR_SET
314 if (Options & Opt_mc_hack)
315 {
316 int col, row;
317
318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
323 }
324# endif
325 break; 425 break;
326#endif 426#endif
327 case XK_Tab: 427 case XK_Tab:
328 if (shft) 428 if (shft)
329 STRCPY (kbuf, "\033[Z"); 429 STRCPY (kbuf, "\033[Z");
… …
340 newlen = 0; 440 newlen = 0;
341 } 441 }
342 break; 442 break;
343 443
344#ifdef XK_KP_Left 444#ifdef XK_KP_Left
345 case XK_KP_Up: /* \033Ox or standard */ 445 case XK_KP_Up: /* \033Ox or standard */
346 case XK_KP_Down: /* \033Or or standard */ 446 case XK_KP_Down: /* \033Or or standard */
347 case XK_KP_Right: /* \033Ov or standard */ 447 case XK_KP_Right: /* \033Ov or standard */
348 case XK_KP_Left: /* \033Ot or standard */ 448 case XK_KP_Left: /* \033Ot or standard */
349 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
350 { 450 {
… …
371 kbuf[1] = 'O'; 471 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left]; 472 kbuf[2] = "dacb"[keysym - XK_Left];
373 } 473 }
374 else if (PrivateModes & PrivMode_aplCUR) 474 else if (PrivateModes & PrivMode_aplCUR)
375 kbuf[1] = 'O'; 475 kbuf[1] = 'O';
376#ifdef MULTICHAR_SET
377 //TODO: ??
378 if (Options & Opt_mc_hack)
379 {
380 int col, row, m;
381
382 col = screen.cur.col;
383 row = screen.cur.row + TermWin.saveLines;
384 m = 0;
385 if (keysym == XK_Right
386 && IS_MULTI1 (screen.rend[row][col]))
387 m = 1;
388 else if (keysym == XK_Left)
389 {
390 if (col > 0)
391 {
392 if (IS_MULTI2 (screen.rend[row][col - 1]))
393 m = 1;
394 }
395 else if (screen.cur.row > 0)
396 {
397 col = screen.tlen[--row];
398 if (col == -1)
399 col = TermWin.ncol - 1;
400 else
401 col--;
402 if (col > 0
403 && IS_MULTI2 (screen.rend[row][col]))
404 m = 1;
405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
410#endif
411 break; 476 break;
412 477
413#ifndef UNSHIFTED_SCROLLKEYS 478#ifndef UNSHIFTED_SCROLLKEYS
414# ifdef XK_KP_Prior 479# ifdef XK_KP_Prior
415 case XK_KP_Prior: 480 case XK_KP_Prior:
… …
604 break; 669 break;
605 } 670 }
606 if (newlen) 671 if (newlen)
607 len = STRLEN (kbuf); 672 len = STRLEN (kbuf);
608 } 673 }
674
609 /* 675 /*
610 * Pass meta for all function keys, if 'meta' option set 676 * Pass meta for all function keys, if 'meta' option set
611 */ 677 */
612#ifdef META8_OPTION 678#ifdef META8_OPTION
613 if (meta && (meta_char == 0x80) && len > 0) 679 if (meta && (meta_char == 0x80) && len > 0)
… …
628 { 694 {
629 unsigned char *ch; 695 unsigned char *ch;
630 696
631 for (ch = kbuf; ch < kbuf + len; ch++) 697 for (ch = kbuf; ch < kbuf + len; ch++)
632 *ch |= 0x80; 698 *ch |= 0x80;
699
633 meta = 0; 700 meta = 0;
634 } 701 }
635#endif 702#endif
636 /* nil */ ; 703 /* nil */ ;
637 } 704 }
… …
690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
691/* attempt to `write' count to the input buffer */ 758/* attempt to `write' count to the input buffer */
692unsigned int 759unsigned int
693rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 760rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
694{ 761{
695 unsigned int n, s; 762 unsigned int n, s;
696 763
697 n = cmdbuf_ptr - cmdbuf_base; 764 n = cmdbuf_ptr - cmdbuf_base;
698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
699 766
700 if (n > 0 && s < count) 767 if (n > 0 && s < count)
701 { 768 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 769 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
… …
706 s += n; 773 s += n;
707 } 774 }
708 775
709 if (count > s) 776 if (count > s)
710 { 777 {
711 rxvt_print_error ("data loss: cmd_write too large"); 778 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 779 count = s;
713 } 780 }
714 781
715 for (; count--;) 782 for (; count--;)
716 *cmdbuf_endp++ = *str++; 783 *cmdbuf_endp++ = *str++;
… …
728 if (want_full_refresh) 795 if (want_full_refresh)
729 { 796 {
730 want_full_refresh = 0; 797 want_full_refresh = 0;
731 scr_clear (); 798 scr_clear ();
732 scr_touch (false); 799 scr_touch (false);
733 want_refresh = 1;
734 } 800 }
735#endif 801#endif
736 802
737 if (want_refresh) 803 if (want_refresh)
738 { 804 {
739 scr_refresh (refresh_type); 805 scr_refresh (refresh_type);
740 scrollbar_show (1); 806 scrollbar_show (1);
741#ifdef USE_XIM 807#ifdef USE_XIM
742 IMSendSpot (); 808 IMSendSpot ();
743#endif 809#endif
744
745 } 810 }
746 811
747 display->flush (); 812 display->flush ();
813
814 flush_ev.stop ();
748} 815}
749 816
750void 817void
751rxvt_term::check_cb (check_watcher &w) 818rxvt_term::check_cb (check_watcher &w)
752{ 819{
753 SET_R (this); 820 SET_R (this);
754 SET_LOCALE (locale); 821 SET_LOCALE (locale);
755 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;
756 flush (); 837 flush ();
757} 838}
758 839
759#ifdef CURSOR_BLINK 840#ifdef CURSOR_BLINK
760void 841void
… …
778 w.start (w.at + TEXT_BLINK_INTERVAL); 859 w.start (w.at + TEXT_BLINK_INTERVAL);
779 } 860 }
780} 861}
781#endif 862#endif
782 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
783bool 907bool
784rxvt_term::pty_fill () 908rxvt_term::pty_fill ()
785{ 909{
786 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 }
787 917
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 918 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 919 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 920 cmdbuf_endp = cmdbuf_ptr + n;
791 921
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
793 923
794 if (n > 0) 924 if (n > 0)
795 { 925 {
796 cmdbuf_endp += n; 926 cmdbuf_endp += n;
797 return true; 927 return true;
… …
809 SET_LOCALE (locale); 939 SET_LOCALE (locale);
810 940
811 if (revents & EVENT_WRITE) 941 if (revents & EVENT_WRITE)
812 tt_write (0, 0); 942 tt_write (0, 0);
813 else if (revents & EVENT_READ) 943 else if (revents & EVENT_READ)
814 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us 944 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ()) 945 while (pty_fill ())
820 {
821 if (!seen_input)
822 {
823 seen_input = 1;
824 /* once we know the shell is running, send the screen size. Again! */
825 tt_winch ();
826 }
827
828 if (cmd_parse ()) 946 if (cmd_parse ())
829 break; 947 break;
830 }
831 }
832} 948}
833 949
834bool
835rxvt_term::cmd_parse ()
836{
837 bool flag = false;
838 uint32_t ch = NOCHAR;
839
840 for (;;)
841 {
842 if (ch == NOCHAR)
843 ch = next_char ();
844
845 if (ch == NOCHAR) // TODO: improve
846 break;
847
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938}
939
940// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future
942uint32_t
943rxvt_term::next_char ()
944{
945 while (cmdbuf_ptr < cmdbuf_endp)
946 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949
950 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952
953 if (len == (size_t)-2)
954 return NOCHAR;
955
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 }
987}
988
989#ifdef POINTER_BLANK
990void 950void
991rxvt_term::pointer_unblank () 951rxvt_term::pointer_unblank ()
992{ 952{
993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
994 recolour_cursor (); 954 recolour_cursor ();
995 955
956#ifdef POINTER_BLANK
996 hidden_pointer = 0; 957 hidden_pointer = 0;
997 958
998 if (Options & Opt_pointerBlank) 959 if (Options & Opt_pointerBlank)
999 pointer_ev.start (NOW + pointerBlankDelay); 960 pointer_ev.start (NOW + pointerBlankDelay);
961#endif
1000} 962}
1001 963
964#ifdef POINTER_BLANK
1002void 965void
1003rxvt_term::pointer_blank () 966rxvt_term::pointer_blank ()
1004{ 967{
1005 if (! (Options & Opt_pointerBlank)) 968 if (! (Options & Opt_pointerBlank))
1006 return; 969 return;
… …
1196#endif 1159#endif
1197 1160
1198 switch (ev.type) 1161 switch (ev.type)
1199 { 1162 {
1200 case KeyPress: 1163 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT))
1201 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 ();
1202 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
1203 1213
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease:
1206 {
1207 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)
1208 mouse_slip_wheel_speed = 0; 1218 mouse_slip_wheel_speed = 0;
1209 else 1219#endif
1210 {
1211 KeySym ks;
1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break; 1220 break;
1218 } 1221 }
1219#endif
1220 1222
1221 case ButtonPress: 1223 case ButtonPress:
1222 button_press (ev.xbutton); 1224 button_press (ev.xbutton);
1223 break; 1225 break;
1224 1226
… …
1236 && (ev.xclient.data.l[0] == DndFile 1238 && (ev.xclient.data.l[0] == DndFile
1237 || ev.xclient.data.l[0] == DndDir 1239 || ev.xclient.data.l[0] == DndDir
1238 || ev.xclient.data.l[0] == DndLink)) 1240 || ev.xclient.data.l[0] == DndLink))
1239 { 1241 {
1240 /* Get Dnd data */ 1242 /* Get Dnd data */
1241 Atom ActualType; 1243 Atom ActualType;
1242 int ActualFormat; 1244 int ActualFormat;
1243 unsigned char *data; 1245 unsigned char *data;
1244 unsigned long Size, RemainingBytes; 1246 unsigned long Size, RemainingBytes;
1245 1247
1246 XGetWindowProperty (display->display, display->root, 1248 XGetWindowProperty (display->display, display->root,
1247 xa[XA_DNDSELECTION], 1249 xa[XA_DNDSELECTION],
1248 0L, 1000000L, 1250 0L, 1000000L,
1249 False, AnyPropertyType, 1251 False, AnyPropertyType,
… …
1252 &data); 1254 &data);
1253 XChangeProperty (display->display, display->root, 1255 XChangeProperty (display->display, display->root,
1254 XA_CUT_BUFFER0, XA_STRING, 1256 XA_CUT_BUFFER0, XA_STRING,
1255 8, PropModeReplace, 1257 8, PropModeReplace,
1256 data, STRLEN (data)); 1258 data, STRLEN (data));
1259 XFree (data);
1257 selection_paste (display->root, XA_CUT_BUFFER0, True); 1260 selection_paste (display->root, XA_CUT_BUFFER0, True);
1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1259 } 1262 }
1260#endif /* OFFIX_DND */ 1263#endif /* OFFIX_DND */
1261 break; 1264 break;
1262 1265
1263 case MappingNotify: 1266 case MappingNotify:
1264 XRefreshKeyboardMapping (& (ev.xmapping)); 1267 XRefreshKeyboardMapping (&ev.xmapping);
1265 break; 1268 break;
1266 1269
1267 /* 1270 /*
1268 * XXX: this is not the _current_ arrangement 1271 * XXX: this is not the _current_ arrangement
1269 * Here's my conclusion: 1272 * Here's my conclusion:
… …
1300#endif 1303#endif
1301#ifdef CURSOR_BLINK 1304#ifdef CURSOR_BLINK
1302 if (Options & Opt_cursorBlink) 1305 if (Options & Opt_cursorBlink)
1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1304#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
1305 1317
1306 } 1318 }
1307 break; 1319 break;
1308 1320
1309 case FocusOut: 1321 case FocusOut:
… …
1318#ifdef CURSOR_BLINK 1330#ifdef CURSOR_BLINK
1319 if (Options & Opt_cursorBlink) 1331 if (Options & Opt_cursorBlink)
1320 cursor_blink_ev.stop (); 1332 cursor_blink_ev.stop ();
1321 hidden_cursor = 0; 1333 hidden_cursor = 0;
1322#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
1323 1344
1324 } 1345 }
1325 break; 1346 break;
1326 1347
1327 case ConfigureNotify: 1348 case ConfigureNotify:
… …
1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 } 1358 }
1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1339 1360
1340 if (szHint.width != width || szHint.height != height) 1361 if (szHint.width != width || szHint.height != height)
1341 {
1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1343 resize_all_windows (width, height, 1); 1362 resize_all_windows (width, height, 1);
1344 } 1363
1345#ifdef DEBUG_SIZE
1346 else
1347 {
1348 D_SIZE ((stderr, "Size: Not resizing"));
1349 }
1350#endif
1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1352 if (Options & Opt_transparent) 1365 if (Options & Opt_transparent)
1353 { 1366 {
1354 check_our_parents (); 1367 check_our_parents ();
1355 if (am_transparent) 1368 if (am_transparent)
1356 want_full_refresh = 1; 1369 want_refresh = want_full_refresh = 1;
1357 } 1370 }
1358#endif 1371#endif
1359
1360 } 1372 }
1361 break; 1373 break;
1362 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
1363 case SelectionClear: 1382 case SelectionClear:
1364 display->set_selection_owner (0); 1383 selection_clear ();
1365 break; 1384 break;
1366 1385
1367 case SelectionNotify: 1386 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1387 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1388 selection_paste (ev.xselection.requestor,
… …
1396 1415
1397 case GraphicsExpose: 1416 case GraphicsExpose:
1398 case Expose: 1417 case Expose:
1399 if (ev.xany.window == TermWin.vt) 1418 if (ev.xany.window == TermWin.vt)
1400 { 1419 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1420 do
1402 scr_expose (ev.xexpose.x, ev.xexpose.y, 1421 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev.xexpose.width, ev.xexpose.height, False); 1422 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1405 // 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))
1406 scr_expose (ev.xexpose.x, ev.xexpose.y, 1428 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev.xexpose.width, ev.xexpose.height, False); 1429 ev.xexpose.width, ev.xexpose.height, False);
1408 //scr_expose (ev.xexpose.x, 0, 1430
1409 // ev.xexpose.width, TermWin.height, False); 1431 scr_refresh (refresh_type);
1410#endif
1411 want_refresh = 1;
1412 } 1432 }
1413 else 1433 else
1414 { 1434 {
1415 XEvent unused_event; 1435 XEvent unused_event;
1416 1436
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1418 Expose, 1438 ;
1419 &unused_event)) ;
1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1421 GraphicsExpose, 1440 ;
1422 &unused_event)) ; 1441
1423 if (isScrollbarWindow (ev.xany.window)) 1442 if (isScrollbarWindow (ev.xany.window))
1424 { 1443 {
1425 scrollBar.setIdle (); 1444 scrollBar.setIdle ();
1426 scrollbar_show (0); 1445 scrollbar_show (0);
1427 } 1446 }
1428#ifdef MENUBAR 1447#ifdef MENUBAR
1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1430 menubar_expose (); 1449 menubar_expose ();
1450#endif
1451
1452#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0])
1454 XClearWindow (display->display, ev.xany.window);
1431#endif 1455#endif
1432 } 1456 }
1433 break; 1457 break;
1434 1458
1435 case MotionNotify: 1459 case MotionNotify:
… …
1470 if (ev.xbutton.y < TermWin.int_bwidth 1494 if (ev.xbutton.y < TermWin.int_bwidth
1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1472 { 1496 {
1473 int dist; 1497 int dist;
1474 1498
1475 pending_scroll_selection=1;
1476
1477 /* don't clobber the current delay if we are 1499 /* don't clobber the current delay if we are
1478 * already in the middle of scrolling. 1500 * already in the middle of scrolling.
1479 */ 1501 */
1480 if (scroll_selection_delay<=0) 1502 if (!sel_scroll_ev.active)
1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1482 1504
1483 /* save the event params so we can highlight 1505 /* save the event params so we can highlight
1484 * the selection in the pending-scroll loop 1506 * the selection in the pending-scroll loop
1485 */ 1507 */
1486 selection_save_x=ev.xbutton.x; 1508 selection_save_x=ev.xbutton.x;
… …
1508 else 1530 else
1509 { 1531 {
1510 /* we are within the text window, so we 1532 /* we are within the text window, so we
1511 * shouldn't be scrolling 1533 * shouldn't be scrolling
1512 */ 1534 */
1513 pending_scroll_selection = 0; 1535 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop();
1514 } 1537 }
1515#endif 1538#endif
1516#ifdef MOUSE_THRESHOLD 1539#ifdef MOUSE_THRESHOLD
1517 1540
1518 } 1541 }
… …
1537 } 1560 }
1538 break; 1561 break;
1539 } 1562 }
1540} 1563}
1541 1564
1565#if TRANSPARENT
1542void 1566void
1543rxvt_term::rootwin_cb (XEvent &ev) 1567rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1568{
1545 SET_R (this); 1569 SET_R (this);
1546 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1547 1571
1548 switch (ev.type) 1572 switch (ev.type)
1549 { 1573 {
1550 case PropertyNotify: 1574 case PropertyNotify:
1551 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1552 {
1553 if (ev.xproperty.state == PropertyNewValue)
1554 selection_property (ev.xproperty.window, ev.xproperty.atom);
1555 break;
1556 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /* 1575 /*
1561 * 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,
1562 * 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.
1563 */ 1578 */
1564 if (xa[XA_XROOTPMAPID] == 0) 1579 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566 1581
1567 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1568 return; 1583 return;
1569 }
1570 1584
1571 /* FALLTHROUGH */ 1585 /* FALLTHROUGH */
1572 case ReparentNotify: 1586 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1588 want_refresh = want_full_refresh = 1;
1576 break; 1589 break;
1577#endif
1578 } 1590 }
1579} 1591}
1592#endif
1580 1593
1581void 1594void
1582rxvt_term::button_press (XButtonEvent &ev) 1595rxvt_term::button_press (XButtonEvent &ev)
1583{ 1596{
1584 int reportmode = 0, clickintime; 1597 int reportmode = 0, clickintime;
… …
1736 upordown = 1; /* down */ 1749 upordown = 1; /* down */
1737 } 1750 }
1738 if (upordown) 1751 if (upordown)
1739 { 1752 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1754 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1742#endif 1755#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 1756 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 1757 {
1745 if (upordown < 0) 1758 if (upordown < 0)
1746 scrollBar.setUp (); 1759 scrollBar.setUp ();
… …
1762 break; 1775 break;
1763 case R_SB_ALIGN_BOTTOM: 1776 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 1777 csrO = scrollBar.bot - scrollBar.top;
1765 break; 1778 break;
1766 } 1779 }
1780
1767 if (scrollBar.style == R_SB_XTERM 1781 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 1782 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 1783 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 1784 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 1785
1772 scrollBar.setMotion (); 1786 scrollBar.setMotion ();
1773 break; 1787 break;
1774 1788
1775 case Button1: 1789 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1790 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1800 scr_page ((ev.button == Button1 ? DN : UP), 1814 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 1815 (TermWin.nrow
1802 * scrollbar_position (ev.y) 1816 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 1817 / scrollbar_size ()));
1804 } 1818 }
1819
1805 break; 1820 break;
1806 } 1821 }
1807 } 1822 }
1808 return; 1823 return;
1809 } 1824 }
… …
1833 refresh_type &= ~SMOOTH_REFRESH; 1848 refresh_type &= ~SMOOTH_REFRESH;
1834#endif 1849#endif
1835 1850
1836 } 1851 }
1837#ifdef SELECTION_SCROLLING 1852#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 1853 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop();
1839#endif 1855#endif
1840 if (ev.window == TermWin.vt) 1856 if (ev.window == TermWin.vt)
1841 { 1857 {
1842 if (reportmode) 1858 if (reportmode)
1843 { 1859 {
… …
1885 case Button5: 1901 case Button5:
1886 { 1902 {
1887 int i; 1903 int i;
1888 page_dirn v; 1904 page_dirn v;
1889 1905
1890 v = (ev.button == Button4) ? UP : DN; 1906 v = ev.button == Button4 ? UP : DN;
1907
1891 if (ev.state & ShiftMask) 1908 if (ev.state & ShiftMask)
1892 i = 1; 1909 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 1910 else if (Options & Opt_mouseWheelScrollPage)
1894 i = TermWin.nrow - 1; 1911 i = TermWin.nrow - 1;
1895 else 1912 else
1896 i = 5; 1913 i = 5;
1914
1897# ifdef MOUSE_SLIP_WHEELING 1915# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 1916 if (ev.state & ControlMask)
1899 { 1917 {
1900 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)
1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924
1925 slip_wheel_ev.start ();
1902 } 1926 }
1927 else
1928 {
1903# endif 1929# endif
1904# ifdef JUMP_MOUSE_WHEEL 1930# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1911 scr_page (v, 1); 1931 scr_page (v, i);
1912 scr_refresh (SMOOTH_REFRESH); 1932 scr_refresh (SMOOTH_REFRESH);
1913 scrollbar_show (1); 1933 scrollbar_show (1);
1934# else
1935 while (i--)
1936 {
1937 scr_page (v, 1);
1938 scr_refresh (SMOOTH_REFRESH);
1939 scrollbar_show (1);
1940 }
1941# endif
1942# ifdef MOUSE_SLIP_WHEELING
1914 } 1943 }
1915# endif 1944#endif
1916
1917 } 1945 }
1918 break; 1946 break;
1919#endif 1947#endif
1920
1921 } 1948 }
1922 } 1949 }
1923#ifdef MENUBAR 1950#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window)) 1951 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev); 1952 menubar_control (ev);
1926#endif 1953#endif
1927} 1954}
1928 1955
1929
1930#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
1931/* 2188/*
1932 * Check our parents are still who we think they are. 2189 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 2190 * Do transparency updates if required
1934 */ 2191 */
1935int 2192int
1936rxvt_term::check_our_parents () 2193rxvt_term::check_our_parents ()
1937{ 2194{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 2195 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 2196 unsigned long nitems, bytes_after;
1940 Atom atype; 2197 Atom atype;
1941 unsigned char *prop = NULL; 2198 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 2199 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 2200 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 2201 XWindowAttributes wattr, wrootattr;
1945 2202
1946 pchanged = 0; 2203 pchanged = 0;
1947 2204
1948 if (! (Options & Opt_transparent)) 2205 if (!(Options & Opt_transparent))
1949 return pchanged; /* Don't try any more */ 2206 return pchanged; /* Don't try any more */
1950 2207
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 2208 XGetWindowAttributes (display->display, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 2209 rootdepth = wrootattr.depth;
1953 2210
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2212
1955 if (rootdepth != wattr.depth) 2213 if (rootdepth != wattr.depth)
1956 { 2214 {
1957 if (am_transparent) 2215 if (am_transparent)
1958 { 2216 {
1959 pchanged = 1; 2217 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 2219 am_transparent = am_pixmap_trans = 0;
1963 } 2220 }
2221
1964 return pchanged; /* Don't try any more */ 2222 return pchanged; /* Don't try any more */
1965 } 2223 }
1966 2224
1967 /* 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. */
1968 XSync (display->display, False); 2226 XSync (display->display, False);
… …
1970 /* 2228 /*
1971 * Make the frame window set by the window manager have 2229 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 2230 * the root background. Some window managers put multiple nested frame
1973 * 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.
1974 */ 2232 */
1975 i = (xa[XA_XROOTPMAPID] != 0 2233 i = (xa[XA_XROOTPMAPID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success)); 2236 &nitems, &bytes_after, &prop) == Success);
2237
1979 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 )
1980 have_pixmap = 0; 2249 have_pixmap = 0;
1981 else 2250 else
1982 { 2251 {
1983 have_pixmap = 1; 2252 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2253 rootpixmap = *(Pixmap *)prop;
1985 XFree (prop); 2254 XFree (prop);
1986 } 2255 }
2256
1987 if (have_pixmap) 2257 if (have_pixmap)
1988 { 2258 {
1989 /* 2259 /*
1990 * Copy display->root pixmap transparency 2260 * Copy display->root pixmap transparency
1991 */ 2261 */
1992 int sx, sy, nx, ny; 2262 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2263 unsigned int nw, nh;
1994 Window cr; 2264 Window cr;
1995 XImage *image; 2265 XImage *image;
1996 GC gc; 2266 GC gc;
1997 XGCValues gcvalue; 2267 XGCValues gcvalue;
1998 2268
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2270 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2271 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2272 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2273 nx = ny = 0;
2274
2004 if (sx < 0) 2275 if (sx < 0)
2005 { 2276 {
2006 nw += sx; 2277 nw += sx;
2007 nx = -sx; 2278 nx = -sx;
2008 sx = 0; 2279 sx = 0;
2009 } 2280 }
2281
2010 if (sy < 0) 2282 if (sy < 0)
2011 { 2283 {
2012 nh += sy; 2284 nh += sy;
2013 ny = -sy; 2285 ny = -sy;
2014 sy = 0; 2286 sy = 0;
2015 } 2287 }
2288
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2018 allowedxerror = -1; 2291 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2293
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2295 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2296 allowedxerror = 0;
2297
2024 if (image == NULL) 2298 if (image == NULL)
2025 { 2299 {
2026 if (am_transparent && am_pixmap_trans) 2300 if (am_transparent && am_pixmap_trans)
2027 { 2301 {
2028 pchanged = 1; 2302 pchanged = 1;
… …
2030 { 2304 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2305 XFreePixmap (display->display, TermWin.pixmap);
2032 TermWin.pixmap = None; 2306 TermWin.pixmap = None;
2033 } 2307 }
2034 } 2308 }
2309
2035 am_pixmap_trans = 0; 2310 am_pixmap_trans = 0;
2036 } 2311 }
2037 else 2312 else
2038 { 2313 {
2039 if (TermWin.pixmap != None) 2314 if (TermWin.pixmap != None)
2040 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
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height, 2330 szHint.width, szHint.height, image->depth);
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2333 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2334 XFreeGC (display->display, gc);
2050 XDestroyImage (image); 2335 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2052 TermWin.pixmap); 2337 XClearWindow (display->display, TermWin.parent[0]);
2338
2053 if (!am_transparent || !am_pixmap_trans) 2339 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2340 pchanged = 1;
2341
2055 am_transparent = am_pixmap_trans = 1; 2342 am_transparent = am_pixmap_trans = 1;
2056 } 2343 }
2057 } 2344 }
2345
2058 if (!am_pixmap_trans) 2346 if (!am_pixmap_trans)
2059 { 2347 {
2060 unsigned int n; 2348 unsigned int n;
2061 /* 2349 /*
2062 * InheritPixmap transparency 2350 * InheritPixmap transparency
2063 */ 2351 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2354 {
2068 oldp = TermWin.parent[i]; 2355 oldp = TermWin.parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2356 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n); 2357 &TermWin.parent[i], &list, &n);
2071 XFree (list); 2358 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360
2073 if (TermWin.parent[i] == display->root) 2361 if (TermWin.parent[i] == display->root)
2074 { 2362 {
2075 if (oldp != None) 2363 if (oldp != None)
2076 pchanged = 1; 2364 pchanged = 1;
2365
2077 break; 2366 break;
2078 } 2367 }
2368
2079 if (oldp != TermWin.parent[i]) 2369 if (oldp != TermWin.parent[i])
2080 pchanged = 1; 2370 pchanged = 1;
2081 } 2371 }
2372
2082 n = 0; 2373 n = 0;
2374
2083 if (pchanged) 2375 if (pchanged)
2084 { 2376 {
2085 for (; n < (unsigned int)i; n++) 2377 for (; n < (unsigned int)i; n++)
2086 { 2378 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2092 break; 2384 break;
2093 } 2385 }
2094 } 2386 }
2095 } 2387 }
2096 if (n > (int) (sizeof (TermWin.parent) 2388
2097 / sizeof (TermWin.parent[0]))) 2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2098 { 2390 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2391 D_X ((stderr, "InheritPixmap Turning off"));
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt, 2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2103 PixColors[Color_bg]);
2104 am_transparent = 0; 2394 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */ 2395 /* XXX: also turn off Opt_transparent? */
2106 } 2396 }
2107 else 2397 else
2108 { 2398 {
2399#if WAIT_FOR_WM
2109 /* wait (an arbitrary period) for the WM to do its thing 2400 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */ 2401 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113
2114 rqt.tv_sec = 1;
2115 rqt.tv_nsec = 0;
2116 nanosleep (&rqt, NULL);
2117# else
2118 sleep (1); 2402 sleep (1);
2119# endif 2403#endif
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++) 2405 for (n = 0; n < (unsigned int)i; n++)
2406 {
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2123 ParentRelative); 2408 XClearWindow (display->display, TermWin.parent[n]);
2409 }
2410
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2125 ParentRelative);
2126 am_transparent = 1; 2412 am_transparent = 1;
2127 } 2413 }
2414
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2416 TermWin.parent[i] = None;
2130 } 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
2131 return pchanged; 2428 return pchanged;
2132} 2429}
2133#endif 2430#endif
2134 2431
2135/*}}} */ 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}
2136 2605
2137/*{{{ print pipe */ 2606/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2607/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2608#ifdef PRINTPIPE
2140FILE * 2609FILE *
2141rxvt_term::popen_printer () 2610rxvt_term::popen_printer ()
2142{ 2611{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2612 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2613
2145 if (stream == NULL) 2614 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2615 rxvt_warn ("can't open printer pipe, not printing.\n");
2616
2147 return stream; 2617 return stream;
2148} 2618}
2149 2619
2150int 2620int
2151rxvt_term::pclose_printer (FILE *stream) 2621rxvt_term::pclose_printer (FILE *stream)
2152{ 2622{
2153 fflush (stream); 2623 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2624 return pclose (stream);
2160# endif
2161} 2625}
2162 2626
2163/* 2627/*
2164 * simulate attached vt100 printer 2628 * simulate attached vt100 printer
2165 */ 2629 */
2166void 2630void
2167rxvt_term::process_print_pipe () 2631rxvt_term::process_print_pipe ()
2168{ 2632{
2169 int done; 2633 int done;
2170 FILE *fd; 2634 FILE *fd;
2171 2635
2172 if ((fd = popen_printer ()) == NULL) 2636 if ((fd = popen_printer ()) == NULL)
2173 return; 2637 return;
2174 2638
2175 /* 2639 /*
2176 * 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
2177 * is received. 2641 * is received.
2178 */ 2642 */
2179 for (done = 0; !done;) 2643 for (done = 0; !done;)
2180 { 2644 {
2181 unsigned char buf[8]; 2645 unsigned char buf[8];
2182 unsigned char ch; 2646 unicode_t ch;
2183 unsigned int i, len; 2647 unsigned int i, len;
2184 2648
2185 if ((ch = cmd_getc ()) != C0_ESC) 2649 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2650 {
2187 if (putc (ch, fd) == EOF) 2651 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2652 break; /* done = 1 */
… …
2203 { 2667 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2668 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2669 break; /* done = 1 */
2206 } 2670 }
2207 } 2671 }
2672
2208 for (i = 0; i < len; i++) 2673 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2674 if (putc (buf[i], fd) == EOF)
2210 { 2675 {
2211 done = 1; 2676 done = 1;
2212 break; 2677 break;
2213 } 2678 }
2214 } 2679 }
2215 } 2680 }
2681
2216 pclose_printer (fd); 2682 pclose_printer (fd);
2217} 2683}
2218#endif /* PRINTPIPE */ 2684#endif /* PRINTPIPE */
2219/*}}} */ 2685/*}}} */
2220 2686
2221/* *INDENT-OFF* */ 2687/* *INDENT-OFF* */
2222enum { 2688enum {
2223 C1_40 = 0x40, 2689 C1_40 = 0x40,
2224 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,
2225 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,
2226 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,
2227 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,
2228}; 2694};
2229/* *INDENT-ON* */ 2695/* *INDENT-ON* */
2230 2696
2231/*{{{ process non-printing single characters */ 2697/*{{{ process non-printing single characters */
2232void 2698void
2233rxvt_term::process_nonprinting (unsigned char ch) 2699rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2700{
2235 switch (ch) 2701 switch (ch)
2236 { 2702 {
2703 case C0_ESC:
2704 process_escape_seq ();
2705 break;
2237 case C0_ENQ: /* terminal Status */ 2706 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2707 if (rs[Rs_answerbackstring])
2239 tt_write (
2240 (const unsigned char *)rs[Rs_answerbackstring], 2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2242 else 2710 else
2243 tt_write ((unsigned char *)VT100_ANS, 2711 tt_write ((unsigned char *)VT100_ANS,
2244 (unsigned int)STRLEN (VT100_ANS)); 2712 (unsigned int)STRLEN (VT100_ANS));
2245 break; 2713 break;
2246 case C0_BEL: /* bell */ 2714 case C0_BEL: /* bell */
2247 scr_bell (); 2715 scr_bell ();
2248 break; 2716 break;
2249 case C0_BS: /* backspace */ 2717 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 2732 scr_charset_choose (1);
2265 break; 2733 break;
2266 case C0_SI: /* shift in - acs */ 2734 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 2735 scr_charset_choose (0);
2268 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
2269 } 2750 }
2270} 2751}
2271/*}}} */ 2752/*}}} */
2272 2753
2273 2754
2274/*{{{ process VT52 escape sequences */ 2755/*{{{ process VT52 escape sequences */
2275void 2756void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 2757rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 2758{
2278 int row, col; 2759 int row, col;
2279 2760
2280 switch (ch) 2761 switch (ch)
2281 { 2762 {
… …
2333 2814
2334/*{{{ process escape sequences */ 2815/*{{{ process escape sequences */
2335void 2816void
2336rxvt_term::process_escape_seq () 2817rxvt_term::process_escape_seq ()
2337{ 2818{
2338 unsigned char ch = cmd_getc (); 2819 unicode_t ch = cmd_getc ();
2339 2820
2340 if (PrivateModes & PrivMode_vt52) 2821 if (PrivateModes & PrivMode_vt52)
2341 { 2822 {
2342 process_escape_vt52 (ch); 2823 process_escape_vt52 (ch);
2343 return; 2824 return;
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 2841 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 2842 break;
2362 case '+': 2843 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 2844 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 2845 break;
2365#ifdef MULTICHAR_SET
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS 2846#ifndef NO_FRILLS
2371 case '6': 2847 case '6':
2372 scr_backindex (); 2848 scr_backindex ();
2373 break; 2849 break;
2374#endif 2850#endif
… …
2396 break; 2872 break;
2397 2873
2398 /* 8.3.87: NEXT LINE */ 2874 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 2875 case C1_NEL: /* ESC E */
2400 { 2876 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 2877 unicode_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 2878 scr_add_lines (nlcr, 1, 2);
2403 } 2879 }
2404 break; 2880 break;
2405 2881
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 2882 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2417 case C1_RI: /* ESC M */ 2893 case C1_RI: /* ESC M */
2418 scr_index (DN); 2894 scr_index (DN);
2419 break; 2895 break;
2420 2896
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 2897 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 2898 /*case C1_SS2: scr_single_shift (2); break; */
2423 2899
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 2900 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 2901 /*case C1_SS3: scr_single_shift (3); break; */
2426 2902
2427 /* 8.3.27: DEVICE CONTROL STRING */ 2903 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 2904 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 2905 process_dcs_seq ();
2430 break; 2906 break;
… …
2445 process_osc_seq (); 2921 process_osc_seq ();
2446 break; 2922 break;
2447 2923
2448 /* 8.3.106: RESET TO INITIAL STATE */ 2924 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 2925 case 'c':
2926 mbstate.reset ();
2450 scr_poweron (); 2927 scr_poweron ();
2451 scrollbar_show (1); 2928 scrollbar_show (1);
2452 break; 2929 break;
2453 2930
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2931 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 2943
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2944/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 2945/* *INDENT-OFF* */
2469enum { 2946enum {
2470 CSI_ICH = 0x40, 2947 CSI_ICH = 0x40,
2471 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,
2472 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 ,
2473 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,
2474 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,
2475 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,
2476 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,
… …
2491 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, */
2492 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, [, \, ], ^, _, */
2493 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, */
2494 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, */
2495 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, */
2496 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, {, |, }, ~, */
2497 }; 2974 };
2498/* *INDENT-ON* */ 2975/* *INDENT-ON* */
2499 2976
2500void 2977void
2501rxvt_term::process_csi_seq () 2978rxvt_term::process_csi_seq ()
2502{ 2979{
2503 unsigned char ch, priv, i; 2980 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 2981 unsigned int nargs, p;
2505 int n, ndef; 2982 int n, ndef;
2506 int arg[ESC_ARGS]; 2983 int arg[ESC_ARGS];
2507 2984
2508 for (nargs = ESC_ARGS; nargs > 0;) 2985 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 2986 arg[--nargs] = 0;
2510 2987
2511 priv = 0; 2988 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 2990 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 2991 { /* '<' '=' '>' '?' */
2515 priv = ch; 2992 priv = ch;
2516 ch = cmd_getc (); 2993 ch = cmd_getc ();
2517 } 2994 }
2995
2518 /* read any numerical arguments */ 2996 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 2997 for (n = -1; ch < CSI_ICH; )
2520 { 2998 {
2521 if (isdigit (ch)) 2999 if (isdigit (ch))
2522 { 3000 {
… …
2529 { 3007 {
2530 if (nargs < ESC_ARGS) 3008 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 3009 arg[nargs++] = n;
2532 n = -1; 3010 n = -1;
2533 } 3011 }
2534 else if (ch == '\b') 3012 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 3013 process_nonprinting (ch);
2546 } 3014
2547 ch = cmd_getc (); 3015 ch = cmd_getc ();
2548 } 3016 }
2549 3017
2550 if (ch > CSI_7F) 3018 if (ch > CSI_7F)
2551 return; 3019 return;
… …
2709 tt_printf ("\033[0n"); 3177 tt_printf ("\033[0n");
2710 break; 3178 break;
2711 case 6: /* CPR requested */ 3179 case 6: /* CPR requested */
2712 scr_report_position (); 3180 scr_report_position ();
2713 break; 3181 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 3182 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure)
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3184 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2717 break; 3185 break;
2718#endif
2719 case 8: /* unofficial extension */ 3186 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 3188 break;
2722 } 3189 }
2723 break; 3190 break;
2724 3191
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3192 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2793#endif 3260#endif
2794 3261
2795 case CSI_78: /* DECREQTPARM */ 3262 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3263 if (arg[0] == 0 || arg[0] == 1)
2797 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);
2798 /* FALLTHROUGH */ 3265 break;
2799 3266
2800 default: 3267 default:
2801 break; 3268 break;
2802 } 3269 }
2803} 3270}
… …
2806#ifndef NO_FRILLS 3273#ifndef NO_FRILLS
2807/* ARGSUSED */ 3274/* ARGSUSED */
2808void 3275void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3276rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3277{
2811 int x, y; 3278 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3279 XWindowAttributes wattr;
2816 Window wdummy; 3280 Window wdummy;
2817 3281
2818 if (nargs == 0) 3282 if (nargs == 0)
2819 return; 3283 return;
3284
2820 switch (args[0]) 3285 switch (args[0])
2821 { 3286 {
2822 /* 3287 /*
2823 * commands 3288 * commands
2824 */ 3289 */
2825 case 1: /* deiconify window */ 3290 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3291 XMapWindow (display->display, TermWin.parent[0]);
2827 break; 3292 break;
2828 case 2: /* iconify window */ 3293 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3294 XIconifyWindow (display->display, TermWin.parent[0],
… …
2846 break; 3311 break;
2847 case 8: /* set size (chars) */ 3312 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3314 (unsigned int) (args[1] * TermWin.fheight));
2850 break; 3315 break;
3316
3317 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3318 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3319 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3320 set_widthheight ((unsigned int)TermWin.width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3321 (unsigned int) (args[1] * TermWin.fheight));
2855 break; 3322 break;
3323
3324
2856 /* 3325 /*
2857 * reports - some output format copied from XTerm 3326 * reports - some output format copied from XTerm
2858 */ 3327 */
2859 case 11: /* report window state */ 3328 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3331 break;
2863 case 13: /* report window position */ 3332 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3335 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3336 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3337 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3338 break;
2870 case 14: /* report window size (pixels) */ 3339 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3342 break;
2874 case 18: /* report window size (chars) */ 3343 case 18: /* report text area size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2876 break; 3345 break;
2877#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;
2878 case 20: /* report icon label */ 3349 case 20: /* report icon label */
3350 {
3351 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3352 XGetIconName (display->display, TermWin.parent[0], &s);
2880 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 }
2881 break; 3356 break;
2882 case 21: /* report window title */ 3357 case 21: /* report window title */
3358 {
3359 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3360 XFetchName (display->display, TermWin.parent[0], &s);
2884 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 }
2885 break; 3364 break;
2886#endif
2887
2888 } 3365 }
2889} 3366}
2890#endif 3367#endif
2891 3368
2892/*----------------------------------------------------------------------*/ 3369/*----------------------------------------------------------------------*/
2893/* 3370/*
2894 * get input up until STRING TERMINATOR (or BEL) 3371 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3372 * ends_how is terminator used. returned input must be free()'d
2896 */ 3373 */
2897unsigned char * 3374unsigned char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3375rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3376{
2900 int seen_esc = 0; /* seen escape? */ 3377 unicode_t prev = 0, ch;
2901 unsigned int n = 0; 3378 unsigned int n = 0;
2902 unsigned char *s; 3379 unsigned char *s;
2903 unsigned char ch, string[STRING_MAX]; 3380 unsigned char string[STRING_MAX];
2904 3381
2905 for (; (ch = cmd_getc ());) 3382 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3383 {
2907 if (ch == C0_BEL
2908 || ch == CHAR_ST
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2910 break;
2911 if (ch == C0_ESC) 3384 if (prev == C0_ESC)
2912 {
2913 seen_esc = 1;
2914 continue;
2915 } 3385 {
2916 else if (ch == '\t') 3386 if (ch == 0x5c) /* 7bit ST */
2917 ch = ' '; /* translate '\t' to space */ 3387 break;
2918 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)
2919 return NULL; /* other control character - exit */ 3394 return NULL; /* other control character - exit */
3395
2920 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
2921 string[n++] = ch; 3406 string[n++] = prev = ch;
2922 seen_esc = 0;
2923 } 3407 }
3408
2924 string[n++] = '\0'; 3409 string[n++] = '\0';
3410
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2926 return NULL; 3412 return NULL;
3413
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3414 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3415 STRNCPY (s, string, n);
2929 return s; 3416 return s;
2930} 3417}
2931 3418
2932/*----------------------------------------------------------------------*/ 3419/*----------------------------------------------------------------------*/
… …
2934 * 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)'
2935 */ 3422 */
2936void 3423void
2937rxvt_term::process_dcs_seq () 3424rxvt_term::process_dcs_seq ()
2938{ 3425{
2939 unsigned char eh, *s; 3426 unsigned char *s;
3427 unicode_t eh;
3428
2940 /* 3429 /*
2941 * Not handled yet 3430 * Not handled yet
2942 */ 3431 */
2943 s = get_to_st (&eh); 3432 s = get_to_st (eh);
2944 if (s) 3433 if (s)
2945 free (s); 3434 free (s);
3435
2946 return; 3436 return;
2947} 3437}
2948 3438
2949/*----------------------------------------------------------------------*/ 3439/*----------------------------------------------------------------------*/
2950/* 3440/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3441 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3442 */
2953void 3443void
2954rxvt_term::process_osc_seq () 3444rxvt_term::process_osc_seq ()
2955{ 3445{
2956 unsigned char ch, eh, *s; 3446 unicode_t ch, eh;
2957 int arg; 3447 int arg;
2958 3448
2959 ch = cmd_getc (); 3449 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3450 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3451 arg = arg * 10 + (ch - '0');
2962 3452
2963 if (ch == ';') 3453 if (ch == ';')
2964 { 3454 {
2965 s = get_to_st (&eh); 3455 unsigned char *s = get_to_st (eh);
3456
2966 if (s) 3457 if (s)
2967 { 3458 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3459 process_xterm_seq (arg, (char *)s, eh);
2980 free (s); 3460 free (s);
2981 } 3461 }
2982 } 3462 }
2983} 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
2984/* 3478/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title 3480 * 0 = change iconName/title
2987 * 1 = change iconName 3481 * 1 = change iconName
2988 * 2 = change title 3482 * 2 = change title
2989 * 4 = change color 3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
2990 * 12 = change text color 3486 * 12 = change text color
2991 * 13 = change mouse foreground color 3487 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour 3488 * 17 = change highlight character colour
2993 * 18 = change bold character color 3489 * 18 = change bold character color
2994 * 19 = change underlined character color 3490 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented) 3491 * 46 = change logfile (not implemented)
2996 * 50 = change font 3492 * 50 = change font
2997 * 3493 *
2998 * rxvt extensions: 3494 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap 3495 * 20 = bg pixmap
3002 * 39 = change default fg color 3496 * 39 = change default fg color
3003 * 49 = change default bg color 3497 * 49 = change default bg color
3004 * 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
3005 */ 3502 */
3006void 3503void
3007rxvt_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)
3008{ 3505{
3009 int changed = 0; 3506 int changed = 0;
3010 int color; 3507 int color;
3011 char *buf, *name; 3508 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1];
3012 3510
3013 assert (str != NULL); 3511 assert (str != NULL);
3014 switch (op) 3512 switch (op)
3015 { 3513 {
3016 case XTerm_name: 3514 case XTerm_name:
3017 set_title (str); 3515 set_title (str);
3018 /* FALLTHROUGH */ 3516 /* FALLTHROUGH */
3019 case XTerm_iconName: 3517 case XTerm_iconName:
3020 set_iconName (str); 3518 set_icon_name (str);
3021 break; 3519 break;
3022 case XTerm_title: 3520 case XTerm_title:
3023 set_title (str); 3521 set_title (str);
3024 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
3025 case XTerm_Color: 3565 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3566 for (buf = (char *)str; buf && *buf;)
3027 { 3567 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3568 if ((name = STRCHR (buf, ';')) == NULL)
3029 break; 3569 break;
3570
3030 *name++ = '\0'; 3571 *name++ = '\0';
3031 color = atoi (buf); 3572 color = atoi (buf);
3573
3032 if (color < 0 || color >= TOTAL_COLORS) 3574 if (color < 0 || color >= TOTAL_COLORS)
3033 break; 3575 break;
3576
3034 if ((buf = STRCHR (name, ';')) != NULL) 3577 if ((buf = STRCHR (name, ';')) != NULL)
3035 *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
3036 set_window_color (color + minCOLOR, name); 3587 set_window_color (color + minCOLOR, name);
3037 } 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);
3038 break; 3595 break;
3039#ifndef NO_CURSORCOLOR 3596#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3597 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3042 break; 3599 break;
3043#endif 3600#endif
3044 case XTerm_Color_pointer: 3601 case XTerm_Color_pointer_fg:
3045 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);
3046 break; 3606 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3607#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD: 3608 case XTerm_Color_BD:
3049 set_window_color (Color_BD, str); 3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3050 break; 3610 break;
3051 case XTerm_Color_UL: 3611 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str); 3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3053 break; 3613 break;
3054 case XTerm_Color_RV: 3614 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3056 break; 3616 break;
3057#endif 3617#endif
3058 3618
3059 case XTerm_Menu:
3060 /*
3061 * rxvt_menubar_dispatch () violates the constness of the string,
3062 * so DON'T do it here
3063 */
3064 break;
3065 case XTerm_Pixmap: 3619 case XTerm_Pixmap:
3066 if (*str != ';') 3620 if (*str != ';')
3067 { 3621 {
3068#if XPM_BACKGROUND 3622#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3623 scale_pixmap (""); /* reset to default scaling */
… …
3092 set_window_color (Color_fg, str); 3646 set_window_color (Color_fg, str);
3093 break; 3647 break;
3094 case XTerm_restoreBG: 3648 case XTerm_restoreBG:
3095 set_window_color (Color_bg, str); 3649 set_window_color (Color_bg, str);
3096 break; 3650 break;
3651
3097 case XTerm_logfile: 3652 case XTerm_logfile:
3653 // TODO, when secure mode?
3098 break; 3654 break;
3655
3099 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
3100 change_font (str); 3663 change_font (str);
3101 break; 3664 break;
3665
3666#ifndef NO_FRILLS
3102 case XTerm_locale: 3667 case XTerm_locale:
3103 if (str[0] == '?' && !str[1]) 3668 if (query)
3104 tt_printf ("%-.250s\n", locale); 3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3105 else 3670 else
3106 { 3671 {
3107 set_locale (str); 3672 set_locale (str);
3673# ifdef USE_XIM
3108 im_cb (); 3674 im_cb ();
3109 3675# endif
3110 // TODO: call selection_make with the right values set
3111 // to re-fresh the selection.
3112 if (display->selection_owner == this)
3113 display->set_selection_owner (0);
3114 } 3676 }
3115 break; 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
3694 break;
3695#endif
3116#if 0 3696#if 0
3117 case XTerm_dumpscreen: /* no error notices */ 3697 case XTerm_dumpscreen: /* no error notices */
3118 { 3698 {
3119 int fd; 3699 int fd;
3120 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)
3121 { 3701 {
3122 scr_dump (fd); 3702 scr_dump (fd);
3123 close (fd); 3703 close (fd);
3124 } 3704 }
3125 } 3705 }
3126 break; 3706 break;
3127#endif 3707#endif
3128
3129 } 3708 }
3130} 3709}
3131/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3132 3711
3133/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3712/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3141 * so no need for fancy checking 3720 * so no need for fancy checking
3142 */ 3721 */
3143int 3722int
3144rxvt_term::privcases (int mode, unsigned long bit) 3723rxvt_term::privcases (int mode, unsigned long bit)
3145{ 3724{
3146 int state; 3725 int state;
3147 3726
3148 if (mode == 's') 3727 if (mode == 's')
3149 { 3728 {
3150 SavedModes |= (PrivateModes & bit); 3729 SavedModes |= (PrivateModes & bit);
3151 return -1; 3730 return -1;
… …
3156 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3157 else 3736 else
3158 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3159 PrivMode (state, bit); 3738 PrivMode (state, bit);
3160 } 3739 }
3740
3161 return state; 3741 return state;
3162} 3742}
3163 3743
3164/* we're not using priv _yet_ */ 3744/* we're not using priv _yet_ */
3165void 3745void
3166rxvt_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)
3167{ 3747{
3168 unsigned int i, j; 3748 unsigned int i, j;
3169 int state; 3749 int state;
3750
3170 static const struct 3751 static const struct
3171 { 3752 {
3172 const int argval; 3753 const int argval;
3173 const unsigned long bit; 3754 const unsigned long bit;
3174 } 3755 }
3756
3175 argtopriv[] = { 3757 argtopriv[] = {
3176 { 1, PrivMode_aplCUR }, 3758 { 1, PrivMode_aplCUR },
3177 { 2, PrivMode_vt52 }, 3759 { 2, PrivMode_vt52 },
3178 { 3, PrivMode_132 }, 3760 { 3, PrivMode_132 },
3179 { 4, PrivMode_smoothScroll }, 3761 { 4, PrivMode_smoothScroll },
… …
3185 { menuBar_esc, PrivMode_menuBar }, 3767 { menuBar_esc, PrivMode_menuBar },
3186#endif 3768#endif
3187#ifdef scrollBar_esc 3769#ifdef scrollBar_esc
3188 { scrollBar_esc, PrivMode_scrollBar }, 3770 { scrollBar_esc, PrivMode_scrollBar },
3189#endif 3771#endif
3772 // 18, 19 printing-related
3190 { 25, PrivMode_VisibleCursor }, 3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3191 { 35, PrivMode_ShiftKeys }, 3775 { 35, PrivMode_ShiftKeys }, // rxvt extension
3192 { 40, PrivMode_132OK }, 3776 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI
3779 // 46 start logging
3193 { 47, PrivMode_Screen }, 3780 { 47, PrivMode_Screen },
3194 { 66, PrivMode_aplKP }, 3781 { 66, PrivMode_aplKP },
3195#ifndef NO_BACKSPACE_KEY 3782#ifndef NO_BACKSPACE_KEY
3196 { 67, PrivMode_BackSpace }, 3783 { 67, PrivMode_BackSpace },
3197#endif 3784#endif
3198 { 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
3199 { 1010, PrivMode_TtyOutputInh }, 3789 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3200 { 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
3201 { 1047, PrivMode_Screen }, 3794 { 1047, PrivMode_Screen },
3795 // 1048 save and restore cursor
3202 { 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
3203 }; 3798 };
3204 3799
3205 if (nargs == 0) 3800 if (nargs == 0)
3206 return; 3801 return;
3207 3802
… …
3222 state = privcases (mode, argtopriv[j].bit); 3817 state = privcases (mode, argtopriv[j].bit);
3223 break; 3818 break;
3224 } 3819 }
3225 3820
3226 /* extra handling for values with state unkept */ 3821 /* extra handling for values with state unkept */
3227 if (state == -1)
3228 switch (arg[i]) 3822 switch (arg[i])
3229 { 3823 {
3230 case 1048: /* alternative cursor save */ 3824 case 1048: /* alternative cursor save */
3825 if (Options & Opt_secondaryScreen)
3231 if (mode == 0) 3826 if (mode == 0)
3232 scr_cursor (RESTORE); 3827 scr_cursor (RESTORE);
3233 else if (mode == 1) 3828 else if (mode == 1)
3234 scr_cursor (SAVE); 3829 scr_cursor (SAVE);
3235 /* FALLTHROUGH */
3236 default:
3237 continue; /* for (;i;) */
3238 }
3239
3240 /* extra handling for values with valid 0 or 1 state */
3241 switch (arg[i])
3242 {
3243 /* case 1: - application cursor keys */
3244 case 2: /* VT52 mode */
3245 /* oddball mode. should be set regardless of set/reset
3246 * parameter. Return from VT52 mode with an ESC < from
3247 * within VT52 mode
3248 */
3249 PrivMode (1, PrivMode_vt52);
3250 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;
3251 case 3: /* 80/132 */ 3845 case 3: /* 80/132 */
3252 if (PrivateModes & PrivMode_132OK) 3846 if (PrivateModes & PrivMode_132OK)
3253 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3254 (unsigned int)TermWin.height);
3255 break; 3848 break;
3256 case 4: /* smooth scrolling */ 3849 case 4: /* smooth scrolling */
3257 if (state) 3850 if (state)
3258 Options &= ~Opt_jumpScroll; 3851 Options &= ~Opt_jumpScroll;
3259 else 3852 else
3260 Options |= Opt_jumpScroll; 3853 Options |= Opt_jumpScroll;
3261 break; 3854 break;
3262 case 5: /* reverse video */ 3855 case 5: /* reverse video */
3263 scr_rvideo_mode (state); 3856 scr_rvideo_mode (state);
3264 break; 3857 break;
3265 case 6: /* relative/absolute origins */ 3858 case 6: /* relative/absolute origins */
3266 scr_relative_origin (state); 3859 scr_relative_origin (state);
3267 break; 3860 break;
3268 case 7: /* autowrap */ 3861 case 7: /* autowrap */
3269 scr_autowrap (state); 3862 scr_autowrap (state);
3270 break; 3863 break;
3271 /* 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 */
3272 case 9: /* X10 mouse reporting */ 3865 case 9: /* X10 mouse reporting */
3273 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
3274 PrivateModes &= ~ (PrivMode_MouseX11); 3867 PrivateModes &= ~PrivMode_MouseX11;
3275 break; 3868 break;
3276#ifdef menuBar_esc 3869#ifdef menuBar_esc
3277 case menuBar_esc: 3870 case menuBar_esc:
3278#ifdef MENUBAR 3871#ifdef MENUBAR
3279 map_menuBar (state); 3872 map_menuBar (state);
3280#endif 3873#endif
3281 break; 3874 break;
3282#endif 3875#endif
3283#ifdef scrollBar_esc 3876#ifdef scrollBar_esc
3284 case scrollBar_esc: 3877 case scrollBar_esc:
3285 if (scrollbar_mapping (state)) 3878 if (scrollbar_mapping (state))
3286 { 3879 {
3287 resize_all_windows (0, 0, 0); 3880 resize_all_windows (0, 0, 0);
3288 scr_touch (true); 3881 scr_touch (true);
3289 } 3882 }
3290 break; 3883 break;
3291#endif 3884#endif
3292 case 25: /* visible/invisible cursor */ 3885 case 25: /* visible/invisible cursor */
3293 scr_cursor_visible (state); 3886 scr_cursor_visible (state);
3294 break; 3887 break;
3295 /* case 35: - shift keys */ 3888 /* case 35: - shift keys */
3296 /* case 40: - 80 <--> 132 mode */ 3889 /* case 40: - 80 <--> 132 mode */
3297 case 47: /* secondary screen */ 3890 case 47: /* secondary screen */
3298 scr_change_screen (state); 3891 scr_change_screen (state);
3299 break; 3892 break;
3300 /* case 66: - application key pad */ 3893 /* case 66: - application key pad */
3301 /* case 67: - backspace key */ 3894 /* case 67: - backspace key */
3302 case 1000: /* X11 mouse reporting */ 3895 case 1000: /* X11 mouse reporting */
3303 if (state) /* orthogonal */ 3896 if (state) /* orthogonal */
3304 PrivateModes &= ~ (PrivMode_MouseX10); 3897 PrivateModes &= ~PrivMode_MouseX10;
3305 break; 3898 break;
3306#if 0 3899#if 0
3307 case 1001: 3900 case 1001:
3308 break; /* X11 mouse highlighting */ 3901 break; /* X11 mouse highlighting */
3309#endif 3902#endif
3310 case 1010: /* scroll to bottom on TTY output inhibit */ 3903 case 1010: /* scroll to bottom on TTY output inhibit */
3311 if (state) 3904 if (state)
3312 Options &= ~Opt_scrollTtyOutput; 3905 Options &= ~Opt_scrollTtyOutput;
3313 else 3906 else
3314 Options |= Opt_scrollTtyOutput; 3907 Options |= Opt_scrollTtyOutput;
3315 break; 3908 break;
3316 case 1011: /* scroll to bottom on key press */ 3909 case 1011: /* scroll to bottom on key press */
3317 if (state) 3910 if (state)
3318 Options |= Opt_scrollTtyKeypress; 3911 Options |= Opt_scrollTtyKeypress;
3319 else 3912 else
3320 Options &= ~Opt_scrollTtyKeypress; 3913 Options &= ~Opt_scrollTtyKeypress;
3321 break; 3914 break;
3322 case 1047: /* secondary screen w/ clearing */ 3915 case 1047: /* secondary screen w/ clearing last */
3323 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3916 if (Options & Opt_secondaryScreen)
3324 if (current_screen != PRIMARY) 3917 if (current_screen != PRIMARY)
3325 scr_erase_screen (2); 3918 scr_erase_screen (2);
3326 scr_change_screen (state); 3919 scr_change_screen (state);
3327 /* FALLTHROUGH */
3328 default:
3329 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;
3330 } 3929 }
3331 } 3930 }
3332} 3931}
3333/*}}} */ 3932/*}}} */
3334 3933
3335/*{{{ process sgr sequences */ 3934/*{{{ process sgr sequences */
3336void 3935void
3337rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3936rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3338{ 3937{
3339 unsigned int i; 3938 unsigned int i;
3340 short rendset; 3939 short rendset;
3341 int rendstyle; 3940 int rendstyle;
3342 3941
3343 if (nargs == 0) 3942 if (nargs == 0)
3344 { 3943 {
3345 scr_rendition (0, ~RS_None); 3944 scr_rendition (0, ~RS_None);
3346 return; 3945 return;
3347 } 3946 }
3947
3348 for (i = 0; i < nargs; i++) 3948 for (i = 0; i < nargs; i++)
3349 { 3949 {
3350 rendset = -1; 3950 rendset = -1;
3351 switch (arg[i]) 3951 switch (arg[i])
3352 { 3952 {
… …
3354 rendset = 0, rendstyle = ~RS_None; 3954 rendset = 0, rendstyle = ~RS_None;
3355 break; 3955 break;
3356 case 1: 3956 case 1:
3357 rendset = 1, rendstyle = RS_Bold; 3957 rendset = 1, rendstyle = RS_Bold;
3358 break; 3958 break;
3959 //case 2: // faint or second colour
3359 case 4: 3960 case 4:
3360 rendset = 1, rendstyle = RS_Uline; 3961 rendset = 1, rendstyle = RS_Uline;
3361 break; 3962 break;
3362 case 5: 3963 case 5: // slowly blinking
3964 case 6: // rapidly blinking
3363 rendset = 1, rendstyle = RS_Blink; 3965 rendset = 1, rendstyle = RS_Blink;
3364 break; 3966 break;
3967 //case 6: // scoansi light background
3365 case 7: 3968 case 7:
3366 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;
3367 break; 3983 break;
3368 case 22: 3984 case 22:
3369 rendset = 0, rendstyle = RS_Bold; 3985 rendset = 0, rendstyle = RS_Bold;
3370 break; 3986 break;
3987 //case 23: disable italic
3371 case 24: 3988 case 24:
3372 rendset = 0, rendstyle = RS_Uline; 3989 rendset = 0, rendstyle = RS_Uline;
3373 break; 3990 break;
3374 case 25: 3991 case 25:
3375 rendset = 0, rendstyle = RS_Blink; 3992 rendset = 0, rendstyle = RS_Blink;
3376 break; 3993 break;
3377 case 27: 3994 case 27:
3378 rendset = 0, rendstyle = RS_RVid; 3995 rendset = 0, rendstyle = RS_RVid;
3379 break; 3996 break;
3997 //case 28: // visible. NYI
3998 //case 29: // not crossed-out
3380 } 3999 }
4000
3381 if (rendset != -1) 4001 if (rendset != -1)
3382 { 4002 {
3383 scr_rendition (rendset, rendstyle); 4003 scr_rendition (rendset, rendstyle);
3384 continue; /* for (;i;) */ 4004 continue; /* for (;i;) */
3385 } 4005 }
… …
3392 case 33: 4012 case 33:
3393 case 34: 4013 case 34:
3394 case 35: 4014 case 35:
3395 case 36: 4015 case 36:
3396 case 37: 4016 case 37:
3397 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3398 Color_fg);
3399 break; 4018 break;
3400#ifdef TTY_256COLOR 4019#ifdef TTY_256COLOR
3401 case 38: 4020 case 38:
3402 if (nargs > i + 2 && arg[i + 1] == 5) 4021 if (nargs > i + 2 && arg[i + 1] == 5)
3403 { 4022 {
3404 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3405 Color_fg);
3406 i += 2; 4024 i += 2;
3407 } 4025 }
3408 break; 4026 break;
3409#endif 4027#endif
3410 case 39: /* default fg */ 4028 case 39: /* default fg */
… …
3417 case 43: 4035 case 43:
3418 case 44: 4036 case 44:
3419 case 45: 4037 case 45:
3420 case 46: 4038 case 46:
3421 case 47: 4039 case 47:
3422 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3423 Color_bg);
3424 break; 4041 break;
3425#ifdef TTY_256COLOR 4042#ifdef TTY_256COLOR
3426 case 48: 4043 case 48:
3427 if (nargs > i + 2 && arg[i + 1] == 5) 4044 if (nargs > i + 2 && arg[i + 1] == 5)
3428 { 4045 {
3429 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3430 Color_bg);
3431 i += 2; 4047 i += 2;
3432 } 4048 }
3433 break; 4049 break;
3434#endif 4050#endif
3435 case 49: /* default bg */ 4051 case 49: /* default bg */
… …
3464 } 4080 }
3465 } 4081 }
3466} 4082}
3467/*}}} */ 4083/*}}} */
3468 4084
3469/*{{{ process Rob Nation's own graphics mode sequences */ 4085/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3470void 4086void
3471rxvt_term::process_graphics () 4087rxvt_term::process_graphics ()
3472{ 4088{
3473 unsigned char ch, cmd = cmd_getc (); 4089 unicode_t ch, cmd = cmd_getc ();
3474 4090
3475 if (cmd == 'Q') 4091 if (cmd == 'Q')
3476 { /* query graphics */ 4092 { /* query graphics */
3477 tt_printf ("\033G0\n"); /* no graphics */ 4093 tt_printf ("\033G0\n"); /* no graphics */
3478 return; 4094 return;

Diff Legend

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