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.421 by root, Wed Oct 15 17:16:47 2008 UTC vs.
Revision 1.548 by sf-exg, Tue Apr 29 13:10:06 2014 UTC

… …
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
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 400 break;
394 } 401 }
395 return param; 402 return param;
396} 403}
397 404
398void 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
400{ 416{
401 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
402 KeySym keysym; 418 KeySym keysym;
403 int valid_keysym; 419 int valid_keysym;
404 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
405 422
406#if ISO_14755 423#if ISO_14755
407 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
408 return; 425 return;
409#endif 426#endif
… …
416 */ 433 */
417 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
420 437
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
… …
485 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
486 } 497 }
487 498
488 if (valid_keysym) 499 if (valid_keysym)
489 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
490#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 710 return;
493#endif 711#endif
494 712
495 if (saveLines) 713 if (saveLines)
496 { 714 {
… …
505#ifdef PAGING_CONTEXT_LINES 723#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 724 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 725#else
508 lnsppg = nrow * 4 / 5; 726 lnsppg = nrow * 4 / 5;
509#endif 727#endif
728 max_it (lnsppg, 1);
729
510 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
511 { 731 {
512 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
513 return; 733 return;
514 } 734 }
515 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
516 { 736 {
517 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
518 return; 738 return;
519 } 739 }
520 } 740 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
523 { 743 {
524 if (keysym == XK_Up) 744 if (keysym == XK_Up)
525 { 745 {
526 scr_page (UP, 1); 746 scr_page (1);
527 return; 747 return;
528 } 748 }
529 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
530 { 750 {
531 scr_page (DN, 1); 751 scr_page (-1);
532 return; 752 return;
533 } 753 }
534 } 754 }
535#endif 755#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
538 { 758 {
539 if (keysym == XK_Home) 759 if (keysym == XK_Home)
540 { 760 {
541 scr_move_to (0, 1); 761 scr_changeview (top_row);
542 return; 762 return;
543 } 763 }
544 else if (keysym == XK_End) 764 else if (keysym == XK_End)
545 { 765 {
546 scr_move_to (1, 1); 766 scr_changeview (0);
547 return; 767 return;
548 } 768 }
549 } 769 }
550#endif 770#endif
551 } 771 }
… …
567 selection_request (ev.time); 787 selection_request (ev.time);
568 return; 788 return;
569#if TODO 789#if TODO
570 /* rxvt extras */ 790 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 792 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 794 return;
577#endif 795#endif
578 } 796 }
579 } 797 }
580 } 798 }
581 799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
813 }
814
582#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 816 // ISO 14755 support
584 if (shft && ctrl) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 818 {
586 int hv; 819 int hv;
587 820
588 if (iso14755buf & ISO_14755_51 821 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 822 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 852 scr_overlay_off ();
620# endif 853# endif
621 iso14755buf = 0; 854 iso14755buf = 0;
622 } 855 }
623 } 856 }
857 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 858 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 859 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 860 if (!(iso14755buf & ISO_14755_STARTED))
627 { 861 {
628 iso14755buf |= ISO_14755_STARTED; 862 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 863# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 864 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
638 { 872 {
639 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
640 return; 874 return;
641 } 875 }
642#endif 876#endif
643
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
771 }
772 break;
773 }
774
775 if (newlen)
776 len = strlen (kbuf);
777
778 /*
779 * Pass meta for all function keys, if 'meta' option set
780 */
781#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0)
783 kbuf[len - 1] |= 0x80;
784#endif
785
786 }
787 else if (ctrl && keysym == XK_minus)
788 {
789 len = 1;
790 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
791 }
792 else if (keysym == XK_ISO_Left_Tab)
793 {
794 strcpy (kbuf, "\033[Z");
795 len = 3;
796 }
797 else
798 {
799#ifdef META8_OPTION
800 /* set 8-bit on */
801 if (meta && (meta_char == 0x80))
802 {
803 char *ch;
804
805 for (ch = kbuf; ch < kbuf + len; ch++)
806 *ch |= 0x80;
807
808 meta = 0;
809 }
810#endif
811 /* nil */ ;
812 }
813 } 877 }
814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817 878
818 if (len <= 0) 879 if (len <= 0)
819 return; /* not mapped */ 880 return; /* not mapped */
820 881
821 if (option (Opt_scrollTtyKeypress))
822 if (view_start)
823 {
824 view_start = 0;
825 want_refresh = 1;
826 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif
847 )
848 {
849 const char ch = C0_ESC;
850 tt_write (&ch, 1);
851 }
852
853 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
854} 883}
855 884
856void 885void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
858{ 887{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 889 KeySym keysym;
861 890
… …
881 commit_iso14755 (); 910 commit_iso14755 ();
882 911
883 return; 912 return;
884 } 913 }
885 914
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 916 if (i[0] == keysym)
888 { 917 {
889 iso14755buf = ISO_14755_51 | i[1]; 918 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 919 commit_iso14755 ();
891 920
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
930#endif 959#endif
931} 960}
932 961
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 962void
967rxvt_term::flush () 963rxvt_term::flush ()
968{ 964{
969 flush_ev.stop (); 965 flush_ev.stop ();
970 966
971#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 968 if (bg_flags & BG_NEEDS_REFRESH)
973 { 969 {
974// scr_clear (true); This needs to be researched further! 970 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 971 scr_touch (false);
976 } 972 }
977#endif 973#endif
978 974
979 if (want_refresh) 975 if (want_refresh)
… …
1016 while (row < end_row); 1012 while (row < end_row);
1017 } 1013 }
1018 1014
1019 scr_refresh (); 1015 scr_refresh ();
1020 scrollBar.show (1); 1016 scrollBar.show (1);
1021#ifdef USE_XIM 1017#if USE_XIM
1022 IMSendSpot (); 1018 im_send_spot ();
1023#endif 1019#endif
1024 } 1020 }
1025 1021
1026 display->flush (); 1022 display->flush ();
1027} 1023}
1028 1024
1029/* checks wether a refresh is requested and starts the refresh timer */ 1025/* checks whether a refresh is requested and starts the refresh timer */
1030void 1026void
1031rxvt_term::refresh_check () 1027rxvt_term::refresh_check ()
1032{ 1028{
1033 if (want_refresh && !flush_ev.is_active ()) 1029 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1040 refresh_count = 0;
1045 flush (); 1041 flush ();
1046} 1042}
1047 1043
1048#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1049void 1060void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1062{
1052 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1064 want_refresh = 1;
… …
1072 1083
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1085void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1087{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1090 {
1080 want_refresh = 1; 1091 want_refresh = 1;
1081 refresh_check (); 1092 refresh_check ();
1082 } 1093 }
1083 else 1094 else
… …
1087 1098
1088#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1089void 1100void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1102{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1093 { 1104 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1106 want_refresh = 1;
1096 refresh_check (); 1107 refresh_check ();
1097 } 1108 }
… …
1102 1113
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1115void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1117{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1108 { 1119 {
1109 want_refresh = 1; 1120 want_refresh = 1;
1110 refresh_check (); 1121 refresh_check ();
1111 } 1122 }
1112 1123
… …
1128 // this should really be sched_yield(), but the linux guys thought 1139 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1140 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1141 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1142 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1143 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1144 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1145 // we just nanosleep a bit and hope for the best.
1135 1146
1136 struct timespec ts = { 0, 1000 }; 1147 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1148 nanosleep (&ts, 0);
1138 1149
… …
1144 { 1155 {
1145 } 1156 }
1146} event_handler; 1157} event_handler;
1147#endif 1158#endif
1148 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1149bool 1193bool
1150rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1151{ 1195{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1153 1197
1154 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1199
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1157 n = 0;
1158 } 1201 {
1159 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1163 1207
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1209
1166 if (r > 0) 1210 if (r > 0)
1167 { 1211 {
1168 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1169 return true; 1213 return true;
… …
1191{ 1235{
1192 make_current (); 1236 make_current ();
1193 1237
1194 if (revents & ev::READ) 1238 if (revents & ev::READ)
1195 // loop, but don't allow a single term to monopolize us 1239 // loop, but don't allow a single term to monopolize us
1196 while (pty_fill ()) 1240 for (int i = CBUFCNT; i-- && pty_fill (); )
1197 if (cmd_parse ()) 1241 cmd_parse ();
1198 break;
1199 1242
1200 if (revents & ev::WRITE) 1243 if (revents & ev::WRITE)
1201 pty_write (); 1244 pty_write ();
1202 1245
1203 refresh_check (); 1246 refresh_check ();
1204} 1247}
1205 1248
1206void 1249void ecb_cold
1207rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1208{ 1251{
1209 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1210 recolour_cursor (); 1253 recolour_cursor ();
1211 1254
… …
1216 pointer_ev.start (pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1217#endif 1260#endif
1218} 1261}
1219 1262
1220#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1221void 1264void ecb_cold
1222rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1223{ 1266{
1224 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1225 return; 1268 return;
1226 1269
… …
1228 XFlush (dpy); 1271 XFlush (dpy);
1229 1272
1230 hidden_pointer = 1; 1273 hidden_pointer = 1;
1231} 1274}
1232 1275
1233void 1276void ecb_cold
1234rxvt_term::pointer_cb (ev::timer &w, int revents) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1235{ 1278{
1236 make_current (); 1279 make_current ();
1237 1280
1238 pointer_blank (); 1281 pointer_blank ();
… …
1244{ 1287{
1245 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1246 int x, y; 1289 int x, y;
1247 int code = 32; 1290 int code = 32;
1248 1291
1249 x = Pixel2Col (ev.x); 1292 x = Pixel2Col (ev.x) + 1;
1250 y = Pixel2Row (ev.y); 1293 y = Pixel2Row (ev.y) + 1;
1294
1251 if (ev.type == MotionNotify) 1295 if (ev.type == MotionNotify)
1252 { 1296 {
1253 if (x == mouse_row && y == mouse_col) 1297 if (x == mouse_row && y == mouse_col)
1254 return; 1298 return;
1299
1255 mouse_row = x; 1300 mouse_row = x;
1256 mouse_col = y; 1301 mouse_col = y;
1257 code += 32; 1302 code += 32;
1258 } 1303 }
1259 1304
… …
1262 else 1307 else
1263 { 1308 {
1264 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1265 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1266 if (button_number >= 3) 1311 if (button_number >= 3)
1267 button_number += (64 - 3); 1312 button_number += 64 - 3;
1268 } 1313 }
1269 1314
1270 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1271 { 1316 {
1272 /* 1317 /*
… …
1304 fputc ('A', stderr); 1349 fputc ('A', stderr);
1305 if (key_state & 32) 1350 if (key_state & 32)
1306 fputc ('2', stderr); 1351 fputc ('2', stderr);
1307 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1308 button_number, 1353 button_number,
1309 x + 1, 1354 x,
1310 y + 1); 1355 y);
1311#endif 1356#endif
1312 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1313 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1314 (code + button_number + key_state), 1372 code + button_number + key_state,
1315 (32 + x + 1), 1373 32 + x,
1316 (32 + y + 1)); 1374 32 + y);
1317} 1375}
1318 1376
1319/*{{{ process an X event */ 1377/*{{{ process an X event */
1320void 1378void ecb_hot
1321rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1322{ 1380{
1323 make_current (); 1381 make_current ();
1324 1382
1325 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1423 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1482 focus_out ();
1425 break; 1483 break;
1426 1484
1427 case ConfigureNotify: 1485 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1431 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1432 { 1487 {
1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434 ; 1489 ;
1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1505 int x, y;
1506
1507 if (ev.xconfigure.send_event)
1508 {
1509 x = ev.xconfigure.x;
1510 y = ev.xconfigure.y;
1511 }
1512 else
1513 get_window_origin (x, y);
1514
1515 if (x != parent_x || y != parent_y)
1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 }
1522 }
1435 1523
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1525 {
1438 seen_resize = 1; 1526 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1528 }
1441 else 1529 else
1442 { 1530 {
1443#ifdef HAVE_BG_PIXMAP 1531#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped) 1532 if (moved)
1447 update_background (); 1533 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif 1534#endif
1452 } 1535 }
1453 1536
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455 } 1538 }
1456 break; 1539 break;
1457 1540
1458 case PropertyNotify: 1541 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1461 && ev.xproperty.state == PropertyNewValue)
1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1463
1464 break; 1543 break;
1465 1544
1466 case SelectionClear: 1545 case SelectionClear:
1467 selection_clear (); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468 break;
1469
1470 case SelectionNotify:
1471 if (selection_wait == Sel_normal)
1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1473 break; 1547 break;
1474 1548
1475 case SelectionRequest: 1549 case SelectionRequest:
1476 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1477 break; 1551 break;
1478 1552
1479 case MapNotify: 1553 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1482 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1485 * reparenting. 1559 // events at startup when the window manager reparents the
1486 * We should not render background immidiately, as there could be several 1560 // window, so as to perform the computation after we have
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1561 // received all of them.
1488 * by scheduling background redraw as soon as we can, but giving a short 1562 if (bg_img == 0)
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025); 1563 update_background_ev.start (0.025);
1495#endif 1564#endif
1496 mapped = 1; 1565 mapped = 1;
1497#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1498 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1513 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1514 { 1583 {
1515 do 1584 do
1516 { 1585 {
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1519 } 1588 }
1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521 1590
1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523 1592
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 { 1594 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1597 }
1529 1598
1530 want_refresh = 1; 1599 want_refresh = 1;
1531 } 1600 }
1532 else 1601 else
… …
1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1539 ; 1608 ;
1540 1609
1541 if (scrollBar.state && ev.xany.window == scrollBar.win) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1542 { 1611 {
1543 scrollBar.state = STATE_IDLE; 1612 scrollBar.state = SB_STATE_IDLE;
1544 scrollBar.show (0); 1613 scrollBar.show (0);
1545 } 1614 }
1546 } 1615 }
1547 break; 1616 break;
1548 1617
… …
1590 1659
1591#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1592 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1593 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1594 { 1663 {
1664 page_dirn scroll_selection_dir;
1595 int dist; 1665 int dist;
1596 1666
1597 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1598 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1599 */ 1669 */
… …
1614 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1615 } 1685 }
1616 else 1686 else
1617 { 1687 {
1618 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1619 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1620 } 1690 }
1621 1691
1622 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1623 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1624 + 1; 1694 + 1;
1625 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1626 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1627 } 1698 }
1628 else 1699 else
1629 { 1700 {
1630 /* we are within the text window, so we 1701 /* we are within the text window, so we
1631 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1636#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1637 } 1708 }
1638#endif 1709#endif
1639 } 1710 }
1640 } 1711 }
1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1642 { 1713 {
1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1644 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1645 ; 1716 ;
1646 1717
1647 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1648 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1649 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1650 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1651 &unused_mask); 1722 &unused_mask);
1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1653 scrollBar.size ()); 1724 scrollBar.size ());
1654 want_refresh = 1; 1725 want_refresh = 1;
1655 scrollBar.show (1); 1726 scrollBar.show (1);
1656 } 1727 }
1657 break; 1728 break;
1658 } 1729 }
1659 1730
1660#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1661 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1662 {
1663 if (hidden_cursor)
1664 {
1665 hidden_cursor = 0;
1666 want_refresh = 1;
1667 }
1668
1669 cursor_blink_ev.again (); 1733 cursor_blink_reset ();
1670 }
1671#endif 1734#endif
1672 1735
1673#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1675 { 1738 {
… …
1685#endif 1748#endif
1686 1749
1687 refresh_check (); 1750 refresh_check ();
1688} 1751}
1689 1752
1690void 1753#if ENABLE_FRILLS
1754void ecb_cold
1691rxvt_term::set_urgency (bool enable) 1755rxvt_term::set_urgency (bool enable)
1692{ 1756{
1693 if (enable == urgency_hint) 1757 if (enable == urgency_hint)
1694 return; 1758 return;
1695 1759
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1697 { 1761 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1763 XSetWMHints (dpy, parent, h);
1700 urgency_hint = enable; 1764 urgency_hint = enable;
1765 XFree (h);
1701 } 1766 }
1702} 1767}
1768#endif
1703 1769
1704void 1770void ecb_cold
1705rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1706{ 1772{
1707 if (!focus) 1773 if (!focus)
1708 { 1774 {
1709 focus = 1; 1775 focus = 1;
1710 want_refresh = 1; 1776 want_refresh = 1;
1711 1777
1712#if USE_XIM 1778#if USE_XIM
1713 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1714 { 1780 {
1715 IMSetPosition (); 1781 im_set_position ();
1716 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1717 } 1783 }
1718#endif 1784#endif
1719#if CURSOR_BLINK 1785#if CURSOR_BLINK
1720 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
… …
1734 1800
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1736 } 1802 }
1737} 1803}
1738 1804
1739void 1805void ecb_cold
1740rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1741{ 1807{
1742 if (focus) 1808 if (focus)
1743 { 1809 {
1744 focus = 0; 1810 focus = 0;
… …
1777 1843
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1845 }
1780} 1846}
1781 1847
1782void 1848void ecb_cold
1783rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1784{ 1850{
1785#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1787 { 1853 {
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1857 }
1792#endif 1858#endif
1793} 1859}
1794 1860
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1796void 1862void ecb_hot
1797rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1864{
1799 make_current (); 1865 make_current ();
1800 1866
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1869 return;
1804 1870
1805# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1871 switch (ev.type)
1807 { 1872 {
1808 case PropertyNotify: 1873 case PropertyNotify:
1809 /* 1874 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1812 */ 1877 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1880 {
1816 bgPixmap.set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1817 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1818 } 1889 }
1819 1890
1820 break; 1891 break;
1821 } 1892 }
1822# endif
1823 1893
1824 refresh_check (); 1894 refresh_check ();
1825} 1895}
1826#endif 1896#endif
1827 1897
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1864 { 1934 {
1865 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1866 MEvent.clicks++; 1936 MEvent.clicks++;
1867 1937
1868 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1869 { 1939 {
1870 /* only report double clicks */ 1940 /* only report double clicks */
… …
1951 if (scrollBar.upButton (ev.y)) 2021 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */ 2022 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y)) 2023 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */ 2024 direction = DN; /* down */
1955 2025
1956 scrollBar.state = STATE_IDLE; 2026 scrollBar.state = SB_STATE_IDLE;
1957 /* 2027 /*
1958 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 2029 * move up if mouse is above slider
1960 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1961 * 2031 *
… …
2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 2071#endif
2002 if (scr_page (direction, 1)) 2072 if (scr_page (direction, 1))
2003 { 2073 {
2004 if (direction == UP) 2074 if (direction == UP)
2005 scrollBar.state = STATE_UP; 2075 scrollBar.state = SB_STATE_UP;
2006 else 2076 else
2007 scrollBar.state = STATE_DOWN; 2077 scrollBar.state = SB_STATE_DOWN;
2008 } 2078 }
2009 } 2079 }
2010 else 2080 else
2011 switch (ev.button) 2081 switch (ev.button)
2012 { 2082 {
2013 case Button2: 2083 case Button2:
2014 switch (scrollBar.align) 2084 switch (scrollBar.align)
2015 { 2085 {
2016 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2017 csrO = 0; 2087 csrO = 0;
2018 break; 2088 break;
2019 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2020 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2021 break; 2091 break;
2022 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2023 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2024 break; 2094 break;
2025 } 2095 }
2026 2096
2027 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2028 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2031 2101
2032 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2033 break; 2103 break;
2034 2104
2035 case Button1: 2105 case Button1:
2036 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2039 2109
2040 case Button3: 2110 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2042 { 2112 {
2043 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2044# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2045 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2046# else 2116# else
2047 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2048# endif 2118# endif
2049 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2051 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2052# else 2122# else
2053 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2054# endif 2124# endif
2055 else 2125 else
2056 scrollBar.state = STATE_MOTION; 2126 scrollBar.state = SB_STATE_MOTION;
2057 } 2127 }
2058 else 2128 else
2059 { 2129 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2131 (nrow
2062 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2063 / scrollBar.size ())); 2133 / scrollBar.size ()));
2064 } 2134 }
2065 2135
2066 break; 2136 break;
2067 } 2137 }
… …
2078 2148
2079 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2150 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2152
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2084 { 2154 {
2085 scrollBar.state = STATE_IDLE; 2155 scrollBar.state = SB_STATE_IDLE;
2086 scrollBar.show (0); 2156 scrollBar.show (0);
2087 } 2157 }
2088 2158
2089#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
… …
2140 case Button3: 2210 case Button3:
2141 selection_make (ev.time); 2211 selection_make (ev.time);
2142 break; 2212 break;
2143 2213
2144 case Button2: 2214 case Button2:
2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2217 break;
2148 2218
2149#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2150 case Button4: 2220 case Button4:
2151 case Button5: 2221 case Button5:
2152 { 2222 {
2153 int i; 2223 int lines;
2154 page_dirn v; 2224 page_dirn dirn;
2155 2225
2156 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2157 2227
2158 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2159 i = 1; 2229 lines = 1;
2160 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2161 i = nrow - 1; 2231 lines = nrow - 1;
2162 else 2232 else
2163 i = 5; 2233 lines = 5;
2164 2234
2165# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2166 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2167 { 2237 {
2168 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2171 2240
2172 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2174 } 2243 }
2175 else 2244 else
2176# endif 2245# endif
2177 { 2246 {
2178 scr_page (v, i); 2247 scr_page (dirn, lines);
2179 scrollBar.show (1); 2248 scrollBar.show (1);
2180 } 2249 }
2181 } 2250 }
2182 break; 2251 break;
2183#endif 2252#endif
… …
2185 } 2254 }
2186} 2255}
2187 2256
2188/*}}} */ 2257/*}}} */
2189 2258
2190bool 2259void ecb_hot
2191rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2192{ 2261{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2196 2264
2197 for (;;) 2265 for (;;)
2198 { 2266 {
2199 if (expect_false (ch == NOCHAR)) 2267 if (ecb_unlikely (ch == NOCHAR))
2200 { 2268 {
2201 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2270 ch = next_char ();
2203 2271
2204 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2205 break; 2273 break;
2206 } 2274 }
2207 2275
2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2277 {
2210 if (expect_false (!seen_input)) 2278 if (ecb_unlikely (!seen_input))
2211 { 2279 {
2212 seen_input = 1; 2280 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2296 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2298
2231 for (;;) 2299 for (;;)
2232 { 2300 {
2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2302 break;
2235 2303
2236 *str++ = ch; 2304 *str++ = ch;
2237 2305
2238 if (expect_false (ch == C0_LF || str >= eol)) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2307 {
2240 if (ch == C0_LF) 2308 if (ch == C0_LF)
2241 nlines++; 2309 nlines++;
2242 2310
2243 refresh_count++; 2311 refresh_count++;
… …
2292 * What the heck we'll cheat and only refresh less than every page-full. 2360 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2361 * if skipScroll is enabled.
2294 */ 2362 */
2295 if (refreshnow) 2363 if (refreshnow)
2296 { 2364 {
2297 flag = true;
2298 scr_refresh (); 2365 scr_refresh ();
2299 want_refresh = 1; 2366 want_refresh = 1;
2300 } 2367 }
2301
2302 } 2368 }
2303 else 2369 else
2304 { 2370 {
2305 try 2371 try
2306 { 2372 {
… …
2314 } 2380 }
2315 2381
2316 ch = NOCHAR; 2382 ch = NOCHAR;
2317 } 2383 }
2318 } 2384 }
2319
2320 return flag;
2321} 2385}
2322 2386
2323// read the next character 2387// read the next character
2324wchar_t 2388wchar_t ecb_hot
2325rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2326{ 2390{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2392 {
2329 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2332 2396
2333 wchar_t wc; 2397 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2399
… …
2340 break; 2404 break;
2341 } 2405 }
2342 2406
2343 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2344 { 2408 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 } 2413 }
2348 2414
2349 // assume wchar == unicode 2415 // assume wchar == unicode
2350 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
… …
2353 2419
2354 return NOCHAR; 2420 return NOCHAR;
2355} 2421}
2356 2422
2357// read the next octet 2423// read the next octet
2358uint32_t 2424uint32_t ecb_hot
2359rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2360{ 2426{
2361 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2362 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2363 : NOCHAR; 2429 : NOCHAR;
2364} 2430}
2365 2431
2366static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2367 2433
2368/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2369/*
2370 * Return the next input character after first passing any keyboard input
2371 * to the command.
2372 */
2373wchar_t
2374rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2375{ 2436{
2376 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2377 2438
2378 if (c == NOCHAR) 2439 if (c == NOCHAR)
2379 throw out_of_input; 2440 throw out_of_input;
2380 2441
2381 return c; 2442 return c;
2382} 2443}
2383 2444
2384uint32_t 2445uint32_t ecb_hot
2385rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2386{ 2447{
2387 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2388 2449
2389 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2393} 2454}
2394 2455
2395/*{{{ print pipe */ 2456/*{{{ print pipe */
2396/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2397#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2398FILE * 2459FILE * ecb_cold
2399rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2400{ 2461{
2401 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2402 2463
2403 if (stream == NULL) 2464 if (stream == NULL)
2404 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2405 2466
2406 return stream; 2467 return stream;
2407} 2468}
2408 2469
2409int 2470int ecb_cold
2410rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2411{ 2472{
2412 fflush (stream); 2473 fflush (stream);
2413 return pclose (stream); 2474 return pclose (stream);
2414} 2475}
2415 2476
2416/* 2477/*
2417 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2418 */ 2479 */
2419void 2480void ecb_cold
2420rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2421{ 2482{
2422 FILE *fd = popen_printer (); 2483 FILE *fd = popen_printer ();
2423 2484
2424 if (!fd) 2485 if (!fd)
… …
2470 pclose_printer (fd); 2531 pclose_printer (fd);
2471} 2532}
2472#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2473/*}}} */ 2534/*}}} */
2474 2535
2475/* *INDENT-OFF* */
2476enum { 2536enum {
2477 C1_40 = 0x40, 2537 C1_40 = 0x40,
2478 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2479 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2480 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2481 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2482}; 2542};
2483/* *INDENT-ON* */
2484 2543
2485/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2486void 2545void ecb_hot
2487rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2488{ 2547{
2489 switch (ch) 2548 switch (ch)
2490 { 2549 {
2491 case C0_ESC: 2550 case C0_ESC:
… …
2537} 2596}
2538/*}}} */ 2597/*}}} */
2539 2598
2540 2599
2541/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2542void 2601void ecb_cold
2543rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2544{ 2603{
2545 int row, col; 2604 int row, col;
2546 2605
2547 switch (ch) 2606 switch (ch)
… …
2581 break; 2640 break;
2582 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2584 break; 2643 break;
2585 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2586 set_privmode (PrivMode_vt52, 0); 2645 priv_modes &= ~PrivMode_vt52;
2587 break; 2646 break;
2588 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2589 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2590 /* unimplemented */ 2649 /* unimplemented */
2591 break; 2650 break;
… …
2597} 2656}
2598/*}}} */ 2657/*}}} */
2599 2658
2600 2659
2601/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2602void 2661void ecb_hot
2603rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2604{ 2663{
2605 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2606 2665
2607 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2610 return; 2669 return;
2611 } 2670 }
2612 2671
2613 switch (ch) 2672 switch (ch)
2614 { 2673 {
2615 /* case 1: do_tek_mode (); break; */
2616 case '#': 2674 case '#':
2617 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2618 scr_E (); 2676 scr_E ();
2619 break; 2677 break;
2620 case '(': 2678 case '(':
… …
2643#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
2644 case '9': 2702 case '9':
2645 scr_forwardindex (); 2703 scr_forwardindex ();
2646 break; 2704 break;
2647#endif 2705#endif
2706 // DECPAM/DECPNM
2648 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2649 case '>': 2710 case '>':
2650 set_privmode (PrivMode_aplKP, ch == '='); 2711 priv_modes &= ~PrivMode_aplKP;
2651 break; 2712 break;
2652 2713
2653 case C1_40: 2714 case C1_40:
2654 cmd_getc (); 2715 cmd_getc ();
2655 break; 2716 break;
… …
2659 2720
2660 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
2661 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
2662 { 2723 {
2663 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
2664 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2665 } 2726 }
2666 break; 2727 break;
2667 2728
2668 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
2669 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
2670 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2671 break; 2734 break;
2672 2735
2673 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
2674 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
2675 scr_set_tab (1); 2738 scr_set_tab (1);
… …
2679 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
2680 scr_index (DN); 2743 scr_index (DN);
2681 break; 2744 break;
2682 2745
2683 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
2684 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
2685 2748
2686 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
2687 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
2688 2751
2689 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
2690 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
2691 process_dcs_seq (); 2754 process_dcs_seq ();
2692 break; 2755 break;
… …
2694 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2757 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2695 case C1_SCI: /* ESC Z */ 2758 case C1_SCI: /* ESC Z */
2696 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2759 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2697 break; /* steal obsolete ESC [ c */ 2760 break; /* steal obsolete ESC [ c */
2698 2761
2699 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2762 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2700 case C1_CSI: /* ESC [ */ 2763 case C1_CSI: /* ESC [ */
2701 process_csi_seq (); 2764 process_csi_seq ();
2702 break; 2765 break;
2703 2766
2704 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2767 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2705 case C1_OSC: /* ESC ] */ 2768 case C1_OSC: /* ESC ] */
2706 process_osc_seq (); 2769 process_osc_seq ();
2707 break; 2770 break;
2708 2771
2709 /* 8.3.106: RESET TO INITIAL STATE */ 2772 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2710 case 'c': 2773 case 'c':
2711 mbstate.reset (); 2774 mbstate.reset ();
2712 scr_poweron (); 2775 scr_poweron ();
2713 scrollBar.show (1); 2776 scrollBar.show (1);
2714 break; 2777 break;
… …
2725 } 2788 }
2726} 2789}
2727/*}}} */ 2790/*}}} */
2728 2791
2729/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2730/* *INDENT-OFF* */
2731enum { 2793enum {
2732 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
2733 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2734 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2735 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2738 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2739 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2740 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2741}; 2803};
2742 2804
2743#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2744 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2745 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2746#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
2747 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2748 2810
2749const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
2750 { 2812 {
2751 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2752 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2753 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2754 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2755 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2756 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2757 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2758 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2759 }; 2821 };
2760/* *INDENT-ON* */
2761 2822
2762void 2823void ecb_hot
2763rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2764{ 2825{
2765 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2766 unsigned int nargs, p; 2827 unsigned int nargs, p;
2767 int n, ndef; 2828 int n, ndef;
2768 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2769 2830
2770 nargs = 0; 2831 nargs = 0;
2771 2832
2772 priv = 0; 2833 priv = 0;
2773 ch = cmd_getc (); 2834 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2835 if ((ch >= '<' && ch <= '?') || ch == '!')
2775 { 2836 {
2776 /* '<' '=' '>' '?' */ 2837 /* '<' '=' '>' '?' '!' */
2777 priv = ch; 2838 priv = ch;
2778 ch = cmd_getc (); 2839 ch = cmd_getc ();
2779 } 2840 }
2780 2841
2842 prev_ch = 0;
2781 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2782 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2783 { 2845 {
2784 if (isdigit (ch)) 2846 if (isdigit (ch))
2785 { 2847 {
… …
2795 n = -1; 2857 n = -1;
2796 } 2858 }
2797 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2798 process_nonprinting (ch); 2860 process_nonprinting (ch);
2799 2861
2862 prev_ch = ch;
2800 ch = cmd_getc (); 2863 ch = cmd_getc ();
2801 } 2864 }
2802 2865
2803 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2804 return; 2867 return;
… …
2835 2898
2836 case '?': 2899 case '?':
2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2838 process_terminal_mode (ch, priv, nargs, arg); 2901 process_terminal_mode (ch, priv, nargs, arg);
2839 break; 2902 break;
2903
2904 case '!':
2905 if (ch == CSI_70)
2906 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset ();
2909
2910 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2912
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2840 } 2915 }
2916 break;
2917 }
2918
2841 return; 2919 return;
2842 } 2920 }
2843 2921
2844 switch (ch) 2922 switch (ch)
2845 { 2923 {
… …
2859 } 2937 }
2860 break; 2938 break;
2861#endif 2939#endif
2862 2940
2863 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2864 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2865 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2866 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2867 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2868 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2869 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2870 break; 2948 break;
2871 2949
2872 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2873 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3023 scr_insert_mode (1); 3101 scr_insert_mode (1);
3024 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3025 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3026 break; 3104 break;
3027 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3028 /* 3111 /*
3029 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3030 */ 3113 */
3031 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3032 if (nargs == 1) 3115 if (nargs == 1)
… …
3060 } 3143 }
3061} 3144}
3062/*}}} */ 3145/*}}} */
3063 3146
3064#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3065/* ARGSUSED */
3066void 3148void
3067rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3068{ 3150{
3069 int x, y; 3151 int x, y;
3070 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3079 { 3161 {
3080 /* 3162 /*
3081 * commands 3163 * commands
3082 */ 3164 */
3083 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3084 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3085 break; 3167 break;
3086 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3087 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3088 break; 3170 break;
3089 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3090 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3091 break; 3173 break;
3092 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3093 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3094 break; 3176 break;
3095 case 5: /* raise window */ 3177 case 5: /* raise window */
3096 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3097 break; 3179 break;
3098 case 6: /* lower window */ 3180 case 6: /* lower window */
3099 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3100 break; 3182 break;
3101 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3102 scr_touch (true); 3184 scr_touch (true);
3103 break; 3185 break;
3104 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3107 break; 3189 break;
3108 3190
3109 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3110 default: 3192 default:
3111 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3112 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3113 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3114 break; 3196 break;
3115 3197
3116 /* 3198 /*
3117 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3118 */ 3200 */
3119 case 11: /* report window state */ 3201 case 11: /* report window state */
3120 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3121 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3122 break; 3204 break;
3123 case 13: /* report window position */ 3205 case 13: /* report window position */
3124 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3125 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3126 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3127 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3128 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3129 break; 3211 break;
3130 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3131 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3132 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3133 break; 3215 break;
3134 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3135 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3136 break; 3218 break;
… …
3138 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3139 break; 3221 break;
3140 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3141 { 3223 {
3142 char *s; 3224 char *s;
3143 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3144 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3145 XFree (s); 3227 XFree (s);
3146 } 3228 }
3147 break; 3229 break;
3148 case 21: /* report window title */ 3230 case 21: /* report window title */
3149 { 3231 {
3150 char *s; 3232 char *s;
3151 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3152 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3153 XFree (s); 3235 XFree (s);
3154 } 3236 }
3155 break; 3237 break;
3156 } 3238 }
… …
3166rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3167{ 3249{
3168 unicode_t ch; 3250 unicode_t ch;
3169 bool seen_esc = false; 3251 bool seen_esc = false;
3170 unsigned int n = 0; 3252 unsigned int n = 0;
3171 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3172 3254
3173 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3174 { 3256 {
3175 if (seen_esc) 3257 if (seen_esc)
3176 { 3258 {
… …
3191 else if (ch < 0x20) 3273 else if (ch < 0x20)
3192 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3193 3275
3194 seen_esc = false; 3276 seen_esc = false;
3195 3277
3196 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3197 // stop at some sane length 3279 // stop at some sane length
3198 return NULL; 3280 return NULL;
3199 3281
3200 string[n++] = ch; 3282 string[n++] = ch;
3201 } 3283 }
… …
3212 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3294 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3213 */ 3295 */
3214void 3296void
3215rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3216{ 3298{
3217 char *s;
3218 unicode_t eh;
3219
3220 /* 3299 /*
3221 * Not handled yet 3300 * Not handled yet
3222 */ 3301 */
3302
3303 unicode_t eh;
3223 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3224 if (s) 3305 if (s)
3225 free (s); 3306 free (s);
3226 3307
3227 return; 3308 return;
3228} 3309}
… …
3232 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3233 */ 3314 */
3234void 3315void
3235rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3236{ 3317{
3237 unicode_t ch, eh;
3238 int arg; 3318 int arg;
3239 3319
3240 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3241 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3242 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3243 3323
3244 if (ch == ';') 3324 if (ch == ';')
3245 { 3325 {
3326 unicode_t eh;
3246 char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3247 3328
3248 if (s) 3329 if (s)
3249 { 3330 {
3250 process_xterm_seq (arg, s, eh); 3331 process_xterm_seq (arg, s, eh);
… …
3274 3355
3275/* 3356/*
3276 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3277 */ 3358 */
3278void 3359void
3279rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3360rxvt_term::process_xterm_seq (int op, char *str, char resp)
3280{ 3361{
3281 int color; 3362 int color;
3282 char *buf, *name; 3363 char *buf, *name;
3283 bool query = str[0] == '?' && !str[1]; 3364 bool query = str[0] == '?' && !str[1];
3284 int saveop = op; 3365 int saveop = op;
… …
3311 unsigned long bytes_after; 3392 unsigned long bytes_after;
3312 unsigned char *value = 0; 3393 unsigned char *value = 0;
3313 const char *str = ""; 3394 const char *str = "";
3314 3395
3315 if (prop 3396 if (prop
3316 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3317 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3318 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3319 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3320 && actual_type != None 3401 && actual_type != None
3321 && actual_format == 8) 3402 && actual_format == 8)
3322 str = (const char *)(value); 3403 str = (const char *)(value);
3323 3404
3324 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3325 3406
3326 XFree (value); 3407 XFree (value);
3327 } 3408 }
3328 else 3409 else
3329 { 3410 {
3330 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3411 char *eq = strchr (str, '=');
3331 3412
3332 if (eq) 3413 if (eq)
3333 { 3414 {
3334 *eq = 0; 3415 *eq = 0;
3335 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3336 } 3417 }
3337 else 3418 else
3338 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3339 display->atom (str)); 3420 display->atom (str));
3340 } 3421 }
3341 break; 3422 break;
3342 3423
3343 case XTerm_Color: 3424 case XTerm_Color:
… …
3375 process_color_seq (op, Color_pointer_fg, str, resp); 3456 process_color_seq (op, Color_pointer_fg, str, resp);
3376 break; 3457 break;
3377 case XTerm_Color_pointer_bg: 3458 case XTerm_Color_pointer_bg:
3378 process_color_seq (op, Color_pointer_bg, str, resp); 3459 process_color_seq (op, Color_pointer_bg, str, resp);
3379 break; 3460 break;
3461#ifdef OPTION_HC
3462 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp);
3464 break;
3465 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp);
3467 break;
3468#endif
3380#ifndef NO_BOLD_UNDERLINE_REVERSE 3469#ifndef NO_BOLD_UNDERLINE_REVERSE
3381 case XTerm_Color_RV:
3382 process_color_seq (op, Color_RV, str, resp);
3383 break;
3384 case Rxvt_Color_BD:
3385 case URxvt_Color_BD: 3470 case URxvt_Color_BD:
3386 process_color_seq (op, Color_BD, str, resp); 3471 process_color_seq (op, Color_BD, str, resp);
3387 break; 3472 break;
3388 case Rxvt_Color_UL:
3389 case URxvt_Color_UL: 3473 case URxvt_Color_UL:
3390 process_color_seq (op, Color_UL, str, resp); 3474 process_color_seq (op, Color_UL, str, resp);
3391 break; 3475 break;
3392 case URxvt_Color_IT: 3476 case URxvt_Color_IT:
3393 process_color_seq (op, Color_IT, str, resp); 3477 process_color_seq (op, Color_IT, str, resp);
3394 break; 3478 break;
3395#endif 3479#endif
3396#if ENABLE_TRANSPARENCY 3480 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp);
3482 break;
3483
3484#if BG_IMAGE_FROM_ROOT
3397 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3398 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3399 { 3487 {
3400 bool changed = false; 3488 bool changed = false;
3401 3489
3402 if (ISSET_PIXCOLOR (Color_tint)) 3490 if (ISSET_PIXCOLOR (Color_tint))
3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3404 else
3405 changed = bgPixmap.unset_tint ();
3406 3492
3407 if (changed) 3493 if (changed)
3408 update_background (); 3494 update_background ();
3409 } 3495 }
3410 3496
… …
3414#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3415 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3416 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3417 { 3503 {
3418 char str[256]; 3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3419 3509
3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3510 sprintf (str, "[%dx%d+%d+%d]",
3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3511 h_scale, v_scale,
3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3512 h_align, v_align);
3423 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3424 } 3514 }
3425 else 3515 else
3426 { 3516 {
3427 int changed = 0; 3517 bool changed = false;
3428 3518
3429 if (*str != ';') 3519 if (*str != ';')
3430 { 3520 {
3431 /* reset to default scaling :*/ 3521 try
3432 bgPixmap.unset_geometry (); 3522 {
3433 if (bgPixmap.set_file (str)) /* change pixmap */ 3523 fimage.set_file_geometry (this, str);
3434 changed++; 3524 changed = true;
3435 str = strchr (str, ';'); 3525 }
3436 if (str == NULL) 3526 catch (const class rxvt_failure_exception &e)
3437 bgPixmap.set_defaultGeometry (); 3527 {
3528 }
3438 } 3529 }
3439 3530 else
3440 while (str)
3441 { 3531 {
3442 str++; 3532 str++;
3443 if (bgPixmap.set_geometry (str)) 3533 if (fimage.set_geometry (str, true))
3444 changed++; 3534 changed = true;
3445 str = strchr (str, ';');
3446 } 3535 }
3447 3536
3448 if (changed) 3537 if (changed)
3538 {
3539 if (bg_window_position_sensitive ())
3540 {
3541 int x, y;
3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3449 update_background (); 3546 update_background ();
3547 }
3450 } 3548 }
3451 break; 3549 break;
3452#endif 3550#endif
3453 3551
3454 case XTerm_logfile: 3552 case XTerm_logfile:
… …
3541 * 's' = save 3639 * 's' = save
3542 * 'r' = restore 3640 * 'r' = restore
3543 * 't' = toggle 3641 * 't' = toggle
3544 * so no need for fancy checking 3642 * so no need for fancy checking
3545 */ 3643 */
3546int 3644int ecb_cold
3547rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3548{ 3646{
3549 int state; 3647 int state;
3550 3648
3551 if (mode == 's') 3649 if (mode == 's')
3552 { 3650 {
3553 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3554 return -1; 3655 return -1;
3555 } 3656 }
3556 else 3657 else
3557 { 3658 {
3558 if (mode == 'r') 3659 if (mode == 'r')
3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3560 else 3661 else
3561 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3562 set_privmode (bit, state); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3563 } 3668 }
3564 3669
3565 return state; 3670 return state;
3566} 3671}
3567 3672
3568/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3569void 3674void
3570rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3571{ 3676{
3572 unsigned int i, j; 3677 unsigned int i, j;
3573 int state; 3678 int state;
3574 3679
3575 static const struct 3680 static const struct
3576 { 3681 {
3577 const int argval; 3682 const int argval;
3578 const unsigned long bit; 3683 const unsigned long bit;
3579 } argtopriv[] = { 3684 } argtopriv[] = {
3580 { 1, PrivMode_aplCUR }, 3685 { 1, PrivMode_aplCUR }, // DECCKM
3581 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3582 { 3, PrivMode_132 }, 3687 { 3, PrivMode_132 }, // DECCOLM
3583 { 4, PrivMode_smoothScroll }, 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3584 { 5, PrivMode_rVideo }, 3689 { 5, PrivMode_rVideo }, // DECSCNM
3585 { 6, PrivMode_relOrigin }, 3690 { 6, PrivMode_relOrigin }, // DECOM
3586 { 7, PrivMode_Autowrap }, 3691 { 7, PrivMode_Autowrap }, // DECAWM
3587 // 8, bi-directional support mode 3692 // 8, auto-repeat keys // DECARM
3588 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3589 // 18, 19 printing-related 3694 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region
3590 { 25, PrivMode_VisibleCursor }, 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3591#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3592 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3593#endif 3699#endif
3594 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3701 // 38, tektronix mode // DECTEK
3595 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3596 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3597 // 45 margin bell NYI 3704 // 45 margin bell NYI
3598 // 46 start logging 3705 // 46 start logging
3599 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3600 { 66, PrivMode_aplKP }, 3707 { 66, PrivMode_aplKP }, // DECNKM
3601#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3602 { 67, PrivMode_BackSpace }, 3709 { 67, PrivMode_BackSpace }, // DECBKM
3603#endif 3710#endif
3604 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3605 { 1002, PrivMode_MouseBtnEvent }, 3712 { 1002, PrivMode_MouseBtnEvent },
3606 { 1003, PrivMode_MouseAnyEvent }, 3713 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
3607 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3608 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
3609 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
3610 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
3611 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
3612 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
3613 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
3614 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3615 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3616 { 2004, PrivMode_BracketPaste }, 3729 { 2004, PrivMode_BracketPaste },
3617 }; 3730 };
3618 3731
… …
3628 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3629 { 3742 {
3630 state = -1; 3743 state = -1;
3631 3744
3632 /* basic handling */ 3745 /* basic handling */
3633 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3634 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3635 { 3748 {
3636 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3637 break; 3750 break;
3638 } 3751 }
… …
3646 3759
3647 scr_touch (true); 3760 scr_touch (true);
3648 break; 3761 break;
3649#endif 3762#endif
3650 case 1048: /* alternative cursor save */ 3763 case 1048: /* alternative cursor save */
3651 case 1049:
3652 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3653 if (mode == 0) 3765 if (mode == 0)
3654 scr_cursor (RESTORE); 3766 scr_cursor (RESTORE);
3655 else if (mode == 1) 3767 else if (mode == 1)
3656 scr_cursor (SAVE); 3768 scr_cursor (SAVE);
… …
3665 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3666 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3667 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3668 * within VT52 mode 3780 * within VT52 mode
3669 */ 3781 */
3670 set_privmode (PrivMode_vt52, 1); 3782 priv_modes |= PrivMode_vt52;
3671 break; 3783 break;
3672 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3673 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3674 {
3675 scr_poweron ();
3676 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677 }
3678 break; 3787 break;
3679 case 4: /* smooth scrolling */ 3788 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3789 set_option (Opt_jumpScroll, !state);
3681 break; 3790 break;
3682 case 5: /* reverse video */ 3791 case 5: /* reverse video */
… …
3693 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3804 break;
3696#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
3697 case scrollBar_esc: 3806 case scrollBar_esc:
3698 if (scrollBar.map (state)) 3807 scrollBar.map (state);
3699 {
3700 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
3701 scr_touch (true); 3809 scr_touch (true);
3702 }
3703 break; 3810 break;
3704#endif 3811#endif
3705 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3706 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3707 break; 3814 break;
… …
3720 case 1003: 3827 case 1003:
3721 if (state) 3828 if (state)
3722 { 3829 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3725 vt_emask_mouse = PointerMotionMask; 3833 vt_emask_mouse = PointerMotionMask;
3726 } 3834 }
3727 else 3835 else
3728 vt_emask_mouse = NoEventMask; 3836 vt_emask_mouse = NoEventMask;
3837
3729 vt_select_input (); 3838 vt_select_input ();
3730 break; 3839 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3841 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3842 break;
3734 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3844 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3845 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3847 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3848 if (!state)
3740 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
3741 scr_change_screen (state); 3851 scr_change_screen (state);
3742 break; 3852 break;
3743 case 1049: /* secondary screen w/ clearing first */ 3853 case 1049: /* secondary screen w/ clearing first */
3854 if (option (Opt_secondaryScreen))
3855 if (state)
3856 scr_cursor (SAVE);
3857
3744 scr_change_screen (state); 3858 scr_change_screen (state);
3859
3745 if (option (Opt_secondaryScreen)) 3860 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3861 if (state)
3747 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
3748 break; 3865 break;
3749 default: 3866 default:
3750 break; 3867 break;
3751 } 3868 }
3752 } 3869 }
3753} 3870}
3754/*}}} */ 3871/*}}} */
3755 3872
3756/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3757void 3874void ecb_hot
3758rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3759{ 3876{
3760 unsigned int i; 3877 unsigned int i;
3761 short rendset; 3878 short rendset;
3762 int rendstyle; 3879 int rendstyle;
… …
3903 break; 4020 break;
3904#endif 4021#endif
3905 } 4022 }
3906 } 4023 }
3907} 4024}
3908/*}}} */
3909 4025
3910/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3911void 4026void
3912rxvt_term::process_graphics () 4027rxvt_term::set_cursor_style (int style)
3913{ 4028{
3914 unicode_t ch, cmd = cmd_getc (); 4029 if (!IN_RANGE_INC (style, 0, 4))
3915
3916 if (cmd == 'Q')
3917 {
3918 /* query graphics */
3919 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4030 return;
3921 } 4031
3922 /* swallow other graphics sequences until terminating ':' */ 4032 set_option (Opt_cursorUnderline, style >= 3);
3923 do 4033
3924 ch = cmd_getc (); 4034#ifdef CURSOR_BLINK
3925 while (ch != ':'); 4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
3926} 4040}
3927/*}}} */ 4041/*}}} */
3928 4042
3929/* ------------------------------------------------------------------------- */ 4043/* ------------------------------------------------------------------------- */
3930 4044
… …
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4056 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4057 va_end (arg_ptr);
3944 tt_write (buf, strlen (buf)); 4058 tt_write (buf, strlen (buf));
3945} 4059}
3946 4060
4061/* Write data to the pty as typed by the user. */
4062void
4063rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4064{
4065 if (option (Opt_scrollTtyKeypress))
4066 if (view_start)
4067 {
4068 view_start = 0;
4069 want_refresh = 1;
4070 }
4071
4072 tt_write (data, len);
4073}
4074
3947/* ---------------------------------------------------------------------- */ 4075/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4076/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4077 * or generated by us in response to a query ESC sequence.
3950 */ 4078 */
3951const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4079static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3952 4080
3953void 4081void
3954rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
3955{ 4083{
3956 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3961 4089
3962 if (v_buflen == 0) 4090 if (v_buflen == 0)
3963 { 4091 {
3964 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4092 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3965 4093
4094 max_it (written, 0);
4095
3966 if ((unsigned int)written == len) 4096 if (written == len)
3967 return; 4097 return;
3968 4098
3969 data += written; 4099 data += written;
3970 len -= written; 4100 len -= written;
3971 } 4101 }
3972 4102
3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4103 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3974 4104
3975 memcpy (v_buffer + v_buflen, data, len); 4105 memcpy (v_buffer + v_buflen, data, len);
3976 v_buflen += len; 4106 v_buflen += len;
3977 4107
3978 pty_ev.set (ev::READ | ev::WRITE); 4108 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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