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.412 by ayin, Sun Feb 17 11:13:11 2008 UTC vs.
Revision 1.547 by sf-exg, Tue Apr 29 12:51:41 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)) 882 if (option (Opt_scrollTtyKeypress))
… …
823 { 884 {
824 view_start = 0; 885 view_start = 0;
825 want_refresh = 1; 886 want_refresh = 1;
826 } 887 }
827 888
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); 889 tt_write (kbuf, (unsigned int)len);
854} 890}
855 891
856void 892void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 893rxvt_term::key_release (XKeyEvent &ev)
858{ 894{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 896 KeySym keysym;
861 897
… …
881 commit_iso14755 (); 917 commit_iso14755 ();
882 918
883 return; 919 return;
884 } 920 }
885 921
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 922 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 923 if (i[0] == keysym)
888 { 924 {
889 iso14755buf = ISO_14755_51 | i[1]; 925 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 926 commit_iso14755 ();
891 927
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 964 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 965 mouse_slip_wheel_speed = 0;
930#endif 966#endif
931} 967}
932 968
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 969void
967rxvt_term::flush () 970rxvt_term::flush ()
968{ 971{
969 flush_ev.stop (); 972 flush_ev.stop ();
970 973
971#ifdef HAVE_BG_PIXMAP 974#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 975 if (bg_flags & BG_NEEDS_REFRESH)
973 { 976 {
974// scr_clear (true); This needs to be researched further! 977 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 978 scr_touch (false);
976 } 979 }
977#endif 980#endif
978 981
979 if (want_refresh) 982 if (want_refresh)
… …
1015 } 1018 }
1016 while (row < end_row); 1019 while (row < end_row);
1017 } 1020 }
1018 1021
1019 scr_refresh (); 1022 scr_refresh ();
1020 scrollbar_show (1); 1023 scrollBar.show (1);
1021#ifdef USE_XIM 1024#if USE_XIM
1022 IMSendSpot (); 1025 im_send_spot ();
1023#endif 1026#endif
1024 } 1027 }
1025 1028
1026 display->flush (); 1029 display->flush ();
1027} 1030}
1028 1031
1029/* checks wether a refresh is requested and starts the refresh timer */ 1032/* checks whether a refresh is requested and starts the refresh timer */
1030void 1033void
1031rxvt_term::refresh_check () 1034rxvt_term::refresh_check ()
1032{ 1035{
1033 if (want_refresh && !flush_ev.is_active ()) 1036 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1047 refresh_count = 0;
1045 flush (); 1048 flush ();
1046} 1049}
1047 1050
1048#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1052void
1053rxvt_term::cursor_blink_reset ()
1054{
1055 if (hidden_cursor)
1056 {
1057 hidden_cursor = 0;
1058 want_refresh = 1;
1059 }
1060
1061 if (option (Opt_cursorBlink))
1062 cursor_blink_ev.again ();
1063 else
1064 cursor_blink_ev.stop ();
1065}
1066
1049void 1067void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1069{
1052 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1071 want_refresh = 1;
… …
1072 1090
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1092void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1094{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1097 {
1080 want_refresh = 1; 1098 want_refresh = 1;
1081 refresh_check (); 1099 refresh_check ();
1082 } 1100 }
1083 else 1101 else
… …
1087 1105
1088#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1089void 1107void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1109{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1093 { 1111 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1113 want_refresh = 1;
1096 refresh_check (); 1114 refresh_check ();
1097 } 1115 }
… …
1102 1120
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1122void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1124{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1125 if (scr_page (mouse_slip_wheel_speed))
1108 { 1126 {
1109 want_refresh = 1; 1127 want_refresh = 1;
1110 refresh_check (); 1128 refresh_check ();
1111 } 1129 }
1112 1130
… …
1127 { 1145 {
1128 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1147 // 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 1148 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
1150 // since the linux guys additionally thought that breaking the only
1151 // known workaround against their unusable sched_yield hack is cool,
1152 // we just nanosleep a bit and hope for the best.
1132 1153
1133 struct timespec ts = { 0, 0 }; 1154 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1155 nanosleep (&ts, 0);
1135 1156
1136 w.stop (); 1157 w.stop ();
1137 } 1158 }
1138 1159
… …
1141 { 1162 {
1142 } 1163 }
1143} event_handler; 1164} event_handler;
1144#endif 1165#endif
1145 1166
1167/* make sure all the cmd data is at beginning of cmdbuf */
1168void
1169rxvt_term::cmdbuf_reify ()
1170{
1171 if (cmdbuf_ptr == cmdbuf_base)
1172 return;
1173
1174 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1175
1176 memmove (cmdbuf_base, cmdbuf_ptr, used);
1177 cmdbuf_ptr = cmdbuf_base;
1178 cmdbuf_endp = cmdbuf_ptr + used;
1179
1180}
1181
1182#if defined (KEYSYM_RESOURCE)
1183void
1184rxvt_term::cmdbuf_append (const char *str, size_t count)
1185{
1186 cmdbuf_reify ();
1187
1188 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1189
1190 if (count > avail)
1191 return;
1192
1193 memcpy (cmdbuf_endp, str, count);
1194 cmdbuf_endp += count;
1195
1196 cmd_parse ();
1197}
1198#endif
1199
1146bool 1200bool
1147rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1148{ 1202{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1150 1204
1151 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1206
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1154 n = 0;
1155 } 1208 {
1156 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1160 1214
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1216
1163 if (r > 0) 1217 if (r > 0)
1164 { 1218 {
1165 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1166 return true; 1220 return true;
… …
1188{ 1242{
1189 make_current (); 1243 make_current ();
1190 1244
1191 if (revents & ev::READ) 1245 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1246 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1247 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1248 cmd_parse ();
1195 break;
1196 1249
1197 if (revents & ev::WRITE) 1250 if (revents & ev::WRITE)
1198 pty_write (); 1251 pty_write ();
1199 1252
1200 refresh_check (); 1253 refresh_check ();
1201} 1254}
1202 1255
1203void 1256void ecb_cold
1204rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1205{ 1258{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1260 recolour_cursor ();
1208 1261
… …
1213 pointer_ev.start (pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1214#endif 1267#endif
1215} 1268}
1216 1269
1217#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1218void 1271void ecb_cold
1219rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1220{ 1273{
1221 if (!option (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1222 return; 1275 return;
1223 1276
… …
1225 XFlush (dpy); 1278 XFlush (dpy);
1226 1279
1227 hidden_pointer = 1; 1280 hidden_pointer = 1;
1228} 1281}
1229 1282
1230void 1283void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1285{
1233 make_current (); 1286 make_current ();
1234 1287
1235 pointer_blank (); 1288 pointer_blank ();
… …
1241{ 1294{
1242 int button_number, key_state = 0; 1295 int button_number, key_state = 0;
1243 int x, y; 1296 int x, y;
1244 int code = 32; 1297 int code = 32;
1245 1298
1246 x = Pixel2Col (ev.x); 1299 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1300 y = Pixel2Row (ev.y) + 1;
1301
1248 if (ev.type == MotionNotify) 1302 if (ev.type == MotionNotify)
1249 { 1303 {
1250 if (x == mouse_row && y == mouse_col) 1304 if (x == mouse_row && y == mouse_col)
1251 return; 1305 return;
1306
1252 mouse_row = x; 1307 mouse_row = x;
1253 mouse_col = y; 1308 mouse_col = y;
1254 code += 32; 1309 code += 32;
1255 } 1310 }
1256 1311
… …
1259 else 1314 else
1260 { 1315 {
1261 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1318 if (button_number >= 3)
1264 button_number += (64 - 3); 1319 button_number += 64 - 3;
1265 } 1320 }
1266 1321
1267 if (priv_modes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1268 { 1323 {
1269 /* 1324 /*
… …
1301 fputc ('A', stderr); 1356 fputc ('A', stderr);
1302 if (key_state & 32) 1357 if (key_state & 32)
1303 fputc ('2', stderr); 1358 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1360 button_number,
1306 x + 1, 1361 x,
1307 y + 1); 1362 y);
1308#endif 1363#endif
1309 1364
1365#if ENABLE_FRILLS
1366 if (priv_modes & PrivMode_ExtMouseRight)
1367 tt_printf ("\033[%d;%d;%dM",
1368 code + button_number + key_state,
1369 x,
1370 y);
1371 else if (priv_modes & PrivMode_ExtModeMouse)
1372 tt_printf ("\033[M%c%lc%lc",
1373 code + button_number + key_state,
1374 wint_t (32 + x),
1375 wint_t (32 + y));
1376 else
1377#endif
1310 tt_printf ("\033[M%c%c%c", 1378 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1379 code + button_number + key_state,
1312 (32 + x + 1), 1380 32 + x,
1313 (32 + y + 1)); 1381 32 + y);
1314} 1382}
1315 1383
1316/*{{{ process an X event */ 1384/*{{{ process an X event */
1317void 1385void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1319{ 1387{
1320 make_current (); 1388 make_current ();
1321 1389
1322 dLocal (Display *, dpy); 1390 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1488 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1489 focus_out ();
1422 break; 1490 break;
1423 1491
1424 case ConfigureNotify: 1492 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1429 { 1494 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1496 ;
1497
1498 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1499
1500 bool moved = false;
1501#ifdef HAVE_BG_PIXMAP
1502 if (bg_window_position_sensitive ())
1503 {
1504 want_position_change = true;
1505 if (bg_img == 0)
1506 moved = true;
1507 }
1508#endif
1509
1510 if (want_position_change)
1511 {
1512 int x, y;
1513
1514 if (ev.xconfigure.send_event)
1515 {
1516 x = ev.xconfigure.x;
1517 y = ev.xconfigure.y;
1518 }
1519 else
1520 get_window_origin (x, y);
1521
1522 if (x != parent_x || y != parent_y)
1523 {
1524 parent_x = x;
1525 parent_y = y;
1526 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1527 moved = true;
1528 }
1529 }
1432 1530
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1532 {
1435 seen_resize = 1; 1533 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1535 }
1438 else 1536 else
1439 { 1537 {
1440#ifdef HAVE_BG_PIXMAP 1538#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1539 if (moved)
1444 update_background (); 1540 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1541#endif
1449 } 1542 }
1450 1543
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1545 }
1453 break; 1546 break;
1454 1547
1455 case PropertyNotify: 1548 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1550 break;
1462 1551
1463 case SelectionClear: 1552 case SelectionClear:
1464 selection_clear (); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1554 break;
1471 1555
1472 case SelectionRequest: 1556 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1474 break; 1558 break;
1475 1559
1476 case MapNotify: 1560 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1561#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1562 // This is needed at startup for the case of no window manager
1479 * non-reparenting window manager. In those cases we never get first 1563 // or a non-reparenting window manager and also because we
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1564 // defer bg image updates if the window is not mapped. The
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1565 // short delay is to optimize for multiple ConfigureNotify
1482 * reparenting. 1566 // events at startup when the window manager reparents the
1483 * We should not render background immidiately, as there could be several 1567 // window, so as to perform the computation after we have
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1568 // received all of them.
1485 * by scheduling background redraw as soon as we can, but giving a short 1569 if (bg_img == 0)
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025); 1570 update_background_ev.start (0.025);
1492#endif 1571#endif
1493 mapped = 1; 1572 mapped = 1;
1494#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1574 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1511 { 1590 {
1512 do 1591 do
1513 { 1592 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1595 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1597
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1599
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1601 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1604 }
1526 1605
1527 want_refresh = 1; 1606 want_refresh = 1;
1528 } 1607 }
1529 else 1608 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1615 ;
1537 1616
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1618 {
1540 scrollBar.state = STATE_IDLE; 1619 scrollBar.state = SB_STATE_IDLE;
1541 scrollbar_show (0); 1620 scrollBar.show (0);
1542 } 1621 }
1543 } 1622 }
1544 break; 1623 break;
1545 1624
1546 case MotionNotify: 1625 case MotionNotify:
… …
1587 1666
1588#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1589 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1590 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1591 { 1670 {
1671 page_dirn scroll_selection_dir;
1592 int dist; 1672 int dist;
1593 1673
1594 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1595 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1596 */ 1676 */
… …
1611 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1612 } 1692 }
1613 else 1693 else
1614 { 1694 {
1615 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1697 }
1618 1698
1619 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1701 + 1;
1622 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1623 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1624 } 1705 }
1625 else 1706 else
1626 { 1707 {
1627 /* we are within the text window, so we 1708 /* we are within the text window, so we
1628 * shouldn't be scrolling 1709 * shouldn't be scrolling
… …
1633#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1634 } 1715 }
1635#endif 1716#endif
1636 } 1717 }
1637 } 1718 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1720 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1642 ; 1723 ;
1643 1724
1644 XQueryPointer (dpy, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1729 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1731 scrollBar.size ());
1651 want_refresh = 1; 1732 want_refresh = 1;
1652 scrollbar_show (1); 1733 scrollBar.show (1);
1653 } 1734 }
1654 break; 1735 break;
1655 } 1736 }
1656 1737
1657#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1740 cursor_blink_reset ();
1667 }
1668#endif 1741#endif
1669 1742
1670#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1745 {
… …
1682#endif 1755#endif
1683 1756
1684 refresh_check (); 1757 refresh_check ();
1685} 1758}
1686 1759
1687void 1760#if ENABLE_FRILLS
1761void ecb_cold
1762rxvt_term::set_urgency (bool enable)
1763{
1764 if (enable == urgency_hint)
1765 return;
1766
1767 if (XWMHints *h = XGetWMHints (dpy, parent))
1768 {
1769 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1770 XSetWMHints (dpy, parent, h);
1771 urgency_hint = enable;
1772 XFree (h);
1773 }
1774}
1775#endif
1776
1777void ecb_cold
1688rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1689{ 1779{
1690 if (!focus) 1780 if (!focus)
1691 { 1781 {
1692 focus = 1; 1782 focus = 1;
1693 want_refresh = 1; 1783 want_refresh = 1;
1694 1784
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1785#if USE_XIM
1698 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1699 { 1787 {
1700 IMSetPosition (); 1788 im_set_position ();
1701 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1702 } 1790 }
1703#endif 1791#endif
1704#if CURSOR_BLINK 1792#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1800 scr_recolour ();
1713 } 1801 }
1714#endif 1802#endif
1715#if ENABLE_FRILLS 1803#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1804 if (option (Opt_urgentOnBell))
1717 { 1805 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1806#endif
1725 }
1726}
1727 1807
1728void 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1809 }
1810}
1811
1812void ecb_cold
1729rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1730{ 1814{
1731 if (focus) 1815 if (focus)
1732 { 1816 {
1733 focus = 0; 1817 focus = 0;
1734 want_refresh = 1; 1818 want_refresh = 1;
1735 1819
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1820#if ENABLE_FRILLS
1737 1821 if (option (Opt_urgentOnBell))
1822 set_urgency (0);
1823#endif
1738#if ENABLE_FRILLS || ISO_14755 1824#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1825 if (iso14755buf)
1740 { 1826 {
1741 iso14755buf = 0; 1827 iso14755buf = 0;
1742# if ISO_14755 1828# if ISO_14755
… …
1759 { 1845 {
1760 pix_colors = pix_colors_unfocused; 1846 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1847 scr_recolour ();
1762 } 1848 }
1763#endif 1849#endif
1764 }
1765}
1766 1850
1767void 1851 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1852 }
1853}
1854
1855void ecb_cold
1768rxvt_term::update_fade_color (unsigned int idx) 1856rxvt_term::update_fade_color (unsigned int idx)
1769{ 1857{
1770#if OFF_FOCUS_FADING 1858#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1859 if (rs[Rs_fade])
1772 { 1860 {
… …
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1863 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 } 1864 }
1777#endif 1865#endif
1778} 1866}
1779 1867
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1781void 1869void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1871{
1784 make_current (); 1872 make_current ();
1785 1873
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return; 1876 return;
1789 1877
1790# if ENABLE_TRANSPARENCY
1791 switch (ev.type) 1878 switch (ev.type)
1792 { 1879 {
1793 case PropertyNotify: 1880 case PropertyNotify:
1794 /* 1881 /*
1795 * if user used some Esetroot compatible prog to set the root bg, 1882 * if user used some Esetroot compatible prog to set the root bg,
1796 * use the property to determine the pixmap. We use it later on. 1883 * use the property to determine the pixmap. We use it later on.
1797 */ 1884 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1887 {
1801 bgPixmap.set_root_pixmap (); 1888#if BG_IMAGE_FROM_ROOT
1889 if (option (Opt_transparent))
1890 {
1891 rxvt_img::new_from_root (this)->replace (root_img);
1802 update_background (); 1892 update_background ();
1893 }
1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1803 } 1896 }
1804 1897
1805 break; 1898 break;
1806 } 1899 }
1807# endif
1808 1900
1809 refresh_check (); 1901 refresh_check ();
1810} 1902}
1811#endif 1903#endif
1812 1904
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1937 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1938 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1939#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1940 if (ev.button == MEvent.button && clickintime)
1849 { 1941 {
1850 /* same button, within alloted time */ 1942 /* same button, within allowed time */
1851 MEvent.clicks++; 1943 MEvent.clicks++;
1852 1944
1853 if (MEvent.clicks > 1) 1945 if (MEvent.clicks > 1)
1854 { 1946 {
1855 /* only report double clicks */ 1947 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 2028 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 2029 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 2030 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 2031 direction = DN; /* down */
1940 2032
1941 scrollBar.state = STATE_IDLE; 2033 scrollBar.state = SB_STATE_IDLE;
1942 /* 2034 /*
1943 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 2036 * move up if mouse is above slider
1945 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
1946 * 2038 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2078#endif
1987 if (scr_page (direction, 1)) 2079 if (scr_page (direction, 1))
1988 { 2080 {
1989 if (direction == UP) 2081 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2082 scrollBar.state = SB_STATE_UP;
1991 else 2083 else
1992 scrollBar.state = STATE_DOWN; 2084 scrollBar.state = SB_STATE_DOWN;
1993 } 2085 }
1994 } 2086 }
1995 else 2087 else
1996 switch (ev.button) 2088 switch (ev.button)
1997 { 2089 {
1998 case Button2: 2090 case Button2:
1999 switch (scrollBar.align) 2091 switch (scrollBar.align)
2000 { 2092 {
2001 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2002 csrO = 0; 2094 csrO = 0;
2003 break; 2095 break;
2004 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2098 break;
2007 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2101 break;
2010 } 2102 }
2011 2103
2012 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2108
2017 scrollBar.state = STATE_MOTION; 2109 scrollBar.state = SB_STATE_MOTION;
2018 break; 2110 break;
2019 2111
2020 case Button1: 2112 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2024 2116
2025 case Button3: 2117 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2119 {
2028 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2031# else 2123# else
2032 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2033# endif 2125# endif
2034 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2037# else 2129# else
2038 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2039# endif 2131# endif
2040 else 2132 else
2041 scrollBar.state = STATE_MOTION; 2133 scrollBar.state = SB_STATE_MOTION;
2042 } 2134 }
2043 else 2135 else
2044 { 2136 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2138 (nrow
2047 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2048 / scrollbar_size ())); 2140 / scrollBar.size ()));
2049 } 2141 }
2050 2142
2051 break; 2143 break;
2052 } 2144 }
2053 } 2145 }
… …
2063 2155
2064 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2157 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2159
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2161 {
2070 scrollBar.state = STATE_IDLE; 2162 scrollBar.state = SB_STATE_IDLE;
2071 scrollbar_show (0); 2163 scrollBar.show (0);
2072 } 2164 }
2073 2165
2074#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
2076#endif 2168#endif
… …
2125 case Button3: 2217 case Button3:
2126 selection_make (ev.time); 2218 selection_make (ev.time);
2127 break; 2219 break;
2128 2220
2129 case Button2: 2221 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2222 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2223 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2224 break;
2133 2225
2134#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2135 case Button4: 2227 case Button4:
2136 case Button5: 2228 case Button5:
2137 { 2229 {
2138 int i; 2230 int lines;
2139 page_dirn v; 2231 page_dirn dirn;
2140 2232
2141 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2142 2234
2143 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2144 i = 1; 2236 lines = 1;
2145 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2238 lines = nrow - 1;
2147 else 2239 else
2148 i = 5; 2240 lines = 5;
2149 2241
2150# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2151 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2152 { 2244 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2247
2157 if (!slip_wheel_ev.is_active ()) 2248 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159 } 2250 }
2160 else 2251 else
2161# endif 2252# endif
2162 { 2253 {
2163 scr_page (v, i); 2254 scr_page (dirn, lines);
2164 scrollbar_show (1); 2255 scrollBar.show (1);
2165 } 2256 }
2166 } 2257 }
2167 break; 2258 break;
2168#endif 2259#endif
2169 } 2260 }
2170 } 2261 }
2171} 2262}
2172 2263
2173/*}}} */ 2264/*}}} */
2174 2265
2175bool 2266void ecb_hot
2176rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2177{ 2268{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2181 2271
2182 for (;;) 2272 for (;;)
2183 { 2273 {
2184 if (ch == NOCHAR) 2274 if (ecb_unlikely (ch == NOCHAR))
2185 { 2275 {
2186 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2277 ch = next_char ();
2188 2278
2189 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2190 break; 2280 break;
2191 } 2281 }
2192 2282
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2283 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2284 {
2195 if (!seen_input) 2285 if (ecb_unlikely (!seen_input))
2196 { 2286 {
2197 seen_input = 1; 2287 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2303 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2305
2216 for (;;) 2306 for (;;)
2217 { 2307 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2308 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2309 break;
2220 2310
2221 *str++ = ch; 2311 *str++ = ch;
2222 2312
2223 if (ch == C0_LF || str >= eol) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2314 {
2225 if (ch == C0_LF) 2315 if (ch == C0_LF)
2226 nlines++; 2316 nlines++;
2227 2317
2228 refresh_count++; 2318 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2367 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2368 * if skipScroll is enabled.
2279 */ 2369 */
2280 if (refreshnow) 2370 if (refreshnow)
2281 { 2371 {
2282 flag = true;
2283 scr_refresh (); 2372 scr_refresh ();
2284 want_refresh = 1; 2373 want_refresh = 1;
2285 } 2374 }
2286
2287 } 2375 }
2288 else 2376 else
2289 { 2377 {
2290 try 2378 try
2291 { 2379 {
… …
2299 } 2387 }
2300 2388
2301 ch = NOCHAR; 2389 ch = NOCHAR;
2302 } 2390 }
2303 } 2391 }
2304
2305 return flag;
2306} 2392}
2307 2393
2308// read the next character 2394// read the next character
2309wchar_t 2395wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2396rxvt_term::next_char () NOTHROW
2311{ 2397{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2399 {
2314 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2317 2403
2318 wchar_t wc; 2404 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2405 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2406
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2410 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2411 break;
2326 } 2412 }
2327 2413
2328 if (len == (size_t)-1) 2414 if (len == (size_t)-1)
2415 {
2416 mbstate.reset (); // reset now undefined conversion state
2417 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2418 // in which case we "erroneously" return the next byte which might be valid.
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2419 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2420 }
2330 2421
2331 // assume wchar == unicode 2422 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2424 return wc & UNICODE_MASK;
2334 } 2425 }
2335 2426
2336 return NOCHAR; 2427 return NOCHAR;
2337} 2428}
2338 2429
2339// read the next octet 2430// read the next octet
2340uint32_t 2431uint32_t ecb_hot
2341rxvt_term::next_octet () NOTHROW 2432rxvt_term::next_octet () NOTHROW
2342{ 2433{
2343 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR; 2436 : NOCHAR;
2346} 2437}
2347 2438
2348static class out_of_input out_of_input; 2439static class out_of_input out_of_input;
2349 2440
2350/* rxvt_cmd_getc () - Return next input character */ 2441wchar_t ecb_hot
2351/*
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2443{
2358 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2359 2445
2360 if (c == NOCHAR) 2446 if (c == NOCHAR)
2361 throw out_of_input; 2447 throw out_of_input;
2362 2448
2363 return c; 2449 return c;
2364} 2450}
2365 2451
2366uint32_t 2452uint32_t ecb_hot
2367rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2368{ 2454{
2369 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2370 2456
2371 if (c == NOCHAR) 2457 if (c == NOCHAR)
… …
2375} 2461}
2376 2462
2377/*{{{ print pipe */ 2463/*{{{ print pipe */
2378/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2380FILE * 2466FILE * ecb_cold
2381rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2382{ 2468{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2470
2385 if (stream == NULL) 2471 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2473
2388 return stream; 2474 return stream;
2389} 2475}
2390 2476
2391int 2477int ecb_cold
2392rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2393{ 2479{
2394 fflush (stream); 2480 fflush (stream);
2395 return pclose (stream); 2481 return pclose (stream);
2396} 2482}
2397 2483
2398/* 2484/*
2399 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2400 */ 2486 */
2401void 2487void ecb_cold
2402rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2403{ 2489{
2404 int done; 2490 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2491
2407 if ((fd = popen_printer ()) == NULL) 2492 if (!fd)
2408 return; 2493 return;
2409 2494
2410 /* 2495 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2496 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2497 * is received.
2413 */ 2498 */
2414 for (done = 0; !done;) 2499 for (int done = 0; !done; )
2415 { 2500 {
2416 unsigned char buf[8]; 2501 unsigned char buf[8];
2417 unicode_t ch; 2502 unicode_t ch;
2418 unsigned int i, len; 2503 unsigned int i, len;
2419 2504
… …
2453 pclose_printer (fd); 2538 pclose_printer (fd);
2454} 2539}
2455#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
2456/*}}} */ 2541/*}}} */
2457 2542
2458/* *INDENT-OFF* */
2459enum { 2543enum {
2460 C1_40 = 0x40, 2544 C1_40 = 0x40,
2461 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2545 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2462 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2546 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2463 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2547 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2464 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2548 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2465}; 2549};
2466/* *INDENT-ON* */
2467 2550
2468/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
2469void 2552void ecb_hot
2470rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2554{
2472 switch (ch) 2555 switch (ch)
2473 { 2556 {
2474 case C0_ESC: 2557 case C0_ESC:
… …
2520} 2603}
2521/*}}} */ 2604/*}}} */
2522 2605
2523 2606
2524/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
2525void 2608void ecb_cold
2526rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
2527{ 2610{
2528 int row, col; 2611 int row, col;
2529 2612
2530 switch (ch) 2613 switch (ch)
… …
2564 break; 2647 break;
2565 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2650 break;
2568 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
2569 set_privmode (PrivMode_vt52, 0); 2652 priv_modes &= ~PrivMode_vt52;
2570 break; 2653 break;
2571 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
2573 /* unimplemented */ 2656 /* unimplemented */
2574 break; 2657 break;
… …
2580} 2663}
2581/*}}} */ 2664/*}}} */
2582 2665
2583 2666
2584/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
2585void 2668void ecb_hot
2586rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
2587{ 2670{
2588 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
2589 2672
2590 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
2593 return; 2676 return;
2594 } 2677 }
2595 2678
2596 switch (ch) 2679 switch (ch)
2597 { 2680 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2681 case '#':
2600 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
2601 scr_E (); 2683 scr_E ();
2602 break; 2684 break;
2603 case '(': 2685 case '(':
… …
2626#if !ENABLE_MINIMAL 2708#if !ENABLE_MINIMAL
2627 case '9': 2709 case '9':
2628 scr_forwardindex (); 2710 scr_forwardindex ();
2629 break; 2711 break;
2630#endif 2712#endif
2713 // DECPAM/DECPNM
2631 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
2632 case '>': 2717 case '>':
2633 set_privmode (PrivMode_aplKP, ch == '='); 2718 priv_modes &= ~PrivMode_aplKP;
2634 break; 2719 break;
2635 2720
2636 case C1_40: 2721 case C1_40:
2637 cmd_getc (); 2722 cmd_getc ();
2638 break; 2723 break;
… …
2642 2727
2643 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
2645 { 2730 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2733 }
2649 break; 2734 break;
2650 2735
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
2653 process_graphics (); 2738 // used by original rxvt for rob nations own graphics mode
2739 if (cmd_getc () == 'Q')
2740 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2741 break;
2655 2742
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2745 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
2663 scr_index (DN); 2750 scr_index (DN);
2664 break; 2751 break;
2665 2752
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
2668 2755
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
2671 2758
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2761 process_dcs_seq ();
2675 break; 2762 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2764 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2765 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2766 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2767 break; /* steal obsolete ESC [ c */
2681 2768
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2769 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2770 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2771 process_csi_seq ();
2685 break; 2772 break;
2686 2773
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2774 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2775 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2776 process_osc_seq ();
2690 break; 2777 break;
2691 2778
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2779 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2780 case 'c':
2694 mbstate.reset (); 2781 mbstate.reset ();
2695 scr_poweron (); 2782 scr_poweron ();
2696 scrollbar_show (1); 2783 scrollBar.show (1);
2697 break; 2784 break;
2698 2785
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2786 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2787 case 'n':
2701 scr_charset_choose (2); 2788 scr_charset_choose (2);
… …
2708 } 2795 }
2709} 2796}
2710/*}}} */ 2797/*}}} */
2711 2798
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2800enum {
2715 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
2716 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2802 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2717 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2803 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2718 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2804 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2807 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2808 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2809 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2810};
2725 2811
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2812#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2813 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2814 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2815#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2816 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2817
2732const unsigned char csi_defaults[] = 2818static const unsigned char csi_defaults[] =
2733 { 2819 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2820 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2821 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2822 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2823 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2738 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2824 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2739 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2825 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2740 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2826 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2741 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2827 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2742 }; 2828 };
2743/* *INDENT-ON* */
2744 2829
2745void 2830void ecb_hot
2746rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
2747{ 2832{
2748 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
2749 unsigned int nargs, p; 2834 unsigned int nargs, p;
2750 int n, ndef; 2835 int n, ndef;
2751 int arg[ESC_ARGS] = { }; 2836 int arg[ESC_ARGS] = { };
2752 2837
2753 nargs = 0; 2838 nargs = 0;
2754 2839
2755 priv = 0; 2840 priv = 0;
2756 ch = cmd_getc (); 2841 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2842 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2843 {
2759 /* '<' '=' '>' '?' */ 2844 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2845 priv = ch;
2761 ch = cmd_getc (); 2846 ch = cmd_getc ();
2762 } 2847 }
2763 2848
2849 prev_ch = 0;
2764 /* read any numerical arguments */ 2850 /* read any numerical arguments */
2765 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
2766 { 2852 {
2767 if (isdigit (ch)) 2853 if (isdigit (ch))
2768 { 2854 {
… …
2778 n = -1; 2864 n = -1;
2779 } 2865 }
2780 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
2781 process_nonprinting (ch); 2867 process_nonprinting (ch);
2782 2868
2869 prev_ch = ch;
2783 ch = cmd_getc (); 2870 ch = cmd_getc ();
2784 } 2871 }
2785 2872
2786 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
2787 return; 2874 return;
… …
2818 2905
2819 case '?': 2906 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2907 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2908 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2909 break;
2910
2911 case '!':
2912 if (ch == CSI_70)
2913 {
2914 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2915 scr_soft_reset ();
2916
2917 static const int pm_h[] = { 7, 25 };
2918 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2919
2920 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2921 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2922 }
2923 break;
2924 }
2925
2824 return; 2926 return;
2825 } 2927 }
2826 2928
2827 switch (ch) 2929 switch (ch)
2828 { 2930 {
… …
2842 } 2944 }
2843 break; 2945 break;
2844#endif 2946#endif
2845 2947
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2955 break;
2854 2956
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3006 scr_insert_mode (1); 3108 scr_insert_mode (1);
3007 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3008 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3009 break; 3111 break;
3010 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3011 /* 3118 /*
3012 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3013 */ 3120 */
3014 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3015 if (nargs == 1) 3122 if (nargs == 1)
… …
3043 } 3150 }
3044} 3151}
3045/*}}} */ 3152/*}}} */
3046 3153
3047#if !ENABLE_MINIMAL 3154#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3155void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3157{
3052 int x, y; 3158 int x, y;
3053 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
… …
3062 { 3168 {
3063 /* 3169 /*
3064 * commands 3170 * commands
3065 */ 3171 */
3066 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3173 XMapWindow (dpy, parent);
3068 break; 3174 break;
3069 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3177 break;
3072 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3180 break;
3075 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3183 break;
3078 case 5: /* raise window */ 3184 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3185 XRaiseWindow (dpy, parent);
3080 break; 3186 break;
3081 case 6: /* lower window */ 3187 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3188 XLowerWindow (dpy, parent);
3083 break; 3189 break;
3084 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3085 scr_touch (true); 3191 scr_touch (true);
3086 break; 3192 break;
3087 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3090 break; 3196 break;
3091 3197
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3199 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3097 break; 3203 break;
3098 3204
3099 /* 3205 /*
3100 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3101 */ 3207 */
3102 case 11: /* report window state */ 3208 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3211 break;
3106 case 13: /* report window position */ 3212 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3218 break;
3113 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3222 break;
3117 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3225 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3228 break;
3123 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3124 { 3230 {
3125 char *s; 3231 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3233 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3234 XFree (s);
3129 } 3235 }
3130 break; 3236 break;
3131 case 21: /* report window title */ 3237 case 21: /* report window title */
3132 { 3238 {
3133 char *s; 3239 char *s;
3134 XFetchName (dpy, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3241 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3242 XFree (s);
3137 } 3243 }
3138 break; 3244 break;
3139 } 3245 }
… …
3149rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3150{ 3256{
3151 unicode_t ch; 3257 unicode_t ch;
3152 bool seen_esc = false; 3258 bool seen_esc = false;
3153 unsigned int n = 0; 3259 unsigned int n = 0;
3154 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3155 3261
3156 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3157 { 3263 {
3158 if (seen_esc) 3264 if (seen_esc)
3159 { 3265 {
… …
3174 else if (ch < 0x20) 3280 else if (ch < 0x20)
3175 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3176 3282
3177 seen_esc = false; 3283 seen_esc = false;
3178 3284
3179 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3180 // stop at some sane length 3286 // stop at some sane length
3181 return NULL; 3287 return NULL;
3182 3288
3183 string[n++] = ch; 3289 string[n++] = ch;
3184 } 3290 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3301 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3302 */
3197void 3303void
3198rxvt_term::process_dcs_seq () 3304rxvt_term::process_dcs_seq ()
3199{ 3305{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3306 /*
3204 * Not handled yet 3307 * Not handled yet
3205 */ 3308 */
3309
3310 unicode_t eh;
3206 s = get_to_st (eh); 3311 char *s = get_to_st (eh);
3207 if (s) 3312 if (s)
3208 free (s); 3313 free (s);
3209 3314
3210 return; 3315 return;
3211} 3316}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3320 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3321 */
3217void 3322void
3218rxvt_term::process_osc_seq () 3323rxvt_term::process_osc_seq ()
3219{ 3324{
3220 unicode_t ch, eh;
3221 int arg; 3325 int arg;
3222 3326
3223 ch = cmd_getc (); 3327 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3328 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3329 arg = arg * 10 + (ch - '0');
3226 3330
3227 if (ch == ';') 3331 if (ch == ';')
3228 { 3332 {
3333 unicode_t eh;
3229 char *s = get_to_st (eh); 3334 char *s = get_to_st (eh);
3230 3335
3231 if (s) 3336 if (s)
3232 { 3337 {
3233 process_xterm_seq (arg, s, eh); 3338 process_xterm_seq (arg, s, eh);
… …
3257 3362
3258/* 3363/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3364 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3365 */
3261void 3366void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3367rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3368{
3264 int color; 3369 int color;
3265 char *buf, *name; 3370 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3371 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3372 int saveop = op;
… …
3294 unsigned long bytes_after; 3399 unsigned long bytes_after;
3295 unsigned char *value = 0; 3400 unsigned char *value = 0;
3296 const char *str = ""; 3401 const char *str = "";
3297 3402
3298 if (prop 3403 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3408 && actual_type != None
3304 && actual_format == 8) 3409 && actual_format == 8)
3305 str = (const char *)(value); 3410 str = (const char *)(value);
3306 3411
3307 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3308 3413
3309 XFree (value); 3414 XFree (value);
3310 } 3415 }
3311 else 3416 else
3312 { 3417 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3418 char *eq = strchr (str, '=');
3314 3419
3315 if (eq) 3420 if (eq)
3316 { 3421 {
3317 *eq = 0; 3422 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3319 } 3424 }
3320 else 3425 else
3321 XDeleteProperty (dpy, parent[0], 3426 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3427 display->atom (str));
3323 } 3428 }
3324 break; 3429 break;
3325 3430
3326 case XTerm_Color: 3431 case XTerm_Color:
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3463 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3464 break;
3360 case XTerm_Color_pointer_bg: 3465 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3466 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3467 break;
3468#ifdef OPTION_HC
3469 case XTerm_Color_HC:
3470 process_color_seq (op, Color_HC, str, resp);
3471 break;
3472 case XTerm_Color_HTC:
3473 process_color_seq (op, Color_HTC, str, resp);
3474 break;
3475#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3476#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3477 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3478 process_color_seq (op, Color_BD, str, resp);
3370 break; 3479 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3480 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3481 process_color_seq (op, Color_UL, str, resp);
3374 break; 3482 break;
3375 case URxvt_Color_IT: 3483 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3484 process_color_seq (op, Color_IT, str, resp);
3377 break; 3485 break;
3378#endif 3486#endif
3379#if ENABLE_TRANSPARENCY 3487 case URxvt_Color_border:
3488 process_color_seq (op, Color_border, str, resp);
3489 break;
3490
3491#if BG_IMAGE_FROM_ROOT
3380 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3382 { 3494 {
3383 bool changed = false; 3495 bool changed = false;
3384 3496
3385 if (ISSET_PIXCOLOR (Color_tint)) 3497 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3498 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389 3499
3390 if (changed) 3500 if (changed)
3391 update_background (); 3501 update_background ();
3392 } 3502 }
3393 3503
… …
3397#if BG_IMAGE_FROM_FILE 3507#if BG_IMAGE_FROM_FILE
3398 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3509 if (!strcmp (str, "?"))
3400 { 3510 {
3401 char str[256]; 3511 char str[256];
3512 int h_scale = fimage.h_scale;
3513 int v_scale = fimage.v_scale;
3514 int h_align = fimage.h_align;
3515 int v_align = fimage.v_align;
3402 3516
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3517 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3518 h_scale, v_scale,
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3519 h_align, v_align);
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3520 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3521 }
3408 else 3522 else
3409 { 3523 {
3410 int changed = 0; 3524 bool changed = false;
3411 3525
3412 if (*str != ';') 3526 if (*str != ';')
3413 { 3527 {
3414 /* reset to default scaling :*/ 3528 try
3415 bgPixmap.unset_geometry (); 3529 {
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3530 fimage.set_file_geometry (this, str);
3417 changed++; 3531 changed = true;
3418 str = strchr (str, ';'); 3532 }
3419 if (str == NULL) 3533 catch (const class rxvt_failure_exception &e)
3420 bgPixmap.set_defaultGeometry (); 3534 {
3535 }
3421 } 3536 }
3422 3537 else
3423 while (str)
3424 { 3538 {
3425 str++; 3539 str++;
3426 if (bgPixmap.set_geometry (str)) 3540 if (fimage.set_geometry (str, true))
3427 changed++; 3541 changed = true;
3428 str = strchr (str, ';');
3429 } 3542 }
3430 3543
3431 if (changed) 3544 if (changed)
3545 {
3546 if (bg_window_position_sensitive ())
3547 {
3548 int x, y;
3549 get_window_origin (x, y);
3550 parent_x = x;
3551 parent_y = y;
3552 }
3432 update_background (); 3553 update_background ();
3554 }
3433 } 3555 }
3434 break; 3556 break;
3435#endif 3557#endif
3436 3558
3437 case XTerm_logfile: 3559 case XTerm_logfile:
… …
3507 break; 3629 break;
3508#endif 3630#endif
3509 3631
3510#if ENABLE_PERL 3632#if ENABLE_PERL
3511 case URxvt_perl: 3633 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3634 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3635 break;
3515#endif 3636#endif
3516 } 3637 }
3517} 3638}
3518/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
… …
3525 * 's' = save 3646 * 's' = save
3526 * 'r' = restore 3647 * 'r' = restore
3527 * 't' = toggle 3648 * 't' = toggle
3528 * so no need for fancy checking 3649 * so no need for fancy checking
3529 */ 3650 */
3530int 3651int ecb_cold
3531rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
3532{ 3653{
3533 int state; 3654 int state;
3534 3655
3535 if (mode == 's') 3656 if (mode == 's')
3536 { 3657 {
3537 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
3538 return -1; 3662 return -1;
3539 } 3663 }
3540 else 3664 else
3541 { 3665 {
3542 if (mode == 'r') 3666 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3668 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 set_privmode (bit, state); 3670
3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
3547 } 3675 }
3548 3676
3549 return state; 3677 return state;
3550} 3678}
3551 3679
3552/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
3553void 3681void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3682rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3683{
3556 unsigned int i, j; 3684 unsigned int i, j;
3557 int state; 3685 int state;
3558 3686
3559 static const struct 3687 static const struct
3560 { 3688 {
3561 const int argval; 3689 const int argval;
3562 const unsigned long bit; 3690 const unsigned long bit;
3563 } argtopriv[] = { 3691 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3692 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3694 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3696 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3697 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3698 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3699 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3701 // 18 end FF to printer after print screen
3702 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3706#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3708 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3711 // 45 margin bell NYI
3582 // 46 start logging 3712 // 46 start logging
3583 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3714 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3716 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3717#endif
3588 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3719 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3720 { 1003, PrivMode_MouseAnyEvent },
3721#if ENABLE_FRILLS
3722 { 1005, PrivMode_ExtModeMouse },
3723#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3725 { 1011, PrivMode_Keypress }, // rxvt extension
3726#if ENABLE_FRILLS
3727 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3728#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3733 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3734 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3735 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste }, 3736 { 2004, PrivMode_BracketPaste },
3601 }; 3737 };
3602 3738
… …
3612 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
3613 { 3749 {
3614 state = -1; 3750 state = -1;
3615 3751
3616 /* basic handling */ 3752 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
3619 { 3755 {
3620 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
3621 break; 3757 break;
3622 } 3758 }
… …
3630 3766
3631 scr_touch (true); 3767 scr_touch (true);
3632 break; 3768 break;
3633#endif 3769#endif
3634 case 1048: /* alternative cursor save */ 3770 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3772 if (mode == 0)
3638 scr_cursor (RESTORE); 3773 scr_cursor (RESTORE);
3639 else if (mode == 1) 3774 else if (mode == 1)
3640 scr_cursor (SAVE); 3775 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3787 * within VT52 mode
3653 */ 3788 */
3654 set_privmode (PrivMode_vt52, 1); 3789 priv_modes |= PrivMode_vt52;
3655 break; 3790 break;
3656 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3794 break;
3663 case 4: /* smooth scrolling */ 3795 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3796 set_option (Opt_jumpScroll, !state);
3665 break; 3797 break;
3666 case 5: /* reverse video */ 3798 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3811 break;
3680#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
3681 case scrollBar_esc: 3813 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3814 scrollBar.map (state);
3683 {
3684 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3816 scr_touch (true);
3686 }
3687 break; 3817 break;
3688#endif 3818#endif
3689 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
3690 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
3691 break; 3821 break;
… …
3704 case 1003: 3834 case 1003:
3705 if (state) 3835 if (state)
3706 { 3836 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3837 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3838 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3839 mouse_row = mouse_col = 0;
3709 vt_emask_mouse = PointerMotionMask; 3840 vt_emask_mouse = PointerMotionMask;
3710 } 3841 }
3711 else 3842 else
3712 vt_emask_mouse = NoEventMask; 3843 vt_emask_mouse = NoEventMask;
3844
3713 vt_select_input (); 3845 vt_select_input ();
3714 break; 3846 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3847 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3848 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3849 break;
3718 case 1011: /* scroll to bottom on key press */ 3850 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3851 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3852 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3853 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3854 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3855 if (!state)
3724 scr_erase_screen (2); 3856 scr_erase_screen (2);
3857
3725 scr_change_screen (state); 3858 scr_change_screen (state);
3726 break; 3859 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3860 case 1049: /* secondary screen w/ clearing first */
3861 if (option (Opt_secondaryScreen))
3862 if (state)
3863 scr_cursor (SAVE);
3864
3728 scr_change_screen (state); 3865 scr_change_screen (state);
3866
3729 if (option (Opt_secondaryScreen)) 3867 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3868 if (state)
3731 scr_erase_screen (2); 3869 scr_erase_screen (2);
3870 else
3871 scr_cursor (RESTORE);
3732 break; 3872 break;
3733 default: 3873 default:
3734 break; 3874 break;
3735 } 3875 }
3736 } 3876 }
3737} 3877}
3738/*}}} */ 3878/*}}} */
3739 3879
3740/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
3741void 3881void ecb_hot
3742rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3743{ 3883{
3744 unsigned int i; 3884 unsigned int i;
3745 short rendset; 3885 short rendset;
3746 int rendstyle; 3886 int rendstyle;
… …
3887 break; 4027 break;
3888#endif 4028#endif
3889 } 4029 }
3890 } 4030 }
3891} 4031}
3892/*}}} */
3893 4032
3894/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3895void 4033void
3896rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
3897{ 4035{
3898 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
3899
3900 if (cmd == 'Q')
3901 {
3902 /* query graphics */
3903 tt_printf ("\033G0\012"); /* no graphics */
3904 return; 4037 return;
3905 } 4038
3906 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
3907 do 4040
3908 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
3909 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
3910} 4047}
3911/*}}} */ 4048/*}}} */
3912 4049
3913/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
3914 4051
… …
3930 4067
3931/* ---------------------------------------------------------------------- */ 4068/* ---------------------------------------------------------------------- */
3932/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user, pasted with the mouse,
3933 * or generated by us in response to a query ESC sequence. 4070 * or generated by us in response to a query ESC sequence.
3934 */ 4071 */
3935const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3936 4073
3937void 4074void
3938rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 4076{
3940 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3945 4082
3946 if (v_buflen == 0) 4083 if (v_buflen == 0)
3947 { 4084 {
3948 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4085 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3949 4086
4087 max_it (written, 0);
4088
3950 if ((unsigned int)written == len) 4089 if (written == len)
3951 return; 4090 return;
3952 4091
3953 data += written; 4092 data += written;
3954 len -= written; 4093 len -= written;
3955 } 4094 }
3956 4095
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4097
3959 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4099 v_buflen += len;
3961 4100
3962 pty_ev.set (ev::READ | ev::WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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