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.323 by ayin, Mon May 28 18:38:03 2007 UTC vs.
Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

… …
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-2006 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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
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)
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);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 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
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 615# endif
520 return; 616 return;
521 } 617 }
522 else 618 else
523 { 619 {
524# if ENABLE_OVERLAY 620# if ISO_14755
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 635# endif
539 } 636 }
540#endif 637#endif
541 638
542#ifdef PRINTPIPE 639#ifdef PRINTPIPE
543 if (keysym == XK_Print) 640 if (keysym == XK_Print)
544 { 641 {
545 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
546 return; 643 return;
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
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
553 newlen = 1; 689 newlen = 0;
554 switch (keysym) 690 }
691 break;
692
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:
555 { 773 {
556#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
557 case XK_BackSpace: 775 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace)
559 { 776 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 777 int n = sprintf (kbuf,"\033[%d~", param);
561 ^ !!ctrl) ? '\b' : '\177'; 778 /*
562 kbuf[1] = '\0'; 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 ? '^' : '~'));
563 } 788 }
564 else 789 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 790 newlen = 0;
840 break;
841 } 791 }
842 792 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 793 }
794
795 if (newlen)
796 len = strlen (kbuf);
846 797
847 /* 798 /*
848 * Pass meta for all function keys, if 'meta' option set 799 * Pass meta for all function keys, if 'meta' option set
849 */ 800 */
850#ifdef META8_OPTION 801#ifdef META8_OPTION
… …
893 view_start = 0; 844 view_start = 0;
894 want_refresh = 1; 845 want_refresh = 1;
895 } 846 }
896 847
897 /* 848 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */ 850 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910 851
911 /* escape prefix */ 852 /* escape prefix */
912 if (meta 853 if (meta
913#ifdef META8_OPTION 854#ifdef META8_OPTION
914 && meta_char == C0_ESC 855 && meta_char == C0_ESC
… …
934#if ENABLE_FRILLS || ISO_14755 875#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 876 // ISO 14755 support
936 if (iso14755buf) 877 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 878 if (iso14755buf & ISO_14755_52)
938 { 879 {
939# if ENABLE_OVERLAY 880# if ISO_14755
940 scr_overlay_off (); 881 scr_overlay_off ();
941# endif 882# endif
942# if ISO_14755 883# if ISO_14755
943 // iso14755 part 5.2 handling: release time 884 // iso14755 part 5.2 handling: release time
944 // first: controls 885 // first: controls
… …
967 908
968 return; 909 return;
969 } 910 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 911 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 912 {
972# if ENABLE_OVERLAY 913# if ISO_14755
973 scr_overlay_off (); 914 scr_overlay_off ();
974# endif 915# endif
975 if (iso14755buf & ISO_14755_51) 916 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 917 commit_iso14755 ();
977#if ISO_14755 918#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED) 919 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 { 920 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 921 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981 922
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 923 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 924 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1035void 976void
1036rxvt_term::flush () 977rxvt_term::flush ()
1037{ 978{
1038 flush_ev.stop (); 979 flush_ev.stop ();
1039 980
1040#ifdef TRANSPARENT 981#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 982 if (bgPixmap.check_clearChanged ())
1042 { 983 {
1043 want_full_refresh = 0; 984// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 985 scr_touch (false);
1046 } 986 }
1047#endif 987#endif
1048 988
1049 if (want_refresh) 989 if (want_refresh)
… …
1085 } 1025 }
1086 while (row < end_row); 1026 while (row < end_row);
1087 } 1027 }
1088 1028
1089 scr_refresh (); 1029 scr_refresh ();
1090 scrollbar_show (1); 1030 scrollBar.show (1);
1091#ifdef USE_XIM 1031#ifdef USE_XIM
1092 IMSendSpot (); 1032 IMSendSpot ();
1093#endif 1033#endif
1094 } 1034 }
1095 1035
1096 display->flush (); 1036 display->flush ();
1097} 1037}
1098 1038
1039/* checks whether a refresh is requested and starts the refresh timer */
1099void 1040void
1100rxvt_term::check_cb (check_watcher &w) 1041rxvt_term::refresh_check ()
1042{
1043 if (want_refresh && !flush_ev.is_active ())
1044 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1045
1046 display->flush ();
1047}
1048
1049void
1050rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1051{
1102 make_current (); 1052 make_current ();
1103 1053
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1054 refresh_count = 0;
1117 flush (); 1055 flush ();
1118} 1056}
1119 1057
1120#ifdef CURSOR_BLINK 1058#ifdef CURSOR_BLINK
1121void 1059void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1060rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1061{
1124 hidden_cursor = !hidden_cursor; 1062 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1063 want_refresh = 1;
1126 1064 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1065}
1129#endif 1066#endif
1130 1067
1131#ifdef TEXT_BLINK 1068#ifdef TEXT_BLINK
1132void 1069void
1133rxvt_term::text_blink_cb (time_watcher &w) 1070rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1071{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1072 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1073 {
1137 hidden_text = !hidden_text; 1074 hidden_text = !hidden_text;
1138 want_refresh = 1; 1075 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1076 refresh_check ();
1140 } 1077 }
1078 else
1079 w.stop ();
1141} 1080}
1142#endif 1081#endif
1143 1082
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1084void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1085rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1086{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1087 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1088 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1089 {
1151 want_refresh = 1; 1090 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1091 refresh_check ();
1153 } 1092 }
1093 else
1094 w.stop ();
1154} 1095}
1155#endif 1096#endif
1156 1097
1157#ifdef SELECTION_SCROLLING 1098#ifdef SELECTION_SCROLLING
1158void 1099void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1100rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1101{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1102 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1103 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1104 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1105 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1106 refresh_check ();
1166 } 1107 }
1108 else
1109 w.stop ();
1167} 1110}
1168#endif 1111#endif
1169 1112
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1114void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1116{
1174 if (mouse_slip_wheel_speed == 0 1117 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1118 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1119 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1120 refresh_check ();
1121 }
1122
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1124 {
1125 mouse_slip_wheel_speed = 0;
1126 w.stop ();
1183 } 1127 }
1184} 1128}
1185#endif 1129#endif
1186 1130
1187#if LINUX_YIELD_HACK 1131#if LINUX_YIELD_HACK
1188static struct event_handler 1132static struct event_handler
1189{ 1133{
1190 check_watcher yield_ev; 1134 ev::prepare yield_ev;
1191 1135
1192 void yield_cb (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1193 { 1137 {
1194 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1139 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // 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.
1198 1145
1199 struct timespec ts = { 0, 0 }; 1146 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1147 nanosleep (&ts, 0);
1201 1148
1202 w.stop (); 1149 w.stop ();
1203 } 1150 }
1204 1151
… …
1243 pty_ev.stop (); 1190 pty_ev.stop ();
1244 1191
1245 if (!option (Opt_hold)) 1192 if (!option (Opt_hold))
1246 destroy (); 1193 destroy ();
1247 } 1194 }
1248 1195
1249 return false; 1196 return false;
1250} 1197}
1251 1198
1252void 1199void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1200rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1201{
1255 make_current (); 1202 make_current ();
1256 1203
1257 if (revents & EVENT_READ) 1204 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1205 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1206 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1207 cmd_parse ();
1261 break;
1262 1208
1263 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1264 pty_write (); 1210 pty_write ();
1211
1212 refresh_check ();
1265} 1213}
1266 1214
1267void 1215void
1268rxvt_term::pointer_unblank () 1216rxvt_term::pointer_unblank ()
1269{ 1217{
… …
1272 1220
1273#ifdef POINTER_BLANK 1221#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1222 hidden_pointer = 0;
1275 1223
1276 if (option (Opt_pointerBlank)) 1224 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1225 pointer_ev.start (pointerBlankDelay);
1278#endif 1226#endif
1279} 1227}
1280 1228
1281#ifdef POINTER_BLANK 1229#ifdef POINTER_BLANK
1282void 1230void
… …
1290 1238
1291 hidden_pointer = 1; 1239 hidden_pointer = 1;
1292} 1240}
1293 1241
1294void 1242void
1295rxvt_term::pointer_cb (time_watcher &w) 1243rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1244{
1297 make_current (); 1245 make_current ();
1298 1246
1299 pointer_blank (); 1247 pointer_blank ();
1300} 1248}
… …
1303void 1251void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1252rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1253{
1306 int button_number, key_state = 0; 1254 int button_number, key_state = 0;
1307 int x, y; 1255 int x, y;
1256 int code = 32;
1308 1257
1309 x = ev.x; 1258 x = Pixel2Col (ev.x);
1310 y = ev.y; 1259 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1260 if (ev.type == MotionNotify)
1261 {
1262 if (x == mouse_row && y == mouse_col)
1263 return;
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1312 1268
1313 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1314 button_number = 3; 1270 button_number = 3;
1315 else 1271 else
1316 { 1272 {
… …
1362 x + 1, 1318 x + 1,
1363 y + 1); 1319 y + 1);
1364#endif 1320#endif
1365 1321
1366 tt_printf ("\033[M%c%c%c", 1322 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1323 (code + button_number + key_state),
1368 (32 + x + 1), 1324 (32 + x + 1),
1369 (32 + y + 1)); 1325 (32 + y + 1));
1370} 1326}
1371 1327
1372/*{{{ process an X event */ 1328/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1390 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1391 focus_out ();
1436 } 1392 }
1437#endif 1393#endif
1438 } 1394 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1395 break;
1444 1396
1445 /* 1397 /*
1446 * XXX: this is not the _current_ arrangement 1398 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1399 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1432 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1433 focus_out ();
1482 break; 1434 break;
1483 1435
1484 case ConfigureNotify: 1436 case ConfigureNotify:
1437 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1438 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1439 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1440 if (ev.xconfigure.window == parent[0])
1486 { 1441 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1442 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1443 ;
1489 1444
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1445 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1446 {
1492 seen_resize = 1; 1447 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1448 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494 } 1449 }
1450 else
1451 {
1452#ifdef HAVE_BG_PIXMAP
1453 if (bgPixmap.window_position_sensitive ())
1454 {
1455 if (mapped)
1456 update_background ();
1457 else
1458 bgPixmap.invalidate ();
1459 }
1460#endif
1461 }
1495 1462
1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1499 if (option (Opt_transparent))
1500 check_our_parents ();
1501#endif
1502 } 1464 }
1503 break; 1465 break;
1504 1466
1505 case PropertyNotify: 1467 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1509 selection_property (ev.xproperty.window, ev.xproperty.atom); 1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1510 1472
1511 break; 1473 break;
1512 1474
1513 case SelectionClear: 1475 case SelectionClear:
1514 selection_clear (); 1476 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1515 break; 1477 break;
1516 1478
1517 case SelectionNotify: 1479 case SelectionNotify:
1518 if (selection_wait == Sel_normal) 1480 if (selection_wait == Sel_normal)
1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1522 case SelectionRequest: 1484 case SelectionRequest:
1523 selection_send (ev.xselectionrequest); 1485 selection_send (ev.xselectionrequest);
1524 break; 1486 break;
1525 1487
1526 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
1527 mapped = 1; 1505 mapped = 1;
1528#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1507 text_blink_ev.start ();
1530#endif 1508#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1510 break;
1533 1511
1534 case UnmapNotify: 1512 case UnmapNotify:
… …
1536#ifdef TEXT_BLINK 1514#ifdef TEXT_BLINK
1537 text_blink_ev.stop (); 1515 text_blink_ev.stop ();
1538#endif 1516#endif
1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break; 1518 break;
1541
1542#ifdef TRANSPARENT
1543 case ReparentNotify:
1544 rootwin_cb (ev);
1545 break;
1546#endif /* TRANSPARENT */
1547 1519
1548 case GraphicsExpose: 1520 case GraphicsExpose:
1549 case Expose: 1521 case Expose:
1550 if (ev.xany.window == vt) 1522 if (ev.xany.window == vt)
1551 { 1523 {
1552 do 1524 do
1525 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1556 1530
1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1531 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1558 1532
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1533 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1534 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1537 }
1562 1538
1563 want_refresh = 1; 1539 want_refresh = 1;
1564 } 1540 }
1565 else 1541 else
1566 { 1542 {
… …
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1546 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1547 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1548 ;
1573 1549
1574 if (isScrollbarWindow (ev.xany.window)) 1550 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1551 {
1576 scrollBar.setIdle (); 1552 scrollBar.state = STATE_IDLE;
1577 scrollbar_show (0); 1553 scrollBar.show (0);
1578 } 1554 }
1579
1580#ifdef TRANSPARENT
1581 if (am_transparent && ev.xany.window == parent[0])
1582 XClearWindow (dpy, ev.xany.window);
1583#endif
1584 } 1555 }
1585 break; 1556 break;
1586 1557
1587 case MotionNotify: 1558 case MotionNotify:
1588#ifdef POINTER_BLANK 1559#ifdef POINTER_BLANK
1589 if (hidden_pointer) 1560 if (hidden_pointer)
1590 pointer_unblank (); 1561 pointer_unblank ();
1591#endif 1562#endif
1563 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1564 || priv_modes & PrivMode_MouseAnyEvent)
1565 mouse_report (ev.xbutton);
1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1566 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1593 break; 1567 break;
1594 1568
1595 if (ev.xany.window == vt) 1569 if (ev.xany.window == vt)
1596 { 1570 {
… …
1630 int dist; 1604 int dist;
1631 1605
1632 /* don't clobber the current delay if we are 1606 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1607 * already in the middle of scrolling.
1634 */ 1608 */
1635 if (!sel_scroll_ev.active) 1609 if (!sel_scroll_ev.is_active ())
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1610 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1611
1638 /* save the event params so we can highlight 1612 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1613 * the selection in the pending-scroll loop
1640 */ 1614 */
1641 selection_save_x = ev.xbutton.x; 1615 selection_save_x = ev.xbutton.x;
… …
1663 else 1637 else
1664 { 1638 {
1665 /* we are within the text window, so we 1639 /* we are within the text window, so we
1666 * shouldn't be scrolling 1640 * shouldn't be scrolling
1667 */ 1641 */
1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop(); 1642 sel_scroll_ev.stop();
1670 } 1643 }
1671#endif 1644#endif
1672#ifdef MOUSE_THRESHOLD 1645#ifdef MOUSE_THRESHOLD
1673 } 1646 }
1674#endif 1647#endif
1675 } 1648 }
1676 } 1649 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1650 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1678 { 1651 {
1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1652 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1653 MotionNotify, &ev))
1681 ; 1654 ;
1682 1655
… …
1684 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1659 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1660 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1661 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1662 scrollBar.size ());
1690 want_refresh = 1; 1663 want_refresh = 1;
1691 refresh_limit = 0;
1692 scrollbar_show (1); 1664 scrollBar.show (1);
1693 } 1665 }
1694 break; 1666 break;
1695 } 1667 }
1696 1668
1697#if defined(CURSOR_BLINK) 1669#if defined(CURSOR_BLINK)
… …
1701 { 1673 {
1702 hidden_cursor = 0; 1674 hidden_cursor = 0;
1703 want_refresh = 1; 1675 want_refresh = 1;
1704 } 1676 }
1705 1677
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1678 cursor_blink_ev.again ();
1707 } 1679 }
1708#endif 1680#endif
1709 1681
1710#if defined(POINTER_BLANK) 1682#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1683 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1718 1690
1719 if (ev.type == KeyPress && hidden_pointer == 0) 1691 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank (); 1692 pointer_blank ();
1721 } 1693 }
1722#endif 1694#endif
1695
1696 refresh_check ();
1723} 1697}
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
1724 1714
1725void 1715void
1726rxvt_term::focus_in () 1716rxvt_term::focus_in ()
1727{ 1717{
1728 if (!focus) 1718 if (!focus)
1729 { 1719 {
1730 focus = 1; 1720 focus = 1;
1731 want_refresh = 1; 1721 want_refresh = 1;
1732 1722
1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1734
1735#if USE_XIM 1723#if USE_XIM
1736 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1737 { 1725 {
1738 IMSetPosition (); 1726 IMSetPosition ();
1739 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1740 } 1728 }
1741#endif 1729#endif
1742#if CURSOR_BLINK 1730#if CURSOR_BLINK
1743 if (option (Opt_cursorBlink)) 1731 if (option (Opt_cursorBlink))
1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1732 cursor_blink_ev.again ();
1745#endif 1733#endif
1746#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1747 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1748 { 1736 {
1749 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1750 scr_recolour (); 1738 scr_recolour ();
1751 } 1739 }
1752#endif 1740#endif
1753#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1755 { 1743 set_urgency (0);
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1764 }
1765#endif 1744#endif
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1766 } 1747 }
1767} 1748}
1768 1749
1769void 1750void
1770rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1772 if (focus) 1753 if (focus)
1773 { 1754 {
1774 focus = 0; 1755 focus = 0;
1775 want_refresh = 1; 1756 want_refresh = 1;
1776 1757
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1758#if ENABLE_FRILLS
1778 1759 if (option (Opt_urgentOnBell))
1760 set_urgency (0);
1761#endif
1779#if ENABLE_FRILLS || ISO_14755 1762#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf) 1763 if (iso14755buf)
1781 { 1764 {
1782 iso14755buf = 0; 1765 iso14755buf = 0;
1783# if ENABLE_OVERLAY 1766# if ISO_14755
1784 scr_overlay_off (); 1767 scr_overlay_off ();
1785# endif 1768# endif
1786 } 1769 }
1787#endif 1770#endif
1788#if USE_XIM 1771#if USE_XIM
… …
1790 XUnsetICFocus (Input_Context); 1773 XUnsetICFocus (Input_Context);
1791#endif 1774#endif
1792#if CURSOR_BLINK 1775#if CURSOR_BLINK
1793 if (option (Opt_cursorBlink)) 1776 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1777 cursor_blink_ev.stop ();
1778
1795 hidden_cursor = 0; 1779 hidden_cursor = 0;
1796#endif 1780#endif
1797#if OFF_FOCUS_FADING 1781#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1782 if (rs[Rs_fade])
1799 { 1783 {
1800 pix_colors = pix_colors_unfocused; 1784 pix_colors = pix_colors_unfocused;
1801 scr_recolour (); 1785 scr_recolour ();
1802 } 1786 }
1803#endif 1787#endif
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1804 } 1790 }
1805} 1791}
1806 1792
1807void 1793void
1808rxvt_term::update_fade_color (unsigned int idx) 1794rxvt_term::update_fade_color (unsigned int idx)
… …
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 } 1802 }
1817#endif 1803#endif
1818} 1804}
1819 1805
1820#if TRANSPARENT || ENABLE_PERL 1806#if ENABLE_TRANSPARENCY || ENABLE_PERL
1821void 1807void
1822rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1809{
1824 make_current (); 1810 make_current ();
1825 1811
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return; 1814 return;
1829 1815
1830# if TRANSPARENT 1816# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1817 switch (ev.type)
1832 { 1818 {
1833 case PropertyNotify: 1819 case PropertyNotify:
1834 /* 1820 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1821 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1822 * use the property to determine the pixmap. We use it later on.
1837 */ 1823 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1826 {
1827 bgPixmap.set_root_pixmap ();
1828 update_background ();
1829 }
1841 1830
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1831 break;
1847 } 1832 }
1848# endif 1833# endif
1834
1835 refresh_check ();
1849} 1836}
1850#endif 1837#endif
1851 1838
1852void 1839void
1853rxvt_term::button_press (XButtonEvent &ev) 1840rxvt_term::button_press (XButtonEvent &ev)
… …
1884 /* save the xbutton state (for ButtonRelease) */ 1871 /* save the xbutton state (for ButtonRelease) */
1885 MEvent.state = ev.state; 1872 MEvent.state = ev.state;
1886#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1887 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1888 { 1875 {
1889 /* same button, within alloted time */ 1876 /* same button, within allowed time */
1890 MEvent.clicks++; 1877 MEvent.clicks++;
1891 1878
1892 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1893 { 1880 {
1894 /* only report double clicks */ 1881 /* only report double clicks */
… …
1908 mouse_report (ev); 1895 mouse_report (ev);
1909 } 1896 }
1910#else 1897#else
1911 MEvent.button = ev.button; 1898 MEvent.button = ev.button;
1912 mouse_report (ev); 1899 mouse_report (ev);
1913#endif /* MOUSE_REPORT_DOUBLECLICK */ 1900#endif /* MOUSE_REPORT_DOUBLECLICK */
1914 1901
1915 } 1902 }
1916 else 1903 else
1917 { 1904 {
1918 if (ev.button != MEvent.button) 1905 if (ev.button != MEvent.button)
… …
1966 } 1953 }
1967 1954
1968 /* 1955 /*
1969 * Scrollbar window processing of button press 1956 * Scrollbar window processing of button press
1970 */ 1957 */
1971 if (isScrollbarWindow (ev.window)) 1958 if (scrollBar.state && ev.window == scrollBar.win)
1972 { 1959 {
1973 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;
1974 /* 1968 /*
1975 * Rxvt-style scrollbar: 1969 * Rxvt-style scrollbar:
1976 * move up if mouse is above slider 1970 * move up if mouse is above slider
1977 * move dn if mouse is below slider 1971 * move dn if mouse is below slider
1978 * 1972 *
… …
1987 /* 1981 /*
1988 * Mouse report disabled scrollbar: 1982 * Mouse report disabled scrollbar:
1989 * arrow buttons - send up/down 1983 * arrow buttons - send up/down
1990 * click on scrollbar - send pageup/down 1984 * click on scrollbar - send pageup/down
1991 */ 1985 */
1992 if ((scrollBar.style == R_SB_NEXT 1986 if (direction == UP)
1993 && scrollbarnext_upButton (ev.y))
1994 || (scrollBar.style == R_SB_RXVT
1995 && scrollbarrxvt_upButton (ev.y)))
1996 tt_printf ("\033[A"); 1987 tt_printf ("\033[A");
1997 else if ((scrollBar.style == R_SB_NEXT 1988 else if (direction == DN)
1998 && scrollbarnext_dnButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_dnButton (ev.y)))
2001 tt_printf ("\033[B"); 1989 tt_printf ("\033[B");
2002 else 1990 else
2003 switch (ev.button) 1991 switch (ev.button)
2004 { 1992 {
2005 case Button2: 1993 case Button2:
… …
2012 tt_printf ("\033[5~"); 2000 tt_printf ("\033[5~");
2013 break; 2001 break;
2014 } 2002 }
2015 } 2003 }
2016 else 2004 else
2017#endif /* NO_SCROLLBAR_REPORT */ 2005#endif /* NO_SCROLLBAR_REPORT */
2018
2019 {
2020 char upordown = 0;
2021
2022 if (scrollBar.style == R_SB_NEXT)
2023 { 2006 {
2024 if (scrollbarnext_upButton (ev.y)) 2007 if (direction != NO_DIR)
2025 upordown = -1; /* up */
2026 else if (scrollbarnext_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 else if (scrollBar.style == R_SB_RXVT)
2030 {
2031 if (scrollbarrxvt_upButton (ev.y))
2032 upordown = -1; /* up */
2033 else if (scrollbarrxvt_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 if (upordown)
2037 { 2008 {
2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2010 if (!cont_scroll_ev.is_active ())
2039 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2011 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2040#endif 2012#endif
2041 if (scr_page (upordown < 0 ? UP : DN, 1)) 2013 if (scr_page (direction, 1))
2042 { 2014 {
2043 if (upordown < 0) 2015 if (direction == UP)
2044 scrollBar.setUp (); 2016 scrollBar.state = STATE_UP;
2045 else 2017 else
2046 scrollBar.setDn (); 2018 scrollBar.state = STATE_DOWN;
2047 } 2019 }
2048 } 2020 }
2049 else 2021 else
2050 switch (ev.button) 2022 switch (ev.button)
2051 { 2023 {
2052 case Button2: 2024 case Button2:
2053 switch (scrollbar_align) 2025 switch (scrollBar.align)
2054 { 2026 {
2055 case R_SB_ALIGN_TOP: 2027 case R_SB_ALIGN_TOP:
2056 csrO = 0; 2028 csrO = 0;
2057 break; 2029 break;
2058 case R_SB_ALIGN_CENTRE: 2030 case R_SB_ALIGN_CENTRE:
… …
2064 } 2036 }
2065 2037
2066 if (scrollBar.style == R_SB_XTERM 2038 if (scrollBar.style == R_SB_XTERM
2067 || scrollbar_above_slider (ev.y) 2039 || scrollbar_above_slider (ev.y)
2068 || scrollbar_below_slider (ev.y)) 2040 || scrollbar_below_slider (ev.y))
2069 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2041 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2070 2042
2071 scrollBar.setMotion (); 2043 scrollBar.state = STATE_MOTION;
2072 break; 2044 break;
2073 2045
2074 case Button1: 2046 case Button1:
2075 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2047 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2076 csrO = ev.y - scrollBar.top; 2048 csrO = ev.y - scrollBar.top;
2077 /* FALLTHROUGH */ 2049 /* FALLTHROUGH */
2078 2050
2079 case Button3: 2051 case Button3:
2080 if (scrollBar.style != R_SB_XTERM) 2052 if (scrollBar.style != R_SB_XTERM)
… …
2090 scr_page (DN, nrow - 1); 2062 scr_page (DN, nrow - 1);
2091# else 2063# else
2092 scr_page (DN, nrow / 4); 2064 scr_page (DN, nrow / 4);
2093# endif 2065# endif
2094 else 2066 else
2095 scrollBar.setMotion (); 2067 scrollBar.state = STATE_MOTION;
2096 } 2068 }
2097 else 2069 else
2098 { 2070 {
2099 scr_page ((ev.button == Button1 ? DN : UP), 2071 scr_page ((ev.button == Button1 ? DN : UP),
2100 (nrow 2072 (nrow
2101 * scrollbar_position (ev.y) 2073 * scrollbar_position (ev.y)
2102 / scrollbar_size ())); 2074 / scrollBar.size ()));
2103 } 2075 }
2104 2076
2105 break; 2077 break;
2106 } 2078 }
2107 } 2079 }
… …
2117 2089
2118 csrO = 0; /* reset csr Offset */ 2090 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2091 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2092 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2093
2122 if (scrollbar_isUpDn ()) 2094 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2123 { 2095 {
2124 scrollBar.setIdle (); 2096 scrollBar.state = STATE_IDLE;
2125 scrollbar_show (0); 2097 scrollBar.show (0);
2126 } 2098 }
2127 2099
2128#ifdef SELECTION_SCROLLING 2100#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2101 sel_scroll_ev.stop();
2131#endif 2102#endif
2132 2103
2133 if (ev.window == vt) 2104 if (ev.window == vt)
2134 { 2105 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2106 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2159 mouse_report (ev); 2130 mouse_report (ev);
2160 } 2131 }
2161#else /* MOUSE_REPORT_DOUBLECLICK */ 2132#else /* MOUSE_REPORT_DOUBLECLICK */
2162 MEvent.button = AnyButton; 2133 MEvent.button = AnyButton;
2163 mouse_report (ev); 2134 mouse_report (ev);
2164#endif /* MOUSE_REPORT_DOUBLECLICK */ 2135#endif /* MOUSE_REPORT_DOUBLECLICK */
2165 return; 2136 return;
2166 } 2137 }
2167 2138
2168 /* 2139 /*
2169 * dumb hack to compensate for the failure of click-and-drag 2140 * dumb hack to compensate for the failure of click-and-drag
… …
2181 selection_make (ev.time); 2152 selection_make (ev.time);
2182 break; 2153 break;
2183 2154
2184 case Button2: 2155 case Button2:
2185 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?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2157 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2158 break;
2188 2159
2189#ifdef MOUSE_WHEEL 2160#ifdef MOUSE_WHEEL
2190 case Button4: 2161 case Button4:
2191 case Button5: 2162 case Button5:
… …
2207 { 2178 {
2208 mouse_slip_wheel_speed += v ? -1 : 1; 2179 mouse_slip_wheel_speed += v ? -1 : 1;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2180 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2181 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211 2182
2212 if (slip_wheel_ev.at < NOW) 2183 if (!slip_wheel_ev.is_active ())
2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2184 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2214
2215 slip_wheel_ev.start ();
2216 } 2185 }
2217 else 2186 else
2187# endif
2218 { 2188 {
2219# endif
2220 scr_page (v, i); 2189 scr_page (v, i);
2221 scrollbar_show (1); 2190 scrollBar.show (1);
2222# ifdef MOUSE_SLIP_WHEELING
2223 } 2191 }
2224# endif
2225 } 2192 }
2226 break; 2193 break;
2227#endif 2194#endif
2228 } 2195 }
2229 } 2196 }
2230} 2197}
2231 2198
2232#ifdef TRANSPARENT
2233#if TINTING
2234/* taken from aterm-0.4.2 */
2235
2236typedef uint32_t RUINT32T;
2237
2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2239{
2240 int sh_r, sh_g, sh_b;
2241 RUINT32T mask_r, mask_g, mask_b;
2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2245 int i;
2246
2247 Visual *visual = term->visual;
2248
2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2250
2251 /* for convenience */
2252 mask_r = visual->red_mask;
2253 mask_g = visual->green_mask;
2254 mask_b = visual->blue_mask;
2255
2256 /* boring lookup table pre-initialization */
2257 switch (srcImage->bits_per_pixel) {
2258 case 15:
2259 if ((mask_r != 0x7c00) ||
2260 (mask_g != 0x03e0) ||
2261 (mask_b != 0x001f))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2264 lookup_r = lookup;
2265 lookup_g = lookup+32;
2266 lookup_b = lookup+32+32;
2267 sh_r = 10;
2268 sh_g = 5;
2269 sh_b = 0;
2270 break;
2271 case 16:
2272 if ((mask_r != 0xf800) ||
2273 (mask_g != 0x07e0) ||
2274 (mask_b != 0x001f))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2277 lookup_r = lookup;
2278 lookup_g = lookup+32;
2279 lookup_b = lookup+32+64;
2280 sh_r = 11;
2281 sh_g = 5;
2282 sh_b = 0;
2283 break;
2284 case 24:
2285 if ((mask_r != 0xff0000) ||
2286 (mask_g != 0x00ff00) ||
2287 (mask_b != 0x0000ff))
2288 return;
2289 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2290 lookup_r = lookup;
2291 lookup_g = lookup+256;
2292 lookup_b = lookup+256+256;
2293 sh_r = 16;
2294 sh_g = 8;
2295 sh_b = 0;
2296 break;
2297 case 32:
2298 if ((mask_r != 0xff0000) ||
2299 (mask_g != 0x00ff00) ||
2300 (mask_b != 0x0000ff))
2301 return;
2302 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2303 lookup_r = lookup;
2304 lookup_g = lookup+256;
2305 lookup_b = lookup+256+256;
2306 sh_r = 16;
2307 sh_g = 8;
2308 sh_b = 0;
2309 break;
2310 default:
2311 return; /* we do not support this color depth */
2312 }
2313
2314 /* prepare limits for color transformation (each channel is handled separately) */
2315 if (shade < 0) {
2316 shade = -shade;
2317 if (shade < 0) shade = 0;
2318 if (shade > 100) shade = 100;
2319
2320 lower_lim_r = 65535-rm;
2321 lower_lim_g = 65535-gm;
2322 lower_lim_b = 65535-bm;
2323
2324 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2325 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2326 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2327
2328 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2329 } else {
2330 if (shade < 0) shade = 0;
2331 if (shade > 100) shade = 100;
2332
2333 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2334
2335 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2336 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2337 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2338 }
2339
2340 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2341 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2342 {
2343 unsigned int tmp;
2344
2345 tmp = lower_lim_r;
2346 lower_lim_r = lower_lim_b;
2347 lower_lim_b = tmp;
2348
2349 tmp = upper_lim_r;
2350 upper_lim_r = upper_lim_b;
2351 upper_lim_b = tmp;
2352 }
2353
2354 /* fill our lookup tables */
2355 for (i = 0; i <= mask_r>>sh_r; i++)
2356 {
2357 RUINT32T tmp;
2358 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2359 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2360 lookup_r[i] = (tmp/65535)<<sh_r;
2361 }
2362 for (i = 0; i <= mask_g>>sh_g; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2366 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2367 lookup_g[i] = (tmp/65535)<<sh_g;
2368 }
2369 for (i = 0; i <= mask_b>>sh_b; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2373 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2374 lookup_b[i] = (tmp/65535)<<sh_b;
2375 }
2376
2377 /* apply table to input image (replacing colors by newly calculated ones) */
2378 switch (srcImage->bits_per_pixel)
2379 {
2380 case 15:
2381 {
2382 unsigned short *p1, *pf, *p, *pl;
2383 p1 = (unsigned short *) srcImage->data;
2384 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2385 while (p1 < pf)
2386 {
2387 p = p1;
2388 pl = p1 + srcImage->width;
2389 for (; p < pl; p++)
2390 {
2391 *p = lookup_r[(*p & 0x7c00)>>10] |
2392 lookup_g[(*p & 0x03e0)>> 5] |
2393 lookup_b[(*p & 0x001f)];
2394 }
2395 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2396 }
2397 break;
2398 }
2399 case 16:
2400 {
2401 unsigned short *p1, *pf, *p, *pl;
2402 p1 = (unsigned short *) srcImage->data;
2403 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xf800)>>11] |
2411 lookup_g[(*p & 0x07e0)>> 5] |
2412 lookup_b[(*p & 0x001f)];
2413 }
2414 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2415 }
2416 break;
2417 }
2418 case 24:
2419 {
2420 unsigned char *p1, *pf, *p, *pl;
2421 p1 = (unsigned char *) srcImage->data;
2422 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2423 while (p1 < pf)
2424 {
2425 p = p1;
2426 pl = p1 + srcImage->width * 3;
2427 for (; p < pl; p += 3)
2428 {
2429 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2430 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2431 p[2] = lookup_r[(p[2] & 0x0000ff)];
2432 }
2433 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 case 32:
2438 {
2439 RUINT32T *p1, *pf, *p, *pl;
2440 p1 = (RUINT32T *) srcImage->data;
2441 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2442
2443 while (p1 < pf)
2444 {
2445 p = p1;
2446 pl = p1 + srcImage->width;
2447 for (; p < pl; p++)
2448 {
2449 *p = lookup_r[(*p & 0xff0000)>>16] |
2450 lookup_g[(*p & 0x00ff00)>> 8] |
2451 lookup_b[(*p & 0x0000ff)] |
2452 (*p & ~0xffffff);
2453 }
2454 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2455 }
2456 break;
2457 }
2458 }
2459
2460 free (lookup);
2461}
2462#endif
2463
2464/*
2465 * Check our parents are still who we think they are.
2466 * Do transparency updates if required
2467 */
2468int
2469rxvt_term::check_our_parents ()
2470{
2471 int i, pchanged, aformat, have_pixmap, rootdepth;
2472 unsigned long nitems, bytes_after;
2473 Atom atype;
2474 unsigned char *prop = NULL;
2475 Window root, oldp, *list;
2476 Pixmap rootpixmap = None;
2477 XWindowAttributes wattr, wrootattr;
2478
2479 pchanged = 0;
2480
2481 if (!option (Opt_transparent))
2482 return pchanged; /* Don't try any more */
2483
2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2485 rootdepth = wrootattr.depth;
2486
2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2488
2489 if (rootdepth != wattr.depth)
2490 {
2491 if (am_transparent)
2492 {
2493 pchanged = 1;
2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2495 am_transparent = am_pixmap_trans = 0;
2496 }
2497
2498 return pchanged; /* Don't try any more */
2499 }
2500
2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2502 XSync (dpy, False);
2503
2504 /*
2505 * Make the frame window set by the window manager have
2506 * the root background. Some window managers put multiple nested frame
2507 * windows for each client, so we have to take care about that.
2508 */
2509 i = (xa[XA_XROOTPMAP_ID]
2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2512 &nitems, &bytes_after, &prop) == Success);
2513
2514 if (!i || prop == NULL)
2515 i = (xa[XA_ESETROOT_PMAP_ID]
2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success);
2519
2520 if (!i || prop == NULL
2521#if TINTING
2522 || !ISSET_PIXCOLOR (Color_tint)
2523#endif
2524 )
2525 have_pixmap = 0;
2526 else
2527 {
2528 have_pixmap = 1;
2529 rootpixmap = *(Pixmap *)prop;
2530 XFree (prop);
2531 }
2532
2533 if (have_pixmap)
2534 {
2535 /*
2536 * Copy display->root pixmap transparency
2537 */
2538 int sx, sy, nx, ny;
2539 unsigned int nw, nh;
2540 Window cr;
2541 XImage *image;
2542 GC gc;
2543 XGCValues gcvalue;
2544
2545 XTranslateCoordinates (dpy, parent[0], display->root,
2546 0, 0, &sx, &sy, &cr);
2547 nw = (unsigned int)szHint.width;
2548 nh = (unsigned int)szHint.height;
2549 nx = ny = 0;
2550
2551 if (sx < 0)
2552 {
2553 nw += sx;
2554 nx = -sx;
2555 sx = 0;
2556 }
2557
2558 if (sy < 0)
2559 {
2560 nh += sy;
2561 ny = -sy;
2562 sy = 0;
2563 }
2564
2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2569 allowedxerror = -1;
2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2571
2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2573 /* XXX: may need a delay here? */
2574 allowedxerror = 0;
2575
2576 if (image == NULL)
2577 {
2578 if (am_transparent && am_pixmap_trans)
2579 {
2580 pchanged = 1;
2581 if (pixmap != None)
2582 {
2583 XFreePixmap (dpy, pixmap);
2584 pixmap = None;
2585 }
2586 }
2587
2588 am_pixmap_trans = 0;
2589 }
2590 else
2591 {
2592 if (pixmap != None)
2593 XFreePixmap (dpy, pixmap);
2594
2595#if TINTING
2596 if (ISSET_PIXCOLOR (Color_tint))
2597 {
2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2599
2600 rgba c;
2601 pix_colors_focused [Color_tint].get (c);
2602
2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2604 }
2605#endif
2606
2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2610 nx, ny, image->width, image->height);
2611 XFreeGC (dpy, gc);
2612 XDestroyImage (image);
2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2614 XClearWindow (dpy, parent[0]);
2615
2616 if (!am_transparent || !am_pixmap_trans)
2617 pchanged = 1;
2618
2619 am_transparent = am_pixmap_trans = 1;
2620 }
2621 }
2622
2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2626 {
2627 unsigned int n;
2628 /*
2629 * InheritPixmap transparency
2630 */
2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2632 {
2633 oldp = parent[i];
2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2635 XFree (list);
2636
2637 if (parent[i] == display->root)
2638 {
2639 if (oldp != None)
2640 pchanged = 1;
2641
2642 break;
2643 }
2644
2645 if (oldp != parent[i])
2646 pchanged = 1;
2647 }
2648
2649 n = 0;
2650
2651 if (pchanged)
2652 for (; n < (unsigned int)i; n++)
2653 {
2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2657 {
2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2659 break;
2660 }
2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2664 {
2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2667 am_transparent = 0;
2668 /* XXX: also turn off Opt_transparent? */
2669 }
2670 else
2671 {
2672 for (n = 0; n < (unsigned int)i; n++)
2673 {
2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2675 XClearWindow (dpy, parent[n]);
2676 }
2677
2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2679 am_transparent = 1;
2680 }
2681
2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2683 parent[i] = None;
2684 }
2685
2686 if (scrollBar.win)
2687 {
2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2689 scrollBar.setIdle ();
2690 scrollbar_show (0);
2691 }
2692
2693 if (am_transparent)
2694 {
2695 want_refresh = want_full_refresh = 1;
2696 if (am_pixmap_trans)
2697 flush ();
2698 }
2699
2700 return pchanged;
2701}
2702#endif
2703
2704/*}}} */ 2199/*}}} */
2705 2200
2706bool 2201void
2707rxvt_term::cmd_parse () 2202rxvt_term::cmd_parse ()
2708{ 2203{
2709 bool flag = false;
2710 wchar_t ch = NOCHAR; 2204 wchar_t ch = NOCHAR;
2711 char *seq_begin; // remember start of esc-sequence here 2205 char *seq_begin; // remember start of esc-sequence here
2712 2206
2713 for (;;) 2207 for (;;)
2714 { 2208 {
2715 if (ch == NOCHAR) 2209 if (expect_false (ch == NOCHAR))
2716 { 2210 {
2717 seq_begin = cmdbuf_ptr; 2211 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2212 ch = next_char ();
2719 2213
2720 if (ch == NOCHAR) 2214 if (ch == NOCHAR)
2721 break; 2215 break;
2722 } 2216 }
2723 2217
2724 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))
2725 { 2219 {
2726 if (!seen_input) 2220 if (expect_false (!seen_input))
2727 { 2221 {
2728 seen_input = 1; 2222 seen_input = 1;
2729 // many badly-written programs (e.g. jed) contain a race condition: 2223 // many badly-written programs (e.g. jed) contain a race condition:
2730 // they first read the screensize and then install a SIGWINCH handler. 2224 // they first read the screensize and then install a SIGWINCH handler.
2731 // some window managers resize the window early, and these programs 2225 // some window managers resize the window early, and these programs
… …
2744 wchar_t *str = buf; 2238 wchar_t *str = buf;
2745 wchar_t *eol = str + min (ncol, UBUFSIZ); 2239 wchar_t *eol = str + min (ncol, UBUFSIZ);
2746 2240
2747 for (;;) 2241 for (;;)
2748 { 2242 {
2749 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)))
2750 break; 2244 break;
2751 2245
2752 *str++ = ch; 2246 *str++ = ch;
2753 2247
2754 if (ch == C0_LF || str >= eol) 2248 if (expect_false (ch == C0_LF || str >= eol))
2755 { 2249 {
2756 if (ch == C0_LF) 2250 if (ch == C0_LF)
2757 nlines++; 2251 nlines++;
2758 2252
2759 refresh_count++; 2253 refresh_count++;
2760 2254
2761 if (!option (Opt_jumpScroll) 2255 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2763 { 2256 {
2764 refreshnow = true;
2765 refresh_count = 0; 2257 refresh_count = 0;
2258
2259 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2260 {
2261 refreshnow = true;
2766 ch = NOCHAR; 2262 ch = NOCHAR;
2767 break; 2263 break;
2264 }
2768 } 2265 }
2769 2266
2770 // scr_add_lines only works for nlines <= nrow - 1. 2267 // scr_add_lines only works for nlines <= nrow - 1.
2771 if (nlines >= nrow - 1) 2268 if (nlines >= nrow - 1)
2772 { 2269 {
… …
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2297 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2801 scr_add_lines (buf, str - buf, nlines); 2298 scr_add_lines (buf, str - buf, nlines);
2802 2299
2803 /* 2300 /*
2804 * If there have been a lot of new lines, then update the screen 2301 * If there have been a lot of new lines, then update the screen
2805 * What the heck I'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.
2806 * the number of pages between refreshes is refresh_limit, which 2303 * if skipScroll is enabled.
2807 * is incremented here because we must be doing flat-out scrolling.
2808 */ 2304 */
2809 if (refreshnow) 2305 if (refreshnow)
2810 { 2306 {
2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2812 refresh_limit++;
2813 else
2814 {
2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2817 scr_refresh (); 2307 scr_refresh ();
2818 want_refresh = 1; 2308 want_refresh = 1;
2819 }
2820 } 2309 }
2821
2822 } 2310 }
2823 else 2311 else
2824 { 2312 {
2825 try 2313 try
2826 { 2314 {
… …
2834 } 2322 }
2835 2323
2836 ch = NOCHAR; 2324 ch = NOCHAR;
2837 } 2325 }
2838 } 2326 }
2839
2840 return flag;
2841} 2327}
2842 2328
2843// read the next character 2329// read the next character
2844wchar_t 2330wchar_t
2845rxvt_term::next_char () NOTHROW 2331rxvt_term::next_char () NOTHROW
2846{ 2332{
2847 while (cmdbuf_ptr < cmdbuf_endp) 2333 while (cmdbuf_ptr < cmdbuf_endp)
2848 { 2334 {
2849 // assume 7-bit to be ascii ALWAYS 2335 // assume 7-bit to be ascii ALWAYS
2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2336 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2851 return *cmdbuf_ptr++; 2337 return *cmdbuf_ptr++;
2852 2338
2853 wchar_t wc; 2339 wchar_t wc;
2854 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);
2855 2341
… …
2859 cmdbuf_ptr = cmdbuf_endp; 2345 cmdbuf_ptr = cmdbuf_endp;
2860 break; 2346 break;
2861 } 2347 }
2862 2348
2863 if (len == (size_t)-1) 2349 if (len == (size_t)-1)
2350 {
2351 mbstate.reset (); // reset now undefined conversion state
2864 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 }
2865 2354
2866 // assume wchar == unicode 2355 // assume wchar == unicode
2867 cmdbuf_ptr += len; 2356 cmdbuf_ptr += len;
2868 return wc & UNICODE_MASK; 2357 return wc & UNICODE_MASK;
2869 } 2358 }
… …
2913/*----------------------------------------------------------------------*/ 2402/*----------------------------------------------------------------------*/
2914#ifdef PRINTPIPE 2403#ifdef PRINTPIPE
2915FILE * 2404FILE *
2916rxvt_term::popen_printer () 2405rxvt_term::popen_printer ()
2917{ 2406{
2918 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2407 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2919 2408
2920 if (stream == NULL) 2409 if (stream == NULL)
2921 rxvt_warn ("can't open printer pipe, not printing.\n"); 2410 rxvt_warn ("can't open printer pipe, not printing.\n");
2922 2411
2923 return stream; 2412 return stream;
… …
2934 * simulate attached vt100 printer 2423 * simulate attached vt100 printer
2935 */ 2424 */
2936void 2425void
2937rxvt_term::process_print_pipe () 2426rxvt_term::process_print_pipe ()
2938{ 2427{
2939 int done; 2428 FILE *fd = popen_printer ();
2940 FILE *fd;
2941 2429
2942 if ((fd = popen_printer ()) == NULL) 2430 if (!fd)
2943 return; 2431 return;
2944 2432
2945 /* 2433 /*
2946 * 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
2947 * is received. 2435 * is received.
2948 */ 2436 */
2949 for (done = 0; !done;) 2437 for (int done = 0; !done; )
2950 { 2438 {
2951 unsigned char buf[8]; 2439 unsigned char buf[8];
2952 unicode_t ch; 2440 unicode_t ch;
2953 unsigned int i, len; 2441 unsigned int i, len;
2954 2442
… …
2973 { 2461 {
2974 if ((buf[len++] = cmd_getc ()) == 'i') 2462 if ((buf[len++] = cmd_getc ()) == 'i')
2975 break; /* done = 1 */ 2463 break; /* done = 1 */
2976 } 2464 }
2977 } 2465 }
2978 2466
2979 for (i = 0; i < len; i++) 2467 for (i = 0; i < len; i++)
2980 if (putc (buf[i], fd) == EOF) 2468 if (putc (buf[i], fd) == EOF)
2981 { 2469 {
2982 done = 1; 2470 done = 1;
2983 break; 2471 break;
… …
2985 } 2473 }
2986 } 2474 }
2987 2475
2988 pclose_printer (fd); 2476 pclose_printer (fd);
2989} 2477}
2990#endif /* PRINTPIPE */ 2478#endif /* PRINTPIPE */
2991/*}}} */ 2479/*}}} */
2992 2480
2993/* *INDENT-OFF* */ 2481/* *INDENT-OFF* */
2994enum { 2482enum {
2995 C1_40 = 0x40, 2483 C1_40 = 0x40,
… …
3045 process_dcs_seq (); 2533 process_dcs_seq ();
3046 break; 2534 break;
3047 case 0x9b: /* CSI */ 2535 case 0x9b: /* CSI */
3048 process_csi_seq (); 2536 process_csi_seq ();
3049 break; 2537 break;
3050 case 0x9d: /* CSI */ 2538 case 0x9d: /* OSC */
3051 process_osc_seq (); 2539 process_osc_seq ();
3052 break; 2540 break;
3053#endif 2541#endif
3054 } 2542 }
3055} 2543}
… …
3099 break; 2587 break;
3100 case 'Z': /* identify the terminal type */ 2588 case 'Z': /* identify the terminal type */
3101 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2589 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3102 break; 2590 break;
3103 case '<': /* turn off VT52 mode */ 2591 case '<': /* turn off VT52 mode */
3104 PrivMode (0, PrivMode_vt52); 2592 set_privmode (PrivMode_vt52, 0);
3105 break; 2593 break;
3106 case 'F': /* use special graphics character set */ 2594 case 'F': /* use special graphics character set */
3107 case 'G': /* use regular character set */ 2595 case 'G': /* use regular character set */
3108 /* unimplemented */ 2596 /* unimplemented */
3109 break; 2597 break;
… …
3163 scr_forwardindex (); 2651 scr_forwardindex ();
3164 break; 2652 break;
3165#endif 2653#endif
3166 case '=': 2654 case '=':
3167 case '>': 2655 case '>':
3168 PrivMode ((ch == '='), PrivMode_aplKP); 2656 set_privmode (PrivMode_aplKP, ch == '=');
3169 break; 2657 break;
3170 2658
3171 case C1_40: 2659 case C1_40:
3172 cmd_getc (); 2660 cmd_getc ();
3173 break; 2661 break;
… …
3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2700 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3213 case C1_SCI: /* ESC Z */ 2701 case C1_SCI: /* ESC Z */
3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2702 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3215 break; /* steal obsolete ESC [ c */ 2703 break; /* steal obsolete ESC [ c */
3216 2704
3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2705 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3218 case C1_CSI: /* ESC [ */ 2706 case C1_CSI: /* ESC [ */
3219 process_csi_seq (); 2707 process_csi_seq ();
3220 break; 2708 break;
3221 2709
3222 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2710 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3223 case C1_OSC: /* ESC ] */ 2711 case C1_OSC: /* ESC ] */
3224 process_osc_seq (); 2712 process_osc_seq ();
3225 break; 2713 break;
3226 2714
3227 /* 8.3.106: RESET TO INITIAL STATE */ 2715 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3228 case 'c': 2716 case 'c':
3229 mbstate.reset (); 2717 mbstate.reset ();
3230 scr_poweron (); 2718 scr_poweron ();
3231 scrollbar_show (1); 2719 scrollBar.show (1);
3232 break; 2720 break;
3233 2721
3234 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2722 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3235 case 'n': 2723 case 'n':
3236 scr_charset_choose (2); 2724 scr_charset_choose (2);
… …
3281rxvt_term::process_csi_seq () 2769rxvt_term::process_csi_seq ()
3282{ 2770{
3283 unicode_t ch, priv, i; 2771 unicode_t ch, priv, i;
3284 unsigned int nargs, p; 2772 unsigned int nargs, p;
3285 int n, ndef; 2773 int n, ndef;
3286 int arg[ESC_ARGS]; 2774 int arg[ESC_ARGS] = { };
3287 2775
3288 for (nargs = ESC_ARGS; nargs > 0;) 2776 nargs = 0;
3289 arg[--nargs] = 0;
3290 2777
3291 priv = 0; 2778 priv = 0;
3292 ch = cmd_getc (); 2779 ch = cmd_getc ();
3293 if (ch >= '<' && ch <= '?') 2780 if ((ch >= '<' && ch <= '?') || ch == '!')
2781 {
3294 { /* '<' '=' '>' '?' */ 2782 /* '<' '=' '>' '?' '!' */
3295 priv = ch; 2783 priv = ch;
3296 ch = cmd_getc (); 2784 ch = cmd_getc ();
3297 } 2785 }
3298 2786
3299 /* read any numerical arguments */ 2787 /* read any numerical arguments */
… …
3338 switch (priv) 2826 switch (priv)
3339 { 2827 {
3340 case '>': 2828 case '>':
3341 if (ch == CSI_DA) /* secondary device attributes */ 2829 if (ch == CSI_DA) /* secondary device attributes */
3342 { 2830 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2831 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2832 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 // 2833 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2834 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2835 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3348 // that we do not support xterm mouse reporting (should be 95 when we do). 2836 // versions.
3349 // 2837 //
3350 tt_printf ("\033[>%d;94;0c", 'U'); 2838 tt_printf ("\033[>%d;95;0c", 'U');
3351 } 2839 }
3352 break; 2840 break;
2841
3353 case '?': 2842 case '?':
3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2843 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3355 process_terminal_mode (ch, priv, nargs, arg); 2844 process_terminal_mode (ch, priv, nargs, arg);
3356 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);
3357 } 2858 }
2859 break;
2860 }
2861
3358 return; 2862 return;
3359 } 2863 }
3360 2864
3361 switch (ch) 2865 switch (ch)
3362 { 2866 {
… …
3729 * 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)'
3730 */ 3234 */
3731void 3235void
3732rxvt_term::process_dcs_seq () 3236rxvt_term::process_dcs_seq ()
3733{ 3237{
3734 char *s;
3735 unicode_t eh;
3736
3737 /* 3238 /*
3738 * Not handled yet 3239 * Not handled yet
3739 */ 3240 */
3241
3242 unicode_t eh;
3740 s = get_to_st (eh); 3243 char *s = get_to_st (eh);
3741 if (s) 3244 if (s)
3742 free (s); 3245 free (s);
3743 3246
3744 return; 3247 return;
3745} 3248}
… …
3749 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3750 */ 3253 */
3751void 3254void
3752rxvt_term::process_osc_seq () 3255rxvt_term::process_osc_seq ()
3753{ 3256{
3754 unicode_t ch, eh;
3755 int arg; 3257 int arg;
3756 3258
3757 ch = cmd_getc (); 3259 unicode_t ch = cmd_getc ();
3758 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3260 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3759 arg = arg * 10 + (ch - '0'); 3261 arg = arg * 10 + (ch - '0');
3760 3262
3761 if (ch == ';') 3263 if (ch == ';')
3762 { 3264 {
3265 unicode_t eh;
3763 char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3764 3267
3765 if (s) 3268 if (s)
3766 { 3269 {
3767 process_xterm_seq (arg, s, eh); 3270 process_xterm_seq (arg, s, eh);
… …
3791 3294
3792/* 3295/*
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3297 */
3795void 3298void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3797{ 3300{
3798 int color; 3301 int color;
3799 char *buf, *name; 3302 char *buf, *name;
3800 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3801 int saveop = op; 3304 int saveop = op;
3802 3305
3803 dLocal (Display *, dpy); 3306 dLocal (Display *, dpy);
3804 3307
3805 assert (str != NULL); 3308 assert (str != NULL);
3806 3309
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3310 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return; 3311 return;
3809 3312
3810 switch (op) 3313 switch (op)
3811 { 3314 {
… …
3842 3345
3843 XFree (value); 3346 XFree (value);
3844 } 3347 }
3845 else 3348 else
3846 { 3349 {
3847 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3848 3351
3849 if (eq) 3352 if (eq)
3850 { 3353 {
3851 *eq = 0; 3354 *eq = 0;
3852 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3873 *buf++ = '\0'; 3376 *buf++ = '\0';
3874 3377
3875 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3876 } 3379 }
3877 break; 3380 break;
3381 case Rxvt_restoreFG:
3878 case XTerm_Color00: 3382 case XTerm_Color00:
3879 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3880 break; 3384 break;
3385 case Rxvt_restoreBG:
3881 case XTerm_Color01: 3386 case XTerm_Color01:
3882 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3883 break; 3388 break;
3884#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3885 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
… …
3890 process_color_seq (op, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3891 break; 3396 break;
3892 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3893 process_color_seq (op, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3894 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
3895#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3896 case XTerm_Color_RV:
3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD: 3409 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp); 3410 process_color_seq (op, Color_BD, str, resp);
3902 break; 3411 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL: 3412 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp); 3413 process_color_seq (op, Color_UL, str, resp);
3906 break; 3414 break;
3907 case URxvt_Color_IT: 3415 case URxvt_Color_IT:
3908 process_color_seq (op, Color_IT, str, resp); 3416 process_color_seq (op, Color_IT, str, resp);
3909 break; 3417 break;
3910#endif 3418#endif
3911#if TRANSPARENT && TINTING 3419 case URxvt_Color_border:
3420 process_color_seq (op, Color_border, str, resp);
3421 break;
3422#if ENABLE_TRANSPARENCY
3912 case URxvt_Color_tint: 3423 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp); 3424 process_color_seq (op, Color_tint, str, resp);
3425 {
3426 bool changed = false;
3914 3427
3915 check_our_parents (); 3428 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430 else
3431 changed = bgPixmap.unset_tint ();
3916 3432
3917 if (am_transparent) 3433 if (changed)
3918 want_full_refresh = want_refresh = 1; 3434 update_background ();
3435 }
3919 3436
3920 break; 3437 break;
3921#endif 3438#endif
3922 3439
3440#if BG_IMAGE_FROM_FILE
3923 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3924 { 3442 if (!strcmp (str, "?"))
3925 if (*str != ';')
3926 { 3443 {
3927#if XPM_BACKGROUND 3444 char str[256];
3928 scale_pixmap (""); /* reset to default scaling */ 3445
3929 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3930 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3931#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3932 } 3450 }
3933 3451 else
3452 {
3934 int changed = 0; 3453 int changed = 0;
3935 3454
3936 while ((str = strchr (str, ';')) != NULL) 3455 if (*str != ';')
3937 { 3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3465
3466 while (str)
3467 {
3938 str++; 3468 str++;
3939#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3940 changed += scale_pixmap (str); 3470 changed++;
3941#endif 3471 str = strchr (str, ';');
3942 } 3472 }
3943 3473
3944 if (changed) 3474 if (changed)
3945 { 3475 update_background ();
3946#ifdef XPM_BACKGROUND
3947 resize_pixmap ();
3948 scr_touch (true);
3949#endif
3950 } 3476 }
3951 }
3952 break; 3477 break;
3953 3478#endif
3954 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str);
3956 break;
3957 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str);
3959 break;
3960 3479
3961 case XTerm_logfile: 3480 case XTerm_logfile:
3962 // TODO, when secure mode? 3481 // TODO, when secure mode?
3963 break; 3482 break;
3964 3483
… …
4031 break; 3550 break;
4032#endif 3551#endif
4033 3552
4034#if ENABLE_PERL 3553#if ENABLE_PERL
4035 case URxvt_perl: 3554 case URxvt_perl:
4036 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));
4037 ; // no responses yet
4038 break; 3556 break;
4039#endif 3557#endif
4040 } 3558 }
4041} 3559}
4042/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
… …
4065 { 3583 {
4066 if (mode == 'r') 3584 if (mode == 'r')
4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4068 else 3586 else
4069 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3587 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4070 PrivMode (state, bit); 3588
3589 set_privmode (bit, state);
4071 } 3590 }
4072 3591
4073 return state; 3592 return state;
4074} 3593}
4075 3594
… …
4079{ 3598{
4080 unsigned int i, j; 3599 unsigned int i, j;
4081 int state; 3600 int state;
4082 3601
4083 static const struct 3602 static const struct
4084 { 3603 {
4085 const int argval; 3604 const int argval;
4086 const unsigned long bit; 3605 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3606 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3607 { 1, PrivMode_aplCUR }, // DECCKM
4091 { 2, PrivMode_vt52 }, 3608 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3609 { 3, PrivMode_132 }, // DECCOLM
4093 { 4, PrivMode_smoothScroll }, 3610 { 4, PrivMode_smoothScroll }, // DECSCLM
4094 { 5, PrivMode_rVideo }, 3611 { 5, PrivMode_rVideo }, // DECSCNM
4095 { 6, PrivMode_relOrigin }, 3612 { 6, PrivMode_relOrigin }, // DECOM
4096 { 7, PrivMode_Autowrap }, 3613 { 7, PrivMode_Autowrap }, // DECAWM
4097 // 8, bi-directional support mode 3614 // 8, auto-repeat keys // DECARM
4098 { 9, PrivMode_MouseX10 }, 3615 { 9, PrivMode_MouseX10 },
4099 // 18, 19 printing-related 3616 // 18 end FF to printer after print screen
3617 // 19 Print screen prints full screen/scroll region
4100 { 25, PrivMode_VisibleCursor }, 3618 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4101#ifdef scrollBar_esc 3619#ifdef scrollBar_esc
4102 { scrollBar_esc, PrivMode_scrollBar }, 3620 { scrollBar_esc, PrivMode_scrollBar },
4103#endif 3621#endif
4104 { 35, PrivMode_ShiftKeys }, // rxvt extension 3622 { 35, PrivMode_ShiftKeys }, // rxvt extension
3623 // 38, tektronix mode // DECTEK
4105 { 40, PrivMode_132OK }, 3624 { 40, PrivMode_132OK },
4106 // 41 xterm more fixes NYI 3625 // 41 xterm more fixes NYI
4107 // 45 margin bell NYI 3626 // 45 margin bell NYI
4108 // 46 start logging 3627 // 46 start logging
4109 { 47, PrivMode_Screen }, 3628 { 47, PrivMode_Screen },
4110 { 66, PrivMode_aplKP }, 3629 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4111#ifndef NO_BACKSPACE_KEY 3630#ifndef NO_BACKSPACE_KEY
4112 { 67, PrivMode_BackSpace }, 3631 { 67, PrivMode_BackSpace }, // DECBKM
4113#endif 3632#endif
4114 { 1000, PrivMode_MouseX11 }, 3633 { 1000, PrivMode_MouseX11 },
4115 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3634 { 1002, PrivMode_MouseBtnEvent },
4116 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3635 { 1003, PrivMode_MouseAnyEvent },
4117 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4118 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4119 { 1011, PrivMode_Keypress }, // rxvt extension 3637 { 1011, PrivMode_Keypress }, // rxvt extension
4120 // 1035 enable modifiers for alt, numlock NYI 3638 // 1035 enable modifiers for alt, numlock NYI
4121 // 1036 send ESC for meta keys NYI 3639 // 1036 send ESC for meta keys NYI
4122 // 1037 send DEL for keypad delete NYI 3640 // 1037 send DEL for keypad delete NYI
4123 { 1047, PrivMode_Screen }, 3641 { 1047, PrivMode_Screen },
4124 // 1048 save and restore cursor 3642 // 1048 save and restore cursor
4125 { 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 */
4126 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3644 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3645 { 2004, PrivMode_BracketPaste },
4127 }; 3646 };
4128 3647
4129 if (nargs == 0) 3648 if (nargs == 0)
4130 return; 3649 return;
4131 3650
… …
4156 3675
4157 scr_touch (true); 3676 scr_touch (true);
4158 break; 3677 break;
4159#endif 3678#endif
4160 case 1048: /* alternative cursor save */ 3679 case 1048: /* alternative cursor save */
4161 case 1049:
4162 if (option (Opt_secondaryScreen)) 3680 if (option (Opt_secondaryScreen))
4163 if (mode == 0) 3681 if (mode == 0)
4164 scr_cursor (RESTORE); 3682 scr_cursor (RESTORE);
4165 else if (mode == 1) 3683 else if (mode == 1)
4166 scr_cursor (SAVE); 3684 scr_cursor (SAVE);
… …
4175 case 2: /* VT52 mode */ 3693 case 2: /* VT52 mode */
4176 /* oddball mode. should be set regardless of set/reset 3694 /* oddball mode. should be set regardless of set/reset
4177 * parameter. Return from VT52 mode with an ESC < from 3695 * parameter. Return from VT52 mode with an ESC < from
4178 * within VT52 mode 3696 * within VT52 mode
4179 */ 3697 */
4180 PrivMode (1, PrivMode_vt52); 3698 set_privmode (PrivMode_vt52, 1);
4181 break; 3699 break;
4182 case 3: /* 80/132 */ 3700 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 3701 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 3702 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4185 break; 3703 break;
4186 case 4: /* smooth scrolling */ 3704 case 4: /* smooth scrolling */
4187 set_option (Opt_jumpScroll, !state); 3705 set_option (Opt_jumpScroll, !state);
4188 break; 3706 break;
4189 case 5: /* reverse video */ 3707 case 5: /* reverse video */
… …
4196 scr_autowrap (state); 3714 scr_autowrap (state);
4197 break; 3715 break;
4198 /* case 8: - auto repeat, can't do on a per window basis */ 3716 /* case 8: - auto repeat, can't do on a per window basis */
4199 case 9: /* X10 mouse reporting */ 3717 case 9: /* X10 mouse reporting */
4200 if (state) /* orthogonal */ 3718 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX11; 3719 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3720 break;
4203#ifdef scrollBar_esc 3721#ifdef scrollBar_esc
4204 case scrollBar_esc: 3722 case scrollBar_esc:
4205 if (scrollbar_mapping (state)) 3723 if (scrollBar.map (state))
4206 { 3724 {
4207 resize_all_windows (0, 0, 0); 3725 resize_all_windows (0, 0, 0);
4208 scr_touch (true); 3726 scr_touch (true);
4209 } 3727 }
4210 break; 3728 break;
… …
4219 break; 3737 break;
4220 /* case 66: - application key pad */ 3738 /* case 66: - application key pad */
4221 /* case 67: - backspace key */ 3739 /* case 67: - backspace key */
4222 case 1000: /* X11 mouse reporting */ 3740 case 1000: /* X11 mouse reporting */
4223 if (state) /* orthogonal */ 3741 if (state) /* orthogonal */
4224 priv_modes &= ~PrivMode_MouseX10; 3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4225 break; 3743 break;
4226#if 0
4227 case 1001: 3744 case 1002:
4228 break; /* X11 mouse highlighting */ 3745 case 1003:
4229#endif 3746 if (state)
3747 {
3748 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3749 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3750 vt_emask_mouse = PointerMotionMask;
3751 }
3752 else
3753 vt_emask_mouse = NoEventMask;
3754
3755 vt_select_input ();
3756 break;
4230 case 1010: /* scroll to bottom on TTY output inhibit */ 3757 case 1010: /* scroll to bottom on TTY output inhibit */
4231 set_option (Opt_scrollTtyOutput, !state); 3758 set_option (Opt_scrollTtyOutput, !state);
4232 break; 3759 break;
4233 case 1011: /* scroll to bottom on key press */ 3760 case 1011: /* scroll to bottom on key press */
4234 set_option (Opt_scrollTtyKeypress, state); 3761 set_option (Opt_scrollTtyKeypress, state);
4235 break; 3762 break;
4236 case 1047: /* secondary screen w/ clearing last */ 3763 case 1047: /* secondary screen w/ clearing last */
4237 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4238 if (current_screen != PRIMARY) 3765 if (!state)
4239 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767
4240 scr_change_screen (state); 3768 scr_change_screen (state);
4241 break; 3769 break;
4242 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
4243 scr_change_screen (state); 3775 scr_change_screen (state);
3776
4244 if (option (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4245 if (current_screen != PRIMARY) 3778 if (state)
4246 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780 else
3781 scr_cursor (RESTORE);
4247 break; 3782 break;
4248 default: 3783 default:
4249 break; 3784 break;
4250 } 3785 }
4251 } 3786 }
… …
4411rxvt_term::process_graphics () 3946rxvt_term::process_graphics ()
4412{ 3947{
4413 unicode_t ch, cmd = cmd_getc (); 3948 unicode_t ch, cmd = cmd_getc ();
4414 3949
4415 if (cmd == 'Q') 3950 if (cmd == 'Q')
3951 {
4416 { /* query graphics */ 3952 /* query graphics */
4417 tt_printf ("\033G0\012"); /* no graphics */ 3953 tt_printf ("\033G0\012"); /* no graphics */
4418 return; 3954 return;
4419 } 3955 }
4420 /* swallow other graphics sequences until terminating ':' */ 3956 /* swallow other graphics sequences until terminating ':' */
4421 do 3957 do
… …
4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4472 4008
4473 memcpy (v_buffer + v_buflen, data, len); 4009 memcpy (v_buffer + v_buflen, data, len);
4474 v_buflen += len; 4010 v_buflen += len;
4475 4011
4476 pty_ev.set (EVENT_READ | EVENT_WRITE); 4012 pty_ev.set (ev::READ | ev::WRITE);
4477} 4013}
4478 4014
4479void rxvt_term::pty_write () 4015void rxvt_term::pty_write ()
4480{ 4016{
4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4486 4022
4487 if (v_buflen == 0) 4023 if (v_buflen == 0)
4488 { 4024 {
4489 free (v_buffer); 4025 free (v_buffer);
4490 v_buffer = 0; 4026 v_buffer = 0;
4491 v_buflen = 0;
4492 4027
4493 pty_ev.set (EVENT_READ); 4028 pty_ev.set (ev::READ);
4494 return; 4029 return;
4495 } 4030 }
4496 4031
4497 memmove (v_buffer, v_buffer + written, v_buflen); 4032 memmove (v_buffer, v_buffer + written, v_buflen);
4498 } 4033 }
4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4034 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4500 pty_ev.set (EVENT_READ); 4035 pty_ev.set (ev::READ);
4501} 4036}
4502 4037
4503/*----------------------- end-of-file (C source) -----------------------*/ 4038/*----------------------- end-of-file (C source) -----------------------*/
4504 4039

Diff Legend

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