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.381 by root, Fri Dec 14 05:25:23 2007 UTC vs.
Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

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-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
551 { 658 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 660 case XK_BackSpace:
554#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 662 {
556 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 665 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
571 692
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
573 { 773 {
574 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 {
777 int n = sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
789 else
790 newlen = 0;
576 } 791 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 792 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 793 }
794
795 if (newlen)
796 len = strlen (kbuf);
794 797
795 /* 798 /*
796 * Pass meta for all function keys, if 'meta' option set 799 * Pass meta for all function keys, if 'meta' option set
797 */ 800 */
798#ifdef META8_OPTION 801#ifdef META8_OPTION
841 view_start = 0; 844 view_start = 0;
842 want_refresh = 1; 845 want_refresh = 1;
843 } 846 }
844 847
845 /* 848 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */ 850 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858 851
859 /* escape prefix */ 852 /* escape prefix */
860 if (meta 853 if (meta
861#ifdef META8_OPTION 854#ifdef META8_OPTION
862 && meta_char == C0_ESC 855 && meta_char == C0_ESC
1032 } 1025 }
1033 while (row < end_row); 1026 while (row < end_row);
1034 } 1027 }
1035 1028
1036 scr_refresh (); 1029 scr_refresh ();
1037 scrollbar_show (1); 1030 scrollBar.show (1);
1038#ifdef USE_XIM 1031#ifdef USE_XIM
1039 IMSendSpot (); 1032 IMSendSpot ();
1040#endif 1033#endif
1041 } 1034 }
1042 1035
1043 display->flush (); 1036 display->flush ();
1044} 1037}
1045 1038
1046/* checks wether a refresh is requested and starts the refresh timer */ 1039/* checks whether a refresh is requested and starts the refresh timer */
1047void 1040void
1048rxvt_term::refresh_check () 1041rxvt_term::refresh_check ()
1049{ 1042{
1050 if (want_refresh && !flush_ev.is_active ()) 1043 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1044 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1045
1046 display->flush ();
1052} 1047}
1053 1048
1054void 1049void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1050rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1051{
1076{ 1071{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1072 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1073 {
1079 hidden_text = !hidden_text; 1074 hidden_text = !hidden_text;
1080 want_refresh = 1; 1075 want_refresh = 1;
1081 refresh_check (); 1076 refresh_check ();
1082 } 1077 }
1083 else 1078 else
1084 w.stop (); 1079 w.stop ();
1085} 1080}
1086#endif 1081#endif
1087 1082
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1084void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1085rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1086{
1092 if ((scrollbar_isUp () || scrollbar_isDn ()) 1087 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1093 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1088 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1094 { 1089 {
1095 want_refresh = 1; 1090 want_refresh = 1;
1096 refresh_check (); 1091 refresh_check ();
1097 } 1092 }
1098 else 1093 else
1142 { 1137 {
1143 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1139 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is 1140 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
1142 // since the linux guys additionally thought that breaking the only
1143 // known workaround against their unusable sched_yield hack is cool,
1144 // we just nanosleep a bit and hope for the best.
1147 1145
1148 struct timespec ts = { 0, 0 }; 1146 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1147 nanosleep (&ts, 0);
1150 1148
1151 w.stop (); 1149 w.stop ();
1152 } 1150 }
1153 1151
1203{ 1201{
1204 make_current (); 1202 make_current ();
1205 1203
1206 if (revents & ev::READ) 1204 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1205 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1206 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1207 cmd_parse ();
1210 break;
1211 1208
1212 if (revents & ev::WRITE) 1209 if (revents & ev::WRITE)
1213 pty_write (); 1210 pty_write ();
1211
1212 refresh_check ();
1214} 1213}
1215 1214
1216void 1215void
1217rxvt_term::pointer_unblank () 1216rxvt_term::pointer_unblank ()
1218{ 1217{
1433 && ev.xfocus.mode != NotifyGrab) 1432 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1433 focus_out ();
1435 break; 1434 break;
1436 1435
1437 case ConfigureNotify: 1436 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1437 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1438 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */ 1439 szHint.width, szHint.height);*/
1441 if (ev.xconfigure.window == parent[0]) 1440 if (ev.xconfigure.window == parent[0])
1442 { 1441 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1442 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 1443 ;
1445 1444
1450 } 1449 }
1451 else 1450 else
1452 { 1451 {
1453#ifdef HAVE_BG_PIXMAP 1452#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1453 if (bgPixmap.window_position_sensitive ())
1454 {
1455 if (mapped)
1455 update_background (); 1456 update_background ();
1457 else
1458 bgPixmap.invalidate ();
1459 }
1456#endif 1460#endif
1457 } 1461 }
1462
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1464 }
1460 break; 1465 break;
1461 1466
1462 case PropertyNotify: 1467 case PropertyNotify:
1466 selection_property (ev.xproperty.window, ev.xproperty.atom); 1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467 1472
1468 break; 1473 break;
1469 1474
1470 case SelectionClear: 1475 case SelectionClear:
1471 selection_clear (); 1476 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1477 break;
1473 1478
1474 case SelectionNotify: 1479 case SelectionNotify:
1475 if (selection_wait == Sel_normal) 1480 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1479 case SelectionRequest: 1484 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1485 selection_send (ev.xselectionrequest);
1481 break; 1486 break;
1482 1487
1483 case MapNotify: 1488 case MapNotify:
1489#ifdef HAVE_BG_PIXMAP
1490 /* This is needed specifically to fix the case of no window manager or a
1491 * non-reparenting window manager. In those cases we never get first
1492 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1493 * care of multiplicity of ConfigureNotify events arriving while WM does
1494 * reparenting.
1495 * We should not render background immediately, as there could be several
1496 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1497 * by scheduling background redraw as soon as we can, but giving a short
1498 * bit of time for ConfigureNotifies to arrive.
1499 * We should render background PRIOR to drawing any text, but AFTER all
1500 * of ConfigureNotifys for the best results.
1501 */
1502 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1503 update_background_ev.start (0.025);
1504#endif
1484 mapped = 1; 1505 mapped = 1;
1485#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1507 text_blink_ev.start ();
1487#endif 1508#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1546 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1547 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1548 ;
1528 1549
1529 if (isScrollbarWindow (ev.xany.window)) 1550 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1551 {
1531 scrollBar.setIdle (); 1552 scrollBar.state = STATE_IDLE;
1532 scrollbar_show (0); 1553 scrollBar.show (0);
1533 } 1554 }
1534 } 1555 }
1535 break; 1556 break;
1536 1557
1537 case MotionNotify: 1558 case MotionNotify:
1624#ifdef MOUSE_THRESHOLD 1645#ifdef MOUSE_THRESHOLD
1625 } 1646 }
1626#endif 1647#endif
1627 } 1648 }
1628 } 1649 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1650 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1651 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1652 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1653 MotionNotify, &ev))
1633 ; 1654 ;
1634 1655
1636 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1659 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1660 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1661 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1662 scrollBar.size ());
1642 want_refresh = 1; 1663 want_refresh = 1;
1643 scrollbar_show (1); 1664 scrollBar.show (1);
1644 } 1665 }
1645 break; 1666 break;
1646 } 1667 }
1647 1668
1648#if defined(CURSOR_BLINK) 1669#if defined(CURSOR_BLINK)
1673#endif 1694#endif
1674 1695
1675 refresh_check (); 1696 refresh_check ();
1676} 1697}
1677 1698
1699#if ENABLE_FRILLS
1700void
1701rxvt_term::set_urgency (bool enable)
1702{
1703 if (enable == urgency_hint)
1704 return;
1705
1706 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1707 {
1708 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1709 XSetWMHints (dpy, parent[0], h);
1710 urgency_hint = enable;
1711 }
1712}
1713#endif
1714
1678void 1715void
1679rxvt_term::focus_in () 1716rxvt_term::focus_in ()
1680{ 1717{
1681 if (!focus) 1718 if (!focus)
1682 { 1719 {
1683 focus = 1; 1720 focus = 1;
1684 want_refresh = 1; 1721 want_refresh = 1;
1685
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687 1722
1688#if USE_XIM 1723#if USE_XIM
1689 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1690 { 1725 {
1691 IMSetPosition (); 1726 IMSetPosition ();
1703 scr_recolour (); 1738 scr_recolour ();
1704 } 1739 }
1705#endif 1740#endif
1706#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1708 { 1743 set_urgency (0);
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif 1744#endif
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 } 1747 }
1717} 1748}
1718 1749
1719void 1750void
1720rxvt_term::focus_out () 1751rxvt_term::focus_out ()
1722 if (focus) 1753 if (focus)
1723 { 1754 {
1724 focus = 0; 1755 focus = 0;
1725 want_refresh = 1; 1756 want_refresh = 1;
1726 1757
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1758#if ENABLE_FRILLS
1728 1759 if (option (Opt_urgentOnBell))
1760 set_urgency (0);
1761#endif
1729#if ENABLE_FRILLS || ISO_14755 1762#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf) 1763 if (iso14755buf)
1731 { 1764 {
1732 iso14755buf = 0; 1765 iso14755buf = 0;
1733# if ISO_14755 1766# if ISO_14755
1750 { 1783 {
1751 pix_colors = pix_colors_unfocused; 1784 pix_colors = pix_colors_unfocused;
1752 scr_recolour (); 1785 scr_recolour ();
1753 } 1786 }
1754#endif 1787#endif
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755 } 1790 }
1756} 1791}
1757 1792
1758void 1793void
1759rxvt_term::update_fade_color (unsigned int idx) 1794rxvt_term::update_fade_color (unsigned int idx)
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1826 {
1792 bgPixmap.set_root_pixmap (); 1827 bgPixmap.set_root_pixmap ();
1793 update_background (); 1828 update_background ();
1794 } 1829 }
1830
1795 break; 1831 break;
1796 } 1832 }
1797# endif 1833# endif
1798 1834
1799 refresh_check (); 1835 refresh_check ();
1835 /* save the xbutton state (for ButtonRelease) */ 1871 /* save the xbutton state (for ButtonRelease) */
1836 MEvent.state = ev.state; 1872 MEvent.state = ev.state;
1837#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1838 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1839 { 1875 {
1840 /* same button, within alloted time */ 1876 /* same button, within allowed time */
1841 MEvent.clicks++; 1877 MEvent.clicks++;
1842 1878
1843 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1844 { 1880 {
1845 /* only report double clicks */ 1881 /* only report double clicks */
1917 } 1953 }
1918 1954
1919 /* 1955 /*
1920 * Scrollbar window processing of button press 1956 * Scrollbar window processing of button press
1921 */ 1957 */
1922 if (isScrollbarWindow (ev.window)) 1958 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1959 {
1924 scrollBar.setIdle (); 1960 page_dirn direction = NO_DIR;
1961
1962 if (scrollBar.upButton (ev.y))
1963 direction = UP; /* up */
1964 else if (scrollBar.dnButton (ev.y))
1965 direction = DN; /* down */
1966
1967 scrollBar.state = STATE_IDLE;
1925 /* 1968 /*
1926 * Rxvt-style scrollbar: 1969 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1970 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1971 * move dn if mouse is below slider
1929 * 1972 *
1938 /* 1981 /*
1939 * Mouse report disabled scrollbar: 1982 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 1983 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 1984 * click on scrollbar - send pageup/down
1942 */ 1985 */
1943 if ((scrollBar.style == R_SB_NEXT 1986 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 1987 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 1988 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 1989 tt_printf ("\033[B");
1953 else 1990 else
1954 switch (ev.button) 1991 switch (ev.button)
1955 { 1992 {
1956 case Button2: 1993 case Button2:
1964 break; 2001 break;
1965 } 2002 }
1966 } 2003 }
1967 else 2004 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2005#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2006 {
1975 if (scrollbarnext_upButton (ev.y)) 2007 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown)
1989 { 2008 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2010 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2011 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1993#endif 2012#endif
1994 if (scr_page (upordown < 0 ? UP : DN, 1)) 2013 if (scr_page (direction, 1))
1995 { 2014 {
1996 if (upordown < 0) 2015 if (direction == UP)
1997 scrollBar.setUp (); 2016 scrollBar.state = STATE_UP;
1998 else 2017 else
1999 scrollBar.setDn (); 2018 scrollBar.state = STATE_DOWN;
2000 } 2019 }
2001 } 2020 }
2002 else 2021 else
2003 switch (ev.button) 2022 switch (ev.button)
2004 { 2023 {
2005 case Button2: 2024 case Button2:
2006 switch (scrollbar_align) 2025 switch (scrollBar.align)
2007 { 2026 {
2008 case R_SB_ALIGN_TOP: 2027 case R_SB_ALIGN_TOP:
2009 csrO = 0; 2028 csrO = 0;
2010 break; 2029 break;
2011 case R_SB_ALIGN_CENTRE: 2030 case R_SB_ALIGN_CENTRE:
2017 } 2036 }
2018 2037
2019 if (scrollBar.style == R_SB_XTERM 2038 if (scrollBar.style == R_SB_XTERM
2020 || scrollbar_above_slider (ev.y) 2039 || scrollbar_above_slider (ev.y)
2021 || scrollbar_below_slider (ev.y)) 2040 || scrollbar_below_slider (ev.y))
2022 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2041 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2023 2042
2024 scrollBar.setMotion (); 2043 scrollBar.state = STATE_MOTION;
2025 break; 2044 break;
2026 2045
2027 case Button1: 2046 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2047 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2048 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2049 /* FALLTHROUGH */
2031 2050
2032 case Button3: 2051 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2052 if (scrollBar.style != R_SB_XTERM)
2043 scr_page (DN, nrow - 1); 2062 scr_page (DN, nrow - 1);
2044# else 2063# else
2045 scr_page (DN, nrow / 4); 2064 scr_page (DN, nrow / 4);
2046# endif 2065# endif
2047 else 2066 else
2048 scrollBar.setMotion (); 2067 scrollBar.state = STATE_MOTION;
2049 } 2068 }
2050 else 2069 else
2051 { 2070 {
2052 scr_page ((ev.button == Button1 ? DN : UP), 2071 scr_page ((ev.button == Button1 ? DN : UP),
2053 (nrow 2072 (nrow
2054 * scrollbar_position (ev.y) 2073 * scrollbar_position (ev.y)
2055 / scrollbar_size ())); 2074 / scrollBar.size ()));
2056 } 2075 }
2057 2076
2058 break; 2077 break;
2059 } 2078 }
2060 } 2079 }
2070 2089
2071 csrO = 0; /* reset csr Offset */ 2090 csrO = 0; /* reset csr Offset */
2072 if (!bypass_keystate) 2091 if (!bypass_keystate)
2073 reportmode = !! (priv_modes & PrivMode_mouse_report); 2092 reportmode = !! (priv_modes & PrivMode_mouse_report);
2074 2093
2075 if (scrollbar_isUpDn ()) 2094 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2076 { 2095 {
2077 scrollBar.setIdle (); 2096 scrollBar.state = STATE_IDLE;
2078 scrollbar_show (0); 2097 scrollBar.show (0);
2079 } 2098 }
2080 2099
2081#ifdef SELECTION_SCROLLING 2100#ifdef SELECTION_SCROLLING
2082 sel_scroll_ev.stop(); 2101 sel_scroll_ev.stop();
2083#endif 2102#endif
2133 selection_make (ev.time); 2152 selection_make (ev.time);
2134 break; 2153 break;
2135 2154
2136 case Button2: 2155 case Button2:
2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2156 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2157 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2139 break; 2158 break;
2140 2159
2141#ifdef MOUSE_WHEEL 2160#ifdef MOUSE_WHEEL
2142 case Button4: 2161 case Button4:
2143 case Button5: 2162 case Button5:
2163 2182
2164 if (!slip_wheel_ev.is_active ()) 2183 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2184 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2185 }
2167 else 2186 else
2187# endif
2168 { 2188 {
2169# endif
2170 scr_page (v, i); 2189 scr_page (v, i);
2171 scrollbar_show (1); 2190 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2191 }
2174# endif
2175 } 2192 }
2176 break; 2193 break;
2177#endif 2194#endif
2178 } 2195 }
2179 } 2196 }
2180} 2197}
2181 2198
2182/*}}} */ 2199/*}}} */
2183 2200
2184bool 2201void
2185rxvt_term::cmd_parse () 2202rxvt_term::cmd_parse ()
2186{ 2203{
2187 bool flag = false;
2188 wchar_t ch = NOCHAR; 2204 wchar_t ch = NOCHAR;
2189 char *seq_begin; // remember start of esc-sequence here 2205 char *seq_begin; // remember start of esc-sequence here
2190 2206
2191 for (;;) 2207 for (;;)
2192 { 2208 {
2193 if (ch == NOCHAR) 2209 if (expect_false (ch == NOCHAR))
2194 { 2210 {
2195 seq_begin = cmdbuf_ptr; 2211 seq_begin = cmdbuf_ptr;
2196 ch = next_char (); 2212 ch = next_char ();
2197 2213
2198 if (ch == NOCHAR) 2214 if (ch == NOCHAR)
2199 break; 2215 break;
2200 } 2216 }
2201 2217
2202 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2218 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2203 { 2219 {
2204 if (!seen_input) 2220 if (expect_false (!seen_input))
2205 { 2221 {
2206 seen_input = 1; 2222 seen_input = 1;
2207 // many badly-written programs (e.g. jed) contain a race condition: 2223 // many badly-written programs (e.g. jed) contain a race condition:
2208 // they first read the screensize and then install a SIGWINCH handler. 2224 // they first read the screensize and then install a SIGWINCH handler.
2209 // some window managers resize the window early, and these programs 2225 // some window managers resize the window early, and these programs
2222 wchar_t *str = buf; 2238 wchar_t *str = buf;
2223 wchar_t *eol = str + min (ncol, UBUFSIZ); 2239 wchar_t *eol = str + min (ncol, UBUFSIZ);
2224 2240
2225 for (;;) 2241 for (;;)
2226 { 2242 {
2227 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2243 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2228 break; 2244 break;
2229 2245
2230 *str++ = ch; 2246 *str++ = ch;
2231 2247
2232 if (ch == C0_LF || str >= eol) 2248 if (expect_false (ch == C0_LF || str >= eol))
2233 { 2249 {
2234 if (ch == C0_LF) 2250 if (ch == C0_LF)
2235 nlines++; 2251 nlines++;
2236 2252
2237 refresh_count++; 2253 refresh_count++;
2286 * What the heck we'll cheat and only refresh less than every page-full. 2302 * What the heck we'll cheat and only refresh less than every page-full.
2287 * if skipScroll is enabled. 2303 * if skipScroll is enabled.
2288 */ 2304 */
2289 if (refreshnow) 2305 if (refreshnow)
2290 { 2306 {
2291 flag = true;
2292 scr_refresh (); 2307 scr_refresh ();
2293 want_refresh = 1; 2308 want_refresh = 1;
2294 } 2309 }
2295
2296 } 2310 }
2297 else 2311 else
2298 { 2312 {
2299 try 2313 try
2300 { 2314 {
2308 } 2322 }
2309 2323
2310 ch = NOCHAR; 2324 ch = NOCHAR;
2311 } 2325 }
2312 } 2326 }
2313
2314 refresh_check ();
2315
2316 return flag;
2317} 2327}
2318 2328
2319// read the next character 2329// read the next character
2320wchar_t 2330wchar_t
2321rxvt_term::next_char () NOTHROW 2331rxvt_term::next_char () NOTHROW
2322{ 2332{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2333 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2334 {
2325 // assume 7-bit to be ascii ALWAYS 2335 // assume 7-bit to be ascii ALWAYS
2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2336 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2337 return *cmdbuf_ptr++;
2328 2338
2329 wchar_t wc; 2339 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2340 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2341
2335 cmdbuf_ptr = cmdbuf_endp; 2345 cmdbuf_ptr = cmdbuf_endp;
2336 break; 2346 break;
2337 } 2347 }
2338 2348
2339 if (len == (size_t)-1) 2349 if (len == (size_t)-1)
2350 {
2351 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2352 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2353 }
2341 2354
2342 // assume wchar == unicode 2355 // assume wchar == unicode
2343 cmdbuf_ptr += len; 2356 cmdbuf_ptr += len;
2344 return wc & UNICODE_MASK; 2357 return wc & UNICODE_MASK;
2345 } 2358 }
2389/*----------------------------------------------------------------------*/ 2402/*----------------------------------------------------------------------*/
2390#ifdef PRINTPIPE 2403#ifdef PRINTPIPE
2391FILE * 2404FILE *
2392rxvt_term::popen_printer () 2405rxvt_term::popen_printer ()
2393{ 2406{
2394 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2407 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2395 2408
2396 if (stream == NULL) 2409 if (stream == NULL)
2397 rxvt_warn ("can't open printer pipe, not printing.\n"); 2410 rxvt_warn ("can't open printer pipe, not printing.\n");
2398 2411
2399 return stream; 2412 return stream;
2410 * simulate attached vt100 printer 2423 * simulate attached vt100 printer
2411 */ 2424 */
2412void 2425void
2413rxvt_term::process_print_pipe () 2426rxvt_term::process_print_pipe ()
2414{ 2427{
2415 int done; 2428 FILE *fd = popen_printer ();
2416 FILE *fd;
2417 2429
2418 if ((fd = popen_printer ()) == NULL) 2430 if (!fd)
2419 return; 2431 return;
2420 2432
2421 /* 2433 /*
2422 * Send all input to the printer until either ESC[4i or ESC[?4i 2434 * Send all input to the printer until either ESC[4i or ESC[?4i
2423 * is received. 2435 * is received.
2424 */ 2436 */
2425 for (done = 0; !done;) 2437 for (int done = 0; !done; )
2426 { 2438 {
2427 unsigned char buf[8]; 2439 unsigned char buf[8];
2428 unicode_t ch; 2440 unicode_t ch;
2429 unsigned int i, len; 2441 unsigned int i, len;
2430 2442
2575 break; 2587 break;
2576 case 'Z': /* identify the terminal type */ 2588 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2589 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2590 break;
2579 case '<': /* turn off VT52 mode */ 2591 case '<': /* turn off VT52 mode */
2580 PrivMode (0, PrivMode_vt52); 2592 set_privmode (PrivMode_vt52, 0);
2581 break; 2593 break;
2582 case 'F': /* use special graphics character set */ 2594 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2595 case 'G': /* use regular character set */
2584 /* unimplemented */ 2596 /* unimplemented */
2585 break; 2597 break;
2639 scr_forwardindex (); 2651 scr_forwardindex ();
2640 break; 2652 break;
2641#endif 2653#endif
2642 case '=': 2654 case '=':
2643 case '>': 2655 case '>':
2644 PrivMode ((ch == '='), PrivMode_aplKP); 2656 set_privmode (PrivMode_aplKP, ch == '=');
2645 break; 2657 break;
2646 2658
2647 case C1_40: 2659 case C1_40:
2648 cmd_getc (); 2660 cmd_getc ();
2649 break; 2661 break;
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2700 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2701 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2702 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2703 break; /* steal obsolete ESC [ c */
2692 2704
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2705 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2706 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2707 process_csi_seq ();
2696 break; 2708 break;
2697 2709
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2710 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2711 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2712 process_osc_seq ();
2701 break; 2713 break;
2702 2714
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2715 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2716 case 'c':
2705 mbstate.reset (); 2717 mbstate.reset ();
2706 scr_poweron (); 2718 scr_poweron ();
2707 scrollbar_show (1); 2719 scrollBar.show (1);
2708 break; 2720 break;
2709 2721
2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2722 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2711 case 'n': 2723 case 'n':
2712 scr_charset_choose (2); 2724 scr_charset_choose (2);
2763 2775
2764 nargs = 0; 2776 nargs = 0;
2765 2777
2766 priv = 0; 2778 priv = 0;
2767 ch = cmd_getc (); 2779 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2780 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2781 {
2770 /* '<' '=' '>' '?' */ 2782 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2783 priv = ch;
2772 ch = cmd_getc (); 2784 ch = cmd_getc ();
2773 } 2785 }
2774 2786
2775 /* read any numerical arguments */ 2787 /* read any numerical arguments */
2824 // versions. 2836 // versions.
2825 // 2837 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2838 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2839 }
2828 break; 2840 break;
2841
2829 case '?': 2842 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2843 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2844 process_terminal_mode (ch, priv, nargs, arg);
2832 break; 2845 break;
2846
2847 case '!':
2848 if (ch == CSI_70)
2849 {
2850 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851 scr_soft_reset ();
2852
2853 static const int pm_h[] = { 7, 25 };
2854 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2855
2856 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2857 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2833 } 2858 }
2859 break;
2860 }
2861
2834 return; 2862 return;
2835 } 2863 }
2836 2864
2837 switch (ch) 2865 switch (ch)
2838 { 2866 {
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3233 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3234 */
3207void 3235void
3208rxvt_term::process_dcs_seq () 3236rxvt_term::process_dcs_seq ()
3209{ 3237{
3210 char *s;
3211 unicode_t eh;
3212
3213 /* 3238 /*
3214 * Not handled yet 3239 * Not handled yet
3215 */ 3240 */
3241
3242 unicode_t eh;
3216 s = get_to_st (eh); 3243 char *s = get_to_st (eh);
3217 if (s) 3244 if (s)
3218 free (s); 3245 free (s);
3219 3246
3220 return; 3247 return;
3221} 3248}
3225 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3226 */ 3253 */
3227void 3254void
3228rxvt_term::process_osc_seq () 3255rxvt_term::process_osc_seq ()
3229{ 3256{
3230 unicode_t ch, eh;
3231 int arg; 3257 int arg;
3232 3258
3233 ch = cmd_getc (); 3259 unicode_t ch = cmd_getc ();
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3260 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3261 arg = arg * 10 + (ch - '0');
3236 3262
3237 if (ch == ';') 3263 if (ch == ';')
3238 { 3264 {
3265 unicode_t eh;
3239 char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3240 3267
3241 if (s) 3268 if (s)
3242 { 3269 {
3243 process_xterm_seq (arg, s, eh); 3270 process_xterm_seq (arg, s, eh);
3267 3294
3268/* 3295/*
3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3270 */ 3297 */
3271void 3298void
3272rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3273{ 3300{
3274 int color; 3301 int color;
3275 char *buf, *name; 3302 char *buf, *name;
3276 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3277 int saveop = op; 3304 int saveop = op;
3318 3345
3319 XFree (value); 3346 XFree (value);
3320 } 3347 }
3321 else 3348 else
3322 { 3349 {
3323 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3324 3351
3325 if (eq) 3352 if (eq)
3326 { 3353 {
3327 *eq = 0; 3354 *eq = 0;
3328 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
3349 *buf++ = '\0'; 3376 *buf++ = '\0';
3350 3377
3351 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3352 } 3379 }
3353 break; 3380 break;
3381 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3382 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3356 break; 3384 break;
3385 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3386 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3359 break; 3388 break;
3360#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
3366 process_color_seq (op, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3367 break; 3396 break;
3368 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3369 process_color_seq (op, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3370 break; 3399 break;
3400#ifdef OPTION_HC
3401 case XTerm_Color_HC:
3402 process_color_seq (op, Color_HC, str, resp);
3403 break;
3404 case XTerm_Color_HTC:
3405 process_color_seq (op, Color_HTC, str, resp);
3406 break;
3407#endif
3371#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3372 case XTerm_Color_RV:
3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD: 3409 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp); 3410 process_color_seq (op, Color_BD, str, resp);
3378 break; 3411 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL: 3412 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp); 3413 process_color_seq (op, Color_UL, str, resp);
3382 break; 3414 break;
3383 case URxvt_Color_IT: 3415 case URxvt_Color_IT:
3384 process_color_seq (op, Color_IT, str, resp); 3416 process_color_seq (op, Color_IT, str, resp);
3385 break; 3417 break;
3386#endif 3418#endif
3419 case URxvt_Color_border:
3420 process_color_seq (op, Color_border, str, resp);
3421 break;
3387#if ENABLE_TRANSPARENCY 3422#if ENABLE_TRANSPARENCY
3388 case URxvt_Color_tint: 3423 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3424 process_color_seq (op, Color_tint, str, resp);
3390 { 3425 {
3391 bool changed = false; 3426 bool changed = false;
3427
3392 if (ISSET_PIXCOLOR (Color_tint)) 3428 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3394 else 3430 else
3395 changed = bgPixmap.unset_tint (); 3431 changed = bgPixmap.unset_tint ();
3432
3396 if (changed) 3433 if (changed)
3397 update_background (); 3434 update_background ();
3398 } 3435 }
3399 3436
3400 break; 3437 break;
3404 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3405 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3406 { 3443 {
3407 char str[256]; 3444 char str[256];
3408 3445
3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3413 } 3450 }
3414 else 3451 else
3423 changed++; 3460 changed++;
3424 str = strchr (str, ';'); 3461 str = strchr (str, ';');
3425 if (str == NULL) 3462 if (str == NULL)
3426 bgPixmap.set_defaultGeometry (); 3463 bgPixmap.set_defaultGeometry ();
3427 } 3464 }
3465
3428 while (str) 3466 while (str)
3429 { 3467 {
3430 str++; 3468 str++;
3431 if (bgPixmap.set_geometry (str)) 3469 if (bgPixmap.set_geometry (str))
3432 changed++; 3470 changed++;
3433 str = strchr (str, ';'); 3471 str = strchr (str, ';');
3434 } 3472 }
3473
3435 if (changed) 3474 if (changed)
3436 update_background (); 3475 update_background ();
3437 } 3476 }
3438 break; 3477 break;
3439#endif 3478#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3479
3448 case XTerm_logfile: 3480 case XTerm_logfile:
3449 // TODO, when secure mode? 3481 // TODO, when secure mode?
3450 break; 3482 break;
3451 3483
3518 break; 3550 break;
3519#endif 3551#endif
3520 3552
3521#if ENABLE_PERL 3553#if ENABLE_PERL
3522 case URxvt_perl: 3554 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3555 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3524 ; // no responses yet
3525 break; 3556 break;
3526#endif 3557#endif
3527 } 3558 }
3528} 3559}
3529/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
3552 { 3583 {
3553 if (mode == 'r') 3584 if (mode == 'r')
3554 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3555 else 3586 else
3556 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3587 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3557 PrivMode (state, bit); 3588
3589 set_privmode (bit, state);
3558 } 3590 }
3559 3591
3560 return state; 3592 return state;
3561} 3593}
3562 3594
3570 static const struct 3602 static const struct
3571 { 3603 {
3572 const int argval; 3604 const int argval;
3573 const unsigned long bit; 3605 const unsigned long bit;
3574 } argtopriv[] = { 3606 } argtopriv[] = {
3575 { 1, PrivMode_aplCUR }, 3607 { 1, PrivMode_aplCUR }, // DECCKM
3576 { 2, PrivMode_vt52 }, 3608 { 2, PrivMode_vt52 },
3577 { 3, PrivMode_132 }, 3609 { 3, PrivMode_132 }, // DECCOLM
3578 { 4, PrivMode_smoothScroll }, 3610 { 4, PrivMode_smoothScroll }, // DECSCLM
3579 { 5, PrivMode_rVideo }, 3611 { 5, PrivMode_rVideo }, // DECSCNM
3580 { 6, PrivMode_relOrigin }, 3612 { 6, PrivMode_relOrigin }, // DECOM
3581 { 7, PrivMode_Autowrap }, 3613 { 7, PrivMode_Autowrap }, // DECAWM
3582 // 8, bi-directional support mode 3614 // 8, auto-repeat keys // DECARM
3583 { 9, PrivMode_MouseX10 }, 3615 { 9, PrivMode_MouseX10 },
3584 // 18, 19 printing-related 3616 // 18 end FF to printer after print screen
3617 // 19 Print screen prints full screen/scroll region
3585 { 25, PrivMode_VisibleCursor }, 3618 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3586#ifdef scrollBar_esc 3619#ifdef scrollBar_esc
3587 { scrollBar_esc, PrivMode_scrollBar }, 3620 { scrollBar_esc, PrivMode_scrollBar },
3588#endif 3621#endif
3589 { 35, PrivMode_ShiftKeys }, // rxvt extension 3622 { 35, PrivMode_ShiftKeys }, // rxvt extension
3623 // 38, tektronix mode // DECTEK
3590 { 40, PrivMode_132OK }, 3624 { 40, PrivMode_132OK },
3591 // 41 xterm more fixes NYI 3625 // 41 xterm more fixes NYI
3592 // 45 margin bell NYI 3626 // 45 margin bell NYI
3593 // 46 start logging 3627 // 46 start logging
3594 { 47, PrivMode_Screen }, 3628 { 47, PrivMode_Screen },
3595 { 66, PrivMode_aplKP }, 3629 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3596#ifndef NO_BACKSPACE_KEY 3630#ifndef NO_BACKSPACE_KEY
3597 { 67, PrivMode_BackSpace }, 3631 { 67, PrivMode_BackSpace }, // DECBKM
3598#endif 3632#endif
3599 { 1000, PrivMode_MouseX11 }, 3633 { 1000, PrivMode_MouseX11 },
3600 { 1002, PrivMode_MouseBtnEvent }, 3634 { 1002, PrivMode_MouseBtnEvent },
3601 { 1003, PrivMode_MouseAnyEvent }, 3635 { 1003, PrivMode_MouseAnyEvent },
3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3606 // 1037 send DEL for keypad delete NYI 3640 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3641 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3642 // 1048 save and restore cursor
3609 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3643 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3644 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3645 { 2004, PrivMode_BracketPaste },
3611 }; 3646 };
3612 3647
3613 if (nargs == 0) 3648 if (nargs == 0)
3614 return; 3649 return;
3615 3650
3640 3675
3641 scr_touch (true); 3676 scr_touch (true);
3642 break; 3677 break;
3643#endif 3678#endif
3644 case 1048: /* alternative cursor save */ 3679 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3680 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3681 if (mode == 0)
3648 scr_cursor (RESTORE); 3682 scr_cursor (RESTORE);
3649 else if (mode == 1) 3683 else if (mode == 1)
3650 scr_cursor (SAVE); 3684 scr_cursor (SAVE);
3659 case 2: /* VT52 mode */ 3693 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3694 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3695 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3696 * within VT52 mode
3663 */ 3697 */
3664 PrivMode (1, PrivMode_vt52); 3698 set_privmode (PrivMode_vt52, 1);
3665 break; 3699 break;
3666 case 3: /* 80/132 */ 3700 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3701 if (priv_modes & PrivMode_132OK)
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3702 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3669 break; 3703 break;
3670 case 4: /* smooth scrolling */ 3704 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3705 set_option (Opt_jumpScroll, !state);
3672 break; 3706 break;
3673 case 5: /* reverse video */ 3707 case 5: /* reverse video */
3684 if (state) /* orthogonal */ 3718 if (state) /* orthogonal */
3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3719 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3686 break; 3720 break;
3687#ifdef scrollBar_esc 3721#ifdef scrollBar_esc
3688 case scrollBar_esc: 3722 case scrollBar_esc:
3689 if (scrollbar_mapping (state)) 3723 if (scrollBar.map (state))
3690 { 3724 {
3691 resize_all_windows (0, 0, 0); 3725 resize_all_windows (0, 0, 0);
3692 scr_touch (true); 3726 scr_touch (true);
3693 } 3727 }
3694 break; 3728 break;
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3749 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask; 3750 vt_emask_mouse = PointerMotionMask;
3717 } 3751 }
3718 else 3752 else
3719 vt_emask_mouse = NoEventMask; 3753 vt_emask_mouse = NoEventMask;
3754
3720 vt_select_input (); 3755 vt_select_input ();
3721 break; 3756 break;
3722 case 1010: /* scroll to bottom on TTY output inhibit */ 3757 case 1010: /* scroll to bottom on TTY output inhibit */
3723 set_option (Opt_scrollTtyOutput, !state); 3758 set_option (Opt_scrollTtyOutput, !state);
3724 break; 3759 break;
3725 case 1011: /* scroll to bottom on key press */ 3760 case 1011: /* scroll to bottom on key press */
3726 set_option (Opt_scrollTtyKeypress, state); 3761 set_option (Opt_scrollTtyKeypress, state);
3727 break; 3762 break;
3728 case 1047: /* secondary screen w/ clearing last */ 3763 case 1047: /* secondary screen w/ clearing last */
3729 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3765 if (!state)
3731 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767
3732 scr_change_screen (state); 3768 scr_change_screen (state);
3733 break; 3769 break;
3734 case 1049: /* secondary screen w/ clearing first */ 3770 case 1049: /* secondary screen w/ clearing first */
3771 if (option (Opt_secondaryScreen))
3772 if (state)
3773 scr_cursor (SAVE);
3774
3735 scr_change_screen (state); 3775 scr_change_screen (state);
3776
3736 if (option (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
3737 if (current_screen != PRIMARY) 3778 if (state)
3738 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780 else
3781 scr_cursor (RESTORE);
3739 break; 3782 break;
3740 default: 3783 default:
3741 break; 3784 break;
3742 } 3785 }
3743 } 3786 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines