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.321 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.440 by root, Tue Mar 30 23:00:35 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->get (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 wether 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 {
… …
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
… …
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326 426
327 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
328 { 428 {
329 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
331 } 431 }
332 432
333 kbuf[0] = 0; 433 kbuf[0] = 0;
334 434
335#ifdef USE_XIM 435#ifdef USE_XIM
… …
411#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 513#else
414 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
415#endif 515#endif
516 max_it (lnsppg, 1);
517
416 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
417 { 519 {
418 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
419 return; 521 return;
420 } 522 }
… …
485 } 587 }
486 } 588 }
487 589
488#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 591 // ISO 14755 support
490 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 593 {
492 int hv; 594 int hv;
493 595
494 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 599 {
498 commit_iso14755 (); 600 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 601 iso14755buf = ISO_14755_51;
500# if ISO_14755 602# if ISO_14755
501 iso14755_51 (0); 603 iso14755_51 (0);
604# endif
605 return;
606 }
607 else if (keysym == XK_BackSpace)
608 {
609 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
610# if ISO_14755
611 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 612# endif
503 return; 613 return;
504 } 614 }
505 else if ((hv = hex_keyval (ev)) >= 0) 615 else if ((hv = hex_keyval (ev)) >= 0)
506 { 616 {
… …
511# endif 621# endif
512 return; 622 return;
513 } 623 }
514 else 624 else
515 { 625 {
516# if ENABLE_OVERLAY 626# if ISO_14755
517 scr_overlay_off (); 627 scr_overlay_off ();
518# endif 628# endif
519 iso14755buf = 0; 629 iso14755buf = 0;
520 } 630 }
521 } 631 }
632 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
525 { 636 {
526 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 638# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 640 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 641# endif
531 } 642 }
532#endif 643#endif
533 644
534#ifdef PRINTPIPE 645#ifdef PRINTPIPE
535 if (keysym == XK_Print) 646 if (keysym == XK_Print)
536 { 647 {
537 scr_printscreen (ctrl | shft); 648 scr_printscreen (ctrl | shft);
538 return; 649 return;
539 } 650 }
540#endif 651#endif
541 652
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
544 { 659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
545 newlen = 1; 690 newlen = 0;
546 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
547 { 774 {
548#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
549 case XK_BackSpace: 776 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 778 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 779 newlen = 0;
832 break;
833 } 780 }
834 781 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
838 786
839 /* 787 /*
840 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
841 */ 789 */
842#ifdef META8_OPTION 790#ifdef META8_OPTION
… …
926#if ENABLE_FRILLS || ISO_14755 874#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 875 // ISO 14755 support
928 if (iso14755buf) 876 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 877 if (iso14755buf & ISO_14755_52)
930 { 878 {
931# if ENABLE_OVERLAY 879# if ISO_14755
932 scr_overlay_off (); 880 scr_overlay_off ();
933# endif 881# endif
934# if ISO_14755 882# if ISO_14755
935 // iso14755 part 5.2 handling: release time 883 // iso14755 part 5.2 handling: release time
936 // first: controls 884 // first: controls
… …
959 907
960 return; 908 return;
961 } 909 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 910 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 911 {
964# if ENABLE_OVERLAY 912# if ISO_14755
965 scr_overlay_off (); 913 scr_overlay_off ();
966# endif 914# endif
967 if (iso14755buf & ISO_14755_51) 915 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 916 commit_iso14755 ();
969#if ISO_14755 917#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 918 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 919 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 920 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 921
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 922 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 923 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 975void
1028rxvt_term::flush () 976rxvt_term::flush ()
1029{ 977{
1030 flush_ev.stop (); 978 flush_ev.stop ();
1031 979
1032#ifdef TRANSPARENT 980#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
1034 { 982 {
1035 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 984 scr_touch (false);
1038 } 985 }
1039#endif 986#endif
1040 987
1041 if (want_refresh) 988 if (want_refresh)
… …
1077 } 1024 }
1078 while (row < end_row); 1025 while (row < end_row);
1079 } 1026 }
1080 1027
1081 scr_refresh (); 1028 scr_refresh ();
1082 scrollbar_show (1); 1029 scrollBar.show (1);
1083#ifdef USE_XIM 1030#ifdef USE_XIM
1084 IMSendSpot (); 1031 IMSendSpot ();
1085#endif 1032#endif
1086 } 1033 }
1087 1034
1088 display->flush (); 1035 display->flush ();
1089} 1036}
1090 1037
1038/* checks wether a refresh is requested and starts the refresh timer */
1091void 1039void
1092rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
1041{
1042 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1044
1045 display->flush ();
1046}
1047
1048void
1049rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1050{
1094 make_current (); 1051 make_current ();
1095 1052
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1053 refresh_count = 0;
1109 flush (); 1054 flush ();
1110} 1055}
1111 1056
1112#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1113void 1058void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1060{
1116 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1062 want_refresh = 1;
1118 1063 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1064}
1121#endif 1065#endif
1122 1066
1123#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1124void 1068void
1125rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1070{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1072 {
1129 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1130 want_refresh = 1; 1074 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1132 } 1076 }
1077 else
1078 w.stop ();
1133} 1079}
1134#endif 1080#endif
1135 1081
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1083void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1085{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1088 {
1143 want_refresh = 1; 1089 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1145 } 1091 }
1092 else
1093 w.stop ();
1146} 1094}
1147#endif 1095#endif
1148 1096
1149#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1150void 1098void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1100{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1102 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1104 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1158 } 1106 }
1107 else
1108 w.stop ();
1159} 1109}
1160#endif 1110#endif
1161 1111
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1113void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1115{
1166 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1117 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1118 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1175 } 1126 }
1176} 1127}
1177#endif 1128#endif
1178 1129
1179#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1180static struct event_handler 1131static struct event_handler
1181{ 1132{
1182 check_watcher yield_ev; 1133 ev::prepare yield_ev;
1183 1134
1184 void yield_cb (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1185 { 1136 {
1186 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaroudn against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1190 1144
1191 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1193 1147
1194 w.stop (); 1148 w.stop ();
1195 } 1149 }
1196 1150
… …
1235 pty_ev.stop (); 1189 pty_ev.stop ();
1236 1190
1237 if (!option (Opt_hold)) 1191 if (!option (Opt_hold))
1238 destroy (); 1192 destroy ();
1239 } 1193 }
1240 1194
1241 return false; 1195 return false;
1242} 1196}
1243 1197
1244void 1198void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1200{
1247 make_current (); 1201 make_current ();
1248 1202
1249 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1206 cmd_parse ();
1253 break;
1254 1207
1255 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1256 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1257} 1212}
1258 1213
1259void 1214void
1260rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1261{ 1216{
… …
1264 1219
1265#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1221 hidden_pointer = 0;
1267 1222
1268 if (option (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1270#endif 1225#endif
1271} 1226}
1272 1227
1273#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1274void 1229void
… …
1282 1237
1283 hidden_pointer = 1; 1238 hidden_pointer = 1;
1284} 1239}
1285 1240
1286void 1241void
1287rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1243{
1289 make_current (); 1244 make_current ();
1290 1245
1291 pointer_blank (); 1246 pointer_blank ();
1292} 1247}
… …
1295void 1250void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1252{
1298 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1299 int x, y; 1254 int x, y;
1255 int code = 32;
1300 1256
1301 x = ev.x; 1257 x = Pixel2Col (ev.x);
1302 y = ev.y; 1258 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1304 1267
1305 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1306 button_number = 3; 1269 button_number = 3;
1307 else 1270 else
1308 { 1271 {
… …
1354 x + 1, 1317 x + 1,
1355 y + 1); 1318 y + 1);
1356#endif 1319#endif
1357 1320
1358 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1360 (32 + x + 1), 1323 (32 + x + 1),
1361 (32 + y + 1)); 1324 (32 + y + 1));
1362} 1325}
1363 1326
1364/*{{{ process an X event */ 1327/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1389 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1390 focus_out ();
1428 } 1391 }
1429#endif 1392#endif
1430 } 1393 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1394 break;
1436 1395
1437 /* 1396 /*
1438 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1472 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1473 focus_out (); 1432 focus_out ();
1474 break; 1433 break;
1475 1434
1476 case ConfigureNotify: 1435 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1477 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1478 { 1440 {
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1442 ;
1481 1443
1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1483 { 1445 {
1484 seen_resize = 1; 1446 seen_resize = 1;
1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1486 } 1448 }
1449 else
1450 {
1451#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped)
1455 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1459#endif
1460 }
1487 1461
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1491 if (option (Opt_transparent))
1492 check_our_parents ();
1493#endif
1494 } 1463 }
1495 break; 1464 break;
1496 1465
1497 case PropertyNotify: 1466 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1501 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 1471
1503 break; 1472 break;
1504 1473
1505 case SelectionClear: 1474 case SelectionClear:
1506 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break; 1476 break;
1508 1477
1509 case SelectionNotify: 1478 case SelectionNotify:
1510 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1514 case SelectionRequest: 1483 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1516 break; 1485 break;
1517 1486
1518 case MapNotify: 1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1519 mapped = 1; 1504 mapped = 1;
1520#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1506 text_blink_ev.start ();
1522#endif 1507#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1509 break;
1525 1510
1526 case UnmapNotify: 1511 case UnmapNotify:
… …
1528#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1529 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1530#endif 1515#endif
1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1517 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1518
1540 case GraphicsExpose: 1519 case GraphicsExpose:
1541 case Expose: 1520 case Expose:
1542 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1543 { 1522 {
1544 do 1523 do
1524 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1529
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1531
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1554 1537
1555 want_refresh = 1; 1538 want_refresh = 1;
1556 } 1539 }
1557 else 1540 else
1558 { 1541 {
… …
1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1545 ;
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1547 ;
1565 1548
1566 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1567 { 1550 {
1568 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1569 scrollbar_show (0); 1552 scrollBar.show (0);
1570 } 1553 }
1571
1572#ifdef TRANSPARENT
1573 if (am_transparent && ev.xany.window == parent[0])
1574 XClearWindow (dpy, ev.xany.window);
1575#endif
1576 } 1554 }
1577 break; 1555 break;
1578 1556
1579 case MotionNotify: 1557 case MotionNotify:
1580#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1581 if (hidden_pointer) 1559 if (hidden_pointer)
1582 pointer_unblank (); 1560 pointer_unblank ();
1583#endif 1561#endif
1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1563 || priv_modes & PrivMode_MouseAnyEvent)
1564 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1566 break;
1586 1567
1587 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1588 { 1569 {
… …
1622 int dist; 1603 int dist;
1623 1604
1624 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1626 */ 1607 */
1627 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1628 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1629 1610
1630 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1631 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1632 */ 1613 */
1633 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
… …
1655 else 1636 else
1656 { 1637 {
1657 /* we are within the text window, so we 1638 /* we are within the text window, so we
1658 * shouldn't be scrolling 1639 * shouldn't be scrolling
1659 */ 1640 */
1660 if (sel_scroll_ev.active)
1661 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1662 } 1642 }
1663#endif 1643#endif
1664#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1665 } 1645 }
1666#endif 1646#endif
1667 } 1647 }
1668 } 1648 }
1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1670 { 1650 {
1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1672 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1673 ; 1653 ;
1674 1654
… …
1676 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1677 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1678 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1679 &unused_mask); 1659 &unused_mask);
1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1681 scrollbar_size ()); 1661 scrollBar.size ());
1682 want_refresh = 1; 1662 want_refresh = 1;
1683 refresh_limit = 0;
1684 scrollbar_show (1); 1663 scrollBar.show (1);
1685 } 1664 }
1686 break; 1665 break;
1687 } 1666 }
1688 1667
1689#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
… …
1693 { 1672 {
1694 hidden_cursor = 0; 1673 hidden_cursor = 0;
1695 want_refresh = 1; 1674 want_refresh = 1;
1696 } 1675 }
1697 1676
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1677 cursor_blink_ev.again ();
1699 } 1678 }
1700#endif 1679#endif
1701 1680
1702#if defined(POINTER_BLANK) 1681#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1689
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1690 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1691 pointer_blank ();
1713 } 1692 }
1714#endif 1693#endif
1694
1695 refresh_check ();
1715} 1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1716 1713
1717void 1714void
1718rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1719{ 1716{
1720 if (!focus) 1717 if (!focus)
1721 { 1718 {
1722 focus = 1; 1719 focus = 1;
1723 want_refresh = 1; 1720 want_refresh = 1;
1724 1721
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1722#if USE_XIM
1728 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1729 { 1724 {
1730 IMSetPosition (); 1725 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1732 } 1727 }
1733#endif 1728#endif
1734#if CURSOR_BLINK 1729#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1737#endif 1732#endif
1738#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1740 { 1735 {
1741 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1737 scr_recolour ();
1743 } 1738 }
1744#endif 1739#endif
1740#if ENABLE_FRILLS
1741 if (option (Opt_urgentOnBell))
1742 set_urgency (0);
1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1745 } 1746 }
1746} 1747}
1747 1748
1748void 1749void
1749rxvt_term::focus_out () 1750rxvt_term::focus_out ()
… …
1751 if (focus) 1752 if (focus)
1752 { 1753 {
1753 focus = 0; 1754 focus = 0;
1754 want_refresh = 1; 1755 want_refresh = 1;
1755 1756
1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1757 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1758#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf) 1762 if (iso14755buf)
1760 { 1763 {
1761 iso14755buf = 0; 1764 iso14755buf = 0;
1762# if ENABLE_OVERLAY 1765# if ISO_14755
1763 scr_overlay_off (); 1766 scr_overlay_off ();
1764# endif 1767# endif
1765 } 1768 }
1766#endif 1769#endif
1767#if USE_XIM 1770#if USE_XIM
… …
1769 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1770#endif 1773#endif
1771#if CURSOR_BLINK 1774#if CURSOR_BLINK
1772 if (option (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1774 hidden_cursor = 0; 1778 hidden_cursor = 0;
1775#endif 1779#endif
1776#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1778 { 1782 {
1779 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1780 scr_recolour (); 1784 scr_recolour ();
1781 } 1785 }
1782#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783 } 1789 }
1784} 1790}
1785 1791
1786void 1792void
1787rxvt_term::update_fade_color (unsigned int idx) 1793rxvt_term::update_fade_color (unsigned int idx)
… …
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 } 1801 }
1796#endif 1802#endif
1797} 1803}
1798 1804
1799#if TRANSPARENT || ENABLE_PERL 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1800void 1806void
1801rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1802{ 1808{
1803 make_current (); 1809 make_current ();
1804 1810
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return; 1813 return;
1808 1814
1809# if TRANSPARENT 1815# if ENABLE_TRANSPARENCY
1810 switch (ev.type) 1816 switch (ev.type)
1811 { 1817 {
1812 case PropertyNotify: 1818 case PropertyNotify:
1813 /* 1819 /*
1814 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1815 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1816 */ 1822 */
1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 return; 1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1820 1829
1821 /* FALLTHROUGH */
1822 case ReparentNotify:
1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1;
1825 break; 1830 break;
1826 } 1831 }
1827# endif 1832# endif
1833
1834 refresh_check ();
1828} 1835}
1829#endif 1836#endif
1830 1837
1831void 1838void
1832rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
… …
1887 mouse_report (ev); 1894 mouse_report (ev);
1888 } 1895 }
1889#else 1896#else
1890 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1891 mouse_report (ev); 1898 mouse_report (ev);
1892#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1893 1900
1894 } 1901 }
1895 else 1902 else
1896 { 1903 {
1897 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
… …
1945 } 1952 }
1946 1953
1947 /* 1954 /*
1948 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1949 */ 1956 */
1950 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1958 {
1952 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1953 /* 1967 /*
1954 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1969 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1957 * 1971 *
… …
1966 /* 1980 /*
1967 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1970 */ 1984 */
1971 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1981 else 1989 else
1982 switch (ev.button) 1990 switch (ev.button)
1983 { 1991 {
1984 case Button2: 1992 case Button2:
… …
1991 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
1992 break; 2000 break;
1993 } 2001 }
1994 } 2002 }
1995 else 2003 else
1996#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 2005 {
2003 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015 if (upordown)
2016 { 2007 {
2017#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
2018 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2019#endif 2011#endif
2020 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
2021 { 2013 {
2022 if (upordown < 0) 2014 if (direction == UP)
2023 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2024 else 2016 else
2025 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2026 } 2018 }
2027 } 2019 }
2028 else 2020 else
2029 switch (ev.button) 2021 switch (ev.button)
2030 { 2022 {
2031 case Button2: 2023 case Button2:
2032 switch (scrollbar_align) 2024 switch (scrollBar.align)
2033 { 2025 {
2034 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2035 csrO = 0; 2027 csrO = 0;
2036 break; 2028 break;
2037 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
2043 } 2035 }
2044 2036
2045 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2046 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2047 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2048 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2049 2041
2050 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2051 break; 2043 break;
2052 2044
2053 case Button1: 2045 case Button1:
2054 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2055 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2056 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2057 2049
2058 case Button3: 2050 case Button3:
2059 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
… …
2069 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2070# else 2062# else
2071 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2072# endif 2064# endif
2073 else 2065 else
2074 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2075 } 2067 }
2076 else 2068 else
2077 { 2069 {
2078 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2079 (nrow 2071 (nrow
2080 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2081 / scrollbar_size ())); 2073 / scrollBar.size ()));
2082 } 2074 }
2083 2075
2084 break; 2076 break;
2085 } 2077 }
2086 } 2078 }
… …
2096 2088
2097 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2098 if (!bypass_keystate) 2090 if (!bypass_keystate)
2099 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2100 2092
2101 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2102 { 2094 {
2103 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2104 scrollbar_show (0); 2096 scrollBar.show (0);
2105 } 2097 }
2106 2098
2107#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2108 if (sel_scroll_ev.active)
2109 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2110#endif 2101#endif
2111 2102
2112 if (ev.window == vt) 2103 if (ev.window == vt)
2113 { 2104 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2138 mouse_report (ev); 2129 mouse_report (ev);
2139 } 2130 }
2140#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2141 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2142 mouse_report (ev); 2133 mouse_report (ev);
2143#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2144 return; 2135 return;
2145 } 2136 }
2146 2137
2147 /* 2138 /*
2148 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2186 { 2177 {
2187 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2188 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2189 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2190 2181
2191 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2192 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2193
2194 slip_wheel_ev.start ();
2195 } 2184 }
2196 else 2185 else
2186# endif
2197 { 2187 {
2198# endif
2199 scr_page (v, i); 2188 scr_page (v, i);
2200 scrollbar_show (1); 2189 scrollBar.show (1);
2201# ifdef MOUSE_SLIP_WHEELING
2202 } 2190 }
2203# endif
2204 } 2191 }
2205 break; 2192 break;
2206#endif 2193#endif
2207 } 2194 }
2208 } 2195 }
2209} 2196}
2210 2197
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = term->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457
2458 pchanged = 0;
2459
2460 if (!option (Opt_transparent))
2461 return pchanged; /* Don't try any more */
2462
2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth;
2465
2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2467
2468 if (rootdepth != wattr.depth)
2469 {
2470 if (am_transparent)
2471 {
2472 pchanged = 1;
2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0;
2475 }
2476
2477 return pchanged; /* Don't try any more */
2478 }
2479
2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (dpy, False);
2482
2483 /*
2484 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that.
2487 */
2488 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success);
2498
2499 if (!i || prop == NULL
2500#if TINTING
2501 || !ISSET_PIXCOLOR (Color_tint)
2502#endif
2503 )
2504 have_pixmap = 0;
2505 else
2506 {
2507 have_pixmap = 1;
2508 rootpixmap = *(Pixmap *)prop;
2509 XFree (prop);
2510 }
2511
2512 if (have_pixmap)
2513 {
2514 /*
2515 * Copy display->root pixmap transparency
2516 */
2517 int sx, sy, nx, ny;
2518 unsigned int nw, nh;
2519 Window cr;
2520 XImage *image;
2521 GC gc;
2522 XGCValues gcvalue;
2523
2524 XTranslateCoordinates (dpy, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height;
2528 nx = ny = 0;
2529
2530 if (sx < 0)
2531 {
2532 nw += sx;
2533 nx = -sx;
2534 sx = 0;
2535 }
2536
2537 if (sy < 0)
2538 {
2539 nh += sy;
2540 ny = -sy;
2541 sy = 0;
2542 }
2543
2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546
2547 XSync (dpy, False);
2548 allowedxerror = -1;
2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */
2553 allowedxerror = 0;
2554
2555 if (image == NULL)
2556 {
2557 if (am_transparent && am_pixmap_trans)
2558 {
2559 pchanged = 1;
2560 if (pixmap != None)
2561 {
2562 XFreePixmap (dpy, pixmap);
2563 pixmap = None;
2564 }
2565 }
2566
2567 am_pixmap_trans = 0;
2568 }
2569 else
2570 {
2571 if (pixmap != None)
2572 XFreePixmap (dpy, pixmap);
2573
2574#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint))
2576 {
2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578
2579 rgba c;
2580 pix_colors_focused [Color_tint].get (c);
2581
2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583 }
2584#endif
2585
2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2589 nx, ny, image->width, image->height);
2590 XFreeGC (dpy, gc);
2591 XDestroyImage (image);
2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2593 XClearWindow (dpy, parent[0]);
2594
2595 if (!am_transparent || !am_pixmap_trans)
2596 pchanged = 1;
2597
2598 am_transparent = am_pixmap_trans = 1;
2599 }
2600 }
2601
2602 if (am_pixmap_trans)
2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2604 else
2605 {
2606 unsigned int n;
2607 /*
2608 * InheritPixmap transparency
2609 */
2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2611 {
2612 oldp = parent[i];
2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2614 XFree (list);
2615
2616 if (parent[i] == display->root)
2617 {
2618 if (oldp != None)
2619 pchanged = 1;
2620
2621 break;
2622 }
2623
2624 if (oldp != parent[i])
2625 pchanged = 1;
2626 }
2627
2628 n = 0;
2629
2630 if (pchanged)
2631 for (; n < (unsigned int)i; n++)
2632 {
2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2636 {
2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2638 break;
2639 }
2640 }
2641
2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2643 {
2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2646 am_transparent = 0;
2647 /* XXX: also turn off Opt_transparent? */
2648 }
2649 else
2650 {
2651 for (n = 0; n < (unsigned int)i; n++)
2652 {
2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2654 XClearWindow (dpy, parent[n]);
2655 }
2656
2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2658 am_transparent = 1;
2659 }
2660
2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2662 parent[i] = None;
2663 }
2664
2665 if (scrollBar.win)
2666 {
2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2668 scrollBar.setIdle ();
2669 scrollbar_show (0);
2670 }
2671
2672 if (am_transparent)
2673 {
2674 want_refresh = want_full_refresh = 1;
2675 if (am_pixmap_trans)
2676 flush ();
2677 }
2678
2679 return pchanged;
2680}
2681#endif
2682
2683/*}}} */ 2198/*}}} */
2684 2199
2685bool 2200void
2686rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2687{ 2202{
2688 bool flag = false;
2689 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2690 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2691 2205
2692 for (;;) 2206 for (;;)
2693 { 2207 {
2694 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2695 { 2209 {
2696 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2697 ch = next_char (); 2211 ch = next_char ();
2698 2212
2699 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2700 break; 2214 break;
2701 } 2215 }
2702 2216
2703 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2704 { 2218 {
2705 if (!seen_input) 2219 if (expect_false (!seen_input))
2706 { 2220 {
2707 seen_input = 1; 2221 seen_input = 1;
2708 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2709 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2710 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
… …
2723 wchar_t *str = buf; 2237 wchar_t *str = buf;
2724 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2725 2239
2726 for (;;) 2240 for (;;)
2727 { 2241 {
2728 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2729 break; 2243 break;
2730 2244
2731 *str++ = ch; 2245 *str++ = ch;
2732 2246
2733 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2734 { 2248 {
2735 if (ch == C0_LF) 2249 if (ch == C0_LF)
2736 nlines++; 2250 nlines++;
2737 2251
2738 refresh_count++; 2252 refresh_count++;
2739 2253
2740 if (!option (Opt_jumpScroll) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2742 { 2255 {
2743 refreshnow = true;
2744 refresh_count = 0; 2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2260 refreshnow = true;
2745 ch = NOCHAR; 2261 ch = NOCHAR;
2746 break; 2262 break;
2263 }
2747 } 2264 }
2748 2265
2749 // scr_add_lines only works for nlines <= nrow - 1. 2266 // scr_add_lines only works for nlines <= nrow - 1.
2750 if (nlines >= nrow - 1) 2267 if (nlines >= nrow - 1)
2751 { 2268 {
… …
2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2780 scr_add_lines (buf, str - buf, nlines); 2297 scr_add_lines (buf, str - buf, nlines);
2781 2298
2782 /* 2299 /*
2783 * If there have been a lot of new lines, then update the screen 2300 * If there have been a lot of new lines, then update the screen
2784 * What the heck I'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2785 * the number of pages between refreshes is refresh_limit, which 2302 * if skipScroll is enabled.
2786 * is incremented here because we must be doing flat-out scrolling.
2787 */ 2303 */
2788 if (refreshnow) 2304 if (refreshnow)
2789 { 2305 {
2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2791 refresh_limit++;
2792 else
2793 {
2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2796 scr_refresh (); 2306 scr_refresh ();
2797 want_refresh = 1; 2307 want_refresh = 1;
2798 }
2799 } 2308 }
2800
2801 } 2309 }
2802 else 2310 else
2803 { 2311 {
2804 try 2312 try
2805 { 2313 {
… …
2813 } 2321 }
2814 2322
2815 ch = NOCHAR; 2323 ch = NOCHAR;
2816 } 2324 }
2817 } 2325 }
2818
2819 return flag;
2820} 2326}
2821 2327
2822// read the next character 2328// read the next character
2823wchar_t 2329wchar_t
2824rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
2825{ 2331{
2826 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2827 { 2333 {
2828 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2830 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2831 2337
2832 wchar_t wc; 2338 wchar_t wc;
2833 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2834 2340
… …
2838 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2839 break; 2345 break;
2840 } 2346 }
2841 2347
2842 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2843 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2844 2353
2845 // assume wchar == unicode 2354 // assume wchar == unicode
2846 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2847 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2848 } 2357 }
… …
2892/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2893#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2894FILE * 2403FILE *
2895rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2896{ 2405{
2897 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2898 2407
2899 if (stream == NULL) 2408 if (stream == NULL)
2900 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2901 2410
2902 return stream; 2411 return stream;
… …
2913 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2914 */ 2423 */
2915void 2424void
2916rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2917{ 2426{
2918 int done; 2427 FILE *fd = popen_printer ();
2919 FILE *fd;
2920 2428
2921 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2922 return; 2430 return;
2923 2431
2924 /* 2432 /*
2925 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2926 * is received. 2434 * is received.
2927 */ 2435 */
2928 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2929 { 2437 {
2930 unsigned char buf[8]; 2438 unsigned char buf[8];
2931 unicode_t ch; 2439 unicode_t ch;
2932 unsigned int i, len; 2440 unsigned int i, len;
2933 2441
… …
2952 { 2460 {
2953 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2954 break; /* done = 1 */ 2462 break; /* done = 1 */
2955 } 2463 }
2956 } 2464 }
2957 2465
2958 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2959 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2960 { 2468 {
2961 done = 1; 2469 done = 1;
2962 break; 2470 break;
… …
2964 } 2472 }
2965 } 2473 }
2966 2474
2967 pclose_printer (fd); 2475 pclose_printer (fd);
2968} 2476}
2969#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2970/*}}} */ 2478/*}}} */
2971 2479
2972/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2973enum { 2481enum {
2974 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
3024 process_dcs_seq (); 2532 process_dcs_seq ();
3025 break; 2533 break;
3026 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
3027 process_csi_seq (); 2535 process_csi_seq ();
3028 break; 2536 break;
3029 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3030 process_osc_seq (); 2538 process_osc_seq ();
3031 break; 2539 break;
3032#endif 2540#endif
3033 } 2541 }
3034} 2542}
… …
3078 break; 2586 break;
3079 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
3080 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3081 break; 2589 break;
3082 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
3083 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
3084 break; 2592 break;
3085 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
3086 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
3087 /* unimplemented */ 2595 /* unimplemented */
3088 break; 2596 break;
… …
3142 scr_forwardindex (); 2650 scr_forwardindex ();
3143 break; 2651 break;
3144#endif 2652#endif
3145 case '=': 2653 case '=':
3146 case '>': 2654 case '>':
3147 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
3148 break; 2656 break;
3149 2657
3150 case C1_40: 2658 case C1_40:
3151 cmd_getc (); 2659 cmd_getc ();
3152 break; 2660 break;
… …
3191 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3192 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
3193 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3194 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
3195 2703
3196 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3197 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
3198 process_csi_seq (); 2706 process_csi_seq ();
3199 break; 2707 break;
3200 2708
3201 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3202 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
3203 process_osc_seq (); 2711 process_osc_seq ();
3204 break; 2712 break;
3205 2713
3206 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3207 case 'c': 2715 case 'c':
3208 mbstate.reset (); 2716 mbstate.reset ();
3209 scr_poweron (); 2717 scr_poweron ();
3210 scrollbar_show (1); 2718 scrollBar.show (1);
3211 break; 2719 break;
3212 2720
3213 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3214 case 'n': 2722 case 'n':
3215 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
3260rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3261{ 2769{
3262 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3263 unsigned int nargs, p; 2771 unsigned int nargs, p;
3264 int n, ndef; 2772 int n, ndef;
3265 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3266 2774
3267 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3268 arg[--nargs] = 0;
3269 2776
3270 priv = 0; 2777 priv = 0;
3271 ch = cmd_getc (); 2778 ch = cmd_getc ();
3272 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
3273 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
3274 priv = ch; 2782 priv = ch;
3275 ch = cmd_getc (); 2783 ch = cmd_getc ();
3276 } 2784 }
3277 2785
3278 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3317 switch (priv) 2825 switch (priv)
3318 { 2826 {
3319 case '>': 2827 case '>':
3320 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3321 { 2829 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 // 2832 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3327 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3328 // 2836 //
3329 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3330 } 2838 }
3331 break; 2839 break;
2840
3332 case '?': 2841 case '?':
3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3334 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3335 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3336 } 2857 }
2858 break;
2859 }
2860
3337 return; 2861 return;
3338 } 2862 }
3339 2863
3340 switch (ch) 2864 switch (ch)
3341 { 2865 {
… …
3770 3294
3771/* 3295/*
3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3773 */ 3297 */
3774void 3298void
3775rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3776{ 3300{
3777 int color; 3301 int color;
3778 char *buf, *name; 3302 char *buf, *name;
3779 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3780 int saveop = op; 3304 int saveop = op;
3781 3305
3782 dLocal (Display *, dpy); 3306 dLocal (Display *, dpy);
3783 3307
3784 assert (str != NULL); 3308 assert (str != NULL);
3785 3309
3786 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)))
3787 return; 3311 return;
3788 3312
3789 switch (op) 3313 switch (op)
3790 { 3314 {
… …
3821 3345
3822 XFree (value); 3346 XFree (value);
3823 } 3347 }
3824 else 3348 else
3825 { 3349 {
3826 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3827 3351
3828 if (eq) 3352 if (eq)
3829 { 3353 {
3830 *eq = 0; 3354 *eq = 0;
3831 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3852 *buf++ = '\0'; 3376 *buf++ = '\0';
3853 3377
3854 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3855 } 3379 }
3856 break; 3380 break;
3381 case Rxvt_restoreFG:
3857 case XTerm_Color00: 3382 case XTerm_Color00:
3858 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3859 break; 3384 break;
3385 case Rxvt_restoreBG:
3860 case XTerm_Color01: 3386 case XTerm_Color01:
3861 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3862 break; 3388 break;
3863#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3864 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
… …
3885 break; 3411 break;
3886 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3887 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3888 break; 3414 break;
3889#endif 3415#endif
3890#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3891 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3892 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3422 {
3423 bool changed = false;
3893 3424
3894 check_our_parents (); 3425 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3895 3429
3896 if (am_transparent) 3430 if (changed)
3897 want_full_refresh = want_refresh = 1; 3431 update_background ();
3432 }
3898 3433
3899 break; 3434 break;
3900#endif 3435#endif
3901 3436
3437#if BG_IMAGE_FROM_FILE
3902 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3903 { 3439 if (!strcmp (str, "?"))
3904 if (*str != ';')
3905 { 3440 {
3906#if XPM_BACKGROUND 3441 char str[256];
3907 scale_pixmap (""); /* reset to default scaling */ 3442
3908 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3909 scr_touch (true); 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3910#endif 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3911 } 3447 }
3912 3448 else
3449 {
3913 int changed = 0; 3450 int changed = 0;
3914 3451
3915 while ((str = strchr (str, ';')) != NULL) 3452 if (*str != ';')
3916 { 3453 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 }
3462
3463 while (str)
3464 {
3917 str++; 3465 str++;
3918#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3919 changed += scale_pixmap (str); 3467 changed++;
3920#endif 3468 str = strchr (str, ';');
3921 } 3469 }
3922 3470
3923 if (changed) 3471 if (changed)
3924 { 3472 update_background ();
3925#ifdef XPM_BACKGROUND
3926 resize_pixmap ();
3927 scr_touch (true);
3928#endif
3929 } 3473 }
3930 }
3931 break; 3474 break;
3932 3475#endif
3933 case Rxvt_restoreFG:
3934 set_window_color (Color_fg, str);
3935 break;
3936 case Rxvt_restoreBG:
3937 set_window_color (Color_bg, str);
3938 break;
3939 3476
3940 case XTerm_logfile: 3477 case XTerm_logfile:
3941 // TODO, when secure mode? 3478 // TODO, when secure mode?
3942 break; 3479 break;
3943 3480
… …
4010 break; 3547 break;
4011#endif 3548#endif
4012 3549
4013#if ENABLE_PERL 3550#if ENABLE_PERL
4014 case URxvt_perl: 3551 case URxvt_perl:
4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4016 ; // no responses yet
4017 break; 3553 break;
4018#endif 3554#endif
4019 } 3555 }
4020} 3556}
4021/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
4044 { 3580 {
4045 if (mode == 'r') 3581 if (mode == 'r')
4046 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4047 else 3583 else
4048 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4049 PrivMode (state, bit); 3585 set_privmode (bit, state);
4050 } 3586 }
4051 3587
4052 return state; 3588 return state;
4053} 3589}
4054 3590
… …
4058{ 3594{
4059 unsigned int i, j; 3595 unsigned int i, j;
4060 int state; 3596 int state;
4061 3597
4062 static const struct 3598 static const struct
4063 { 3599 {
4064 const int argval; 3600 const int argval;
4065 const unsigned long bit; 3601 const unsigned long bit;
4066 }
4067
4068 argtopriv[] = { 3602 } argtopriv[] = {
4069 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
4070 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
4071 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
4072 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
4073 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
4074 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
4075 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
4076 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
4077 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
4078 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
4079 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4080#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
4081 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
4082#endif 3617#endif
4083 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
4084 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
4085 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
4086 // 45 margin bell NYI 3622 // 45 margin bell NYI
4087 // 46 start logging 3623 // 46 start logging
4088 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
4089 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4090#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
4091 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
4092#endif 3628#endif
4093 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
4094 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
4095 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
4096 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4097 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4098 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
4099 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
4100 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
4101 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
4102 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
4103 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
4104 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4105 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
4106 }; 3642 };
4107 3643
4108 if (nargs == 0) 3644 if (nargs == 0)
4109 return; 3645 return;
4110 3646
… …
4135 3671
4136 scr_touch (true); 3672 scr_touch (true);
4137 break; 3673 break;
4138#endif 3674#endif
4139 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4140 case 1049:
4141 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
4142 if (mode == 0) 3677 if (mode == 0)
4143 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
4144 else if (mode == 1) 3679 else if (mode == 1)
4145 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
… …
4154 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
4155 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
4156 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
4157 * within VT52 mode 3692 * within VT52 mode
4158 */ 3693 */
4159 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
4160 break; 3695 break;
4161 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
4162 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
4163 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4164 break; 3699 break;
4165 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
4166 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
4167 break; 3702 break;
4168 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
4175 scr_autowrap (state); 3710 scr_autowrap (state);
4176 break; 3711 break;
4177 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
4178 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
4179 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
4180 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4181 break; 3716 break;
4182#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
4183 case scrollBar_esc: 3718 case scrollBar_esc:
4184 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
4185 { 3720 {
4186 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
4187 scr_touch (true); 3722 scr_touch (true);
4188 } 3723 }
4189 break; 3724 break;
… …
4198 break; 3733 break;
4199 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
4200 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
4201 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
4202 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3739 break;
4205#if 0
4206 case 1001: 3740 case 1002:
4207 break; /* X11 mouse highlighting */ 3741 case 1003:
4208#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
4209 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4210 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
4211 break; 3755 break;
4212 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4213 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4214 break; 3758 break;
4215 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4216 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 3761 if (!state)
4218 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
4219 scr_change_screen (state); 3764 scr_change_screen (state);
4220 break; 3765 break;
4221 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
4222 scr_change_screen (state); 3771 scr_change_screen (state);
3772
4223 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4224 if (current_screen != PRIMARY) 3774 if (state)
4225 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
4226 break; 3778 break;
4227 default: 3779 default:
4228 break; 3780 break;
4229 } 3781 }
4230 } 3782 }
… …
4390rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
4391{ 3943{
4392 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
4393 3945
4394 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
4395 { /* query graphics */ 3948 /* query graphics */
4396 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
4397 return; 3950 return;
4398 } 3951 }
4399 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
4400 do 3953 do
… …
4450 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4451 4004
4452 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4453 v_buflen += len; 4006 v_buflen += len;
4454 4007
4455 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4456} 4009}
4457 4010
4458void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4459{ 4012{
4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4465 4018
4466 if (v_buflen == 0) 4019 if (v_buflen == 0)
4467 { 4020 {
4468 free (v_buffer); 4021 free (v_buffer);
4469 v_buffer = 0; 4022 v_buffer = 0;
4470 v_buflen = 0;
4471 4023
4472 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4473 return; 4025 return;
4474 } 4026 }
4475 4027
4476 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4477 } 4029 }
4478 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4479 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4480} 4032}
4481 4033
4482/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4483 4035

Diff Legend

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