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.43 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.97 by root, Mon Jul 26 18:01:19 2004 UTC

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

Diff Legend

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