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.317 by root, Sat Jan 13 15:06:54 2007 UTC vs.
Revision 1.444 by sf-exg, Thu Apr 1 08:40:33 2010 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
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
… …
877 return; 825 return;
878 826
879 if (len <= 0) 827 if (len <= 0)
880 return; /* not mapped */ 828 return; /* not mapped */
881 829
882 if (OPTION (Opt_scrollTtyKeypress)) 830 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 831 if (view_start)
884 { 832 {
885 view_start = 0; 833 view_start = 0;
886 want_refresh = 1; 834 want_refresh = 1;
887 } 835 }
… …
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 whether 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 workaround 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
… …
1232 } 1186 }
1233 else 1187 else
1234 { 1188 {
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{
… …
1263 recolour_cursor (); 1218 recolour_cursor ();
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
1275rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
1276{ 1231{
1277 if (!OPTION (Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
1278 return; 1233 return;
1279 1234
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1236 XFlush (dpy);
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:
… …
1458 break; 1417 break;
1459 } 1418 }
1460 break; 1419 break;
1461 1420
1462 case FocusIn: 1421 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1422 if (ev.xfocus.detail != NotifyInferior
1423 && ev.xfocus.detail != NotifyPointer
1424 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1425 focus_in ();
1465 break; 1426 break;
1466 1427
1467 case FocusOut: 1428 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1432 focus_out ();
1470 break; 1433 break;
1471 1434
1472 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);*/
1473 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1474 { 1440 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1442 ;
1477 1443
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1445 {
1480 seen_resize = 1; 1446 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 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 }
1483 1461
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1488 if (OPTION (Opt_transparent))
1489 check_our_parents ();
1490#endif
1491#endif
1492 } 1463 }
1493 break; 1464 break;
1494 1465
1495 case PropertyNotify: 1466 case PropertyNotify:
1496 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)))
… …
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1471
1501 break; 1472 break;
1502 1473
1503 case SelectionClear: 1474 case SelectionClear:
1504 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break; 1476 break;
1506 1477
1507 case SelectionNotify: 1478 case SelectionNotify:
1508 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1512 case SelectionRequest: 1483 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1514 break; 1485 break;
1515 1486
1516 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
1517 mapped = 1; 1504 mapped = 1;
1518#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1506 text_blink_ev.start ();
1520#endif 1507#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1509 break;
1523 1510
1524 case UnmapNotify: 1511 case UnmapNotify:
… …
1526#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1527 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1528#endif 1515#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1517 break;
1531
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537 1518
1538 case GraphicsExpose: 1519 case GraphicsExpose:
1539 case Expose: 1520 case Expose:
1540 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1541 { 1522 {
1542 do 1523 do
1524 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1529
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1531
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1552 1537
1553 want_refresh = 1; 1538 want_refresh = 1;
1554 } 1539 }
1555 else 1540 else
1556 { 1541 {
… …
1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560 ; 1545 ;
1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562 ; 1547 ;
1563 1548
1564 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1565 { 1550 {
1566 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1567 scrollbar_show (0); 1552 scrollBar.show (0);
1568 } 1553 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (dpy, ev.xany.window);
1573#endif
1574 } 1554 }
1575 break; 1555 break;
1576 1556
1577 case MotionNotify: 1557 case MotionNotify:
1578#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1559 if (hidden_pointer)
1580 pointer_unblank (); 1560 pointer_unblank ();
1581#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);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1566 break;
1584 1567
1585 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1586 { 1569 {
… …
1620 int dist; 1603 int dist;
1621 1604
1622 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1624 */ 1607 */
1625 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1610
1628 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1630 */ 1613 */
1631 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
… …
1653 else 1636 else
1654 { 1637 {
1655 /* we are within the text window, so we 1638 /* we are within the text window, so we
1656 * shouldn't be scrolling 1639 * shouldn't be scrolling
1657 */ 1640 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1660 } 1642 }
1661#endif 1643#endif
1662#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1663 } 1645 }
1664#endif 1646#endif
1665 } 1647 }
1666 } 1648 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1650 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1671 ; 1653 ;
1672 1654
… …
1674 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1659 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1661 scrollBar.size ());
1680 want_refresh = 1; 1662 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1663 scrollBar.show (1);
1683 } 1664 }
1684 break; 1665 break;
1685 } 1666 }
1686 1667
1687#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1669 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 { 1670 {
1690 if (hidden_cursor) 1671 if (hidden_cursor)
1691 { 1672 {
1692 hidden_cursor = 0; 1673 hidden_cursor = 0;
1693 want_refresh = 1; 1674 want_refresh = 1;
1694 } 1675 }
1695 1676
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1677 cursor_blink_ev.again ();
1697 } 1678 }
1698#endif 1679#endif
1699 1680
1700#if defined(POINTER_BLANK) 1681#if defined(POINTER_BLANK)
1701 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1683 {
1703 if (ev.type == MotionNotify 1684 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress 1685 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease) 1686 || ev.type == ButtonRelease)
1706 if (hidden_pointer) 1687 if (hidden_pointer)
… …
1708 1689
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1690 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1691 pointer_blank ();
1711 } 1692 }
1712#endif 1693#endif
1694
1695 refresh_check ();
1713} 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
1714 1713
1715void 1714void
1716rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1717{ 1716{
1718 if (!focus) 1717 if (!focus)
1719 { 1718 {
1720 focus = 1; 1719 focus = 1;
1721 want_refresh = 1; 1720 want_refresh = 1;
1722 1721
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM 1722#if USE_XIM
1726 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1727 { 1724 {
1728 IMSetPosition (); 1725 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1730 } 1727 }
1731#endif 1728#endif
1732#if CURSOR_BLINK 1729#if CURSOR_BLINK
1733 if (OPTION (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1735#endif 1732#endif
1736#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1738 { 1735 {
1739 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1737 scr_recolour ();
1741 } 1738 }
1742#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));
1743 } 1746 }
1744} 1747}
1745 1748
1746void 1749void
1747rxvt_term::focus_out () 1750rxvt_term::focus_out ()
… …
1749 if (focus) 1752 if (focus)
1750 { 1753 {
1751 focus = 0; 1754 focus = 0;
1752 want_refresh = 1; 1755 want_refresh = 1;
1753 1756
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1755 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1756#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1762 if (iso14755buf)
1758 { 1763 {
1759 iso14755buf = 0; 1764 iso14755buf = 0;
1760# if ENABLE_OVERLAY 1765# if ISO_14755
1761 scr_overlay_off (); 1766 scr_overlay_off ();
1762# endif 1767# endif
1763 } 1768 }
1764#endif 1769#endif
1765#if USE_XIM 1770#if USE_XIM
1766 if (Input_Context != NULL) 1771 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1768#endif 1773#endif
1769#if CURSOR_BLINK 1774#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1772 hidden_cursor = 0; 1778 hidden_cursor = 0;
1773#endif 1779#endif
1774#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1775 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1776 { 1782 {
1777 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1778 scr_recolour (); 1784 scr_recolour ();
1779 } 1785 }
1780#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781 } 1789 }
1782} 1790}
1783 1791
1784void 1792void
1785rxvt_term::update_fade_color (unsigned int idx) 1793rxvt_term::update_fade_color (unsigned int idx)
… …
1792 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);
1793 } 1801 }
1794#endif 1802#endif
1795} 1803}
1796 1804
1797#if TRANSPARENT || ENABLE_PERL 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1798void 1806void
1799rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1800{ 1808{
1801 make_current (); 1809 make_current ();
1802 1810
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return; 1813 return;
1806 1814
1807# if TRANSPARENT 1815# if ENABLE_TRANSPARENCY
1808 switch (ev.type) 1816 switch (ev.type)
1809 { 1817 {
1810 case PropertyNotify: 1818 case PropertyNotify:
1811 /* 1819 /*
1812 * 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,
1813 * 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.
1814 */ 1822 */
1815 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 return; 1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1818 1829
1819 /* FALLTHROUGH */
1820 case ReparentNotify:
1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1822 want_refresh = want_full_refresh = 1;
1823 break; 1830 break;
1824 } 1831 }
1825# endif 1832# endif
1833
1834 refresh_check ();
1826} 1835}
1827#endif 1836#endif
1828 1837
1829void 1838void
1830rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
… …
1885 mouse_report (ev); 1894 mouse_report (ev);
1886 } 1895 }
1887#else 1896#else
1888 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1889 mouse_report (ev); 1898 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1900
1892 } 1901 }
1893 else 1902 else
1894 { 1903 {
1895 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
… …
1943 } 1952 }
1944 1953
1945 /* 1954 /*
1946 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1947 */ 1956 */
1948 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1949 { 1958 {
1950 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;
1951 /* 1967 /*
1952 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1953 * move up if mouse is above slider 1969 * move up if mouse is above slider
1954 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1955 * 1971 *
… …
1964 /* 1980 /*
1965 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1966 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1967 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1968 */ 1984 */
1969 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1970 && scrollbarnext_upButton (ev.y))
1971 || (scrollBar.style == R_SB_RXVT
1972 && scrollbarrxvt_upButton (ev.y)))
1973 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
1974 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
1975 && scrollbarnext_dnButton (ev.y))
1976 || (scrollBar.style == R_SB_RXVT
1977 && scrollbarrxvt_dnButton (ev.y)))
1978 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
1979 else 1989 else
1980 switch (ev.button) 1990 switch (ev.button)
1981 { 1991 {
1982 case Button2: 1992 case Button2:
… …
1989 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
1990 break; 2000 break;
1991 } 2001 }
1992 } 2002 }
1993 else 2003 else
1994#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
1995
1996 {
1997 char upordown = 0;
1998
1999 if (scrollBar.style == R_SB_NEXT)
2000 { 2005 {
2001 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
2002 upordown = -1; /* up */
2003 else if (scrollbarnext_dnButton (ev.y))
2004 upordown = 1; /* down */
2005 }
2006 else if (scrollBar.style == R_SB_RXVT)
2007 {
2008 if (scrollbarrxvt_upButton (ev.y))
2009 upordown = -1; /* up */
2010 else if (scrollbarrxvt_dnButton (ev.y))
2011 upordown = 1; /* down */
2012 }
2013 if (upordown)
2014 { 2007 {
2015#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
2016 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2017#endif 2011#endif
2018 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
2019 { 2013 {
2020 if (upordown < 0) 2014 if (direction == UP)
2021 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2022 else 2016 else
2023 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2024 } 2018 }
2025 } 2019 }
2026 else 2020 else
2027 switch (ev.button) 2021 switch (ev.button)
2028 { 2022 {
2029 case Button2: 2023 case Button2:
2030 switch (scrollbar_align) 2024 switch (scrollBar.align)
2031 { 2025 {
2032 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2033 csrO = 0; 2027 csrO = 0;
2034 break; 2028 break;
2035 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
2041 } 2035 }
2042 2036
2043 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2044 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2045 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2046 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2047 2041
2048 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2049 break; 2043 break;
2050 2044
2051 case Button1: 2045 case Button1:
2052 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2053 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2054 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2055 2049
2056 case Button3: 2050 case Button3:
2057 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
… …
2067 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2068# else 2062# else
2069 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2070# endif 2064# endif
2071 else 2065 else
2072 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2073 } 2067 }
2074 else 2068 else
2075 { 2069 {
2076 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2077 (nrow 2071 (nrow
2078 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2079 / scrollbar_size ())); 2073 / scrollBar.size ()));
2080 } 2074 }
2081 2075
2082 break; 2076 break;
2083 } 2077 }
2084 } 2078 }
… …
2094 2088
2095 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2096 if (!bypass_keystate) 2090 if (!bypass_keystate)
2097 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2098 2092
2099 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2100 { 2094 {
2101 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2102 scrollbar_show (0); 2096 scrollBar.show (0);
2103 } 2097 }
2104 2098
2105#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2106 if (sel_scroll_ev.active)
2107 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2108#endif 2101#endif
2109 2102
2110 if (ev.window == vt) 2103 if (ev.window == vt)
2111 { 2104 {
2112 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)))
… …
2136 mouse_report (ev); 2129 mouse_report (ev);
2137 } 2130 }
2138#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2139 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2140 mouse_report (ev); 2133 mouse_report (ev);
2141#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2142 return; 2135 return;
2143 } 2136 }
2144 2137
2145 /* 2138 /*
2146 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2158 selection_make (ev.time); 2151 selection_make (ev.time);
2159 break; 2152 break;
2160 2153
2161 case Button2: 2154 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 break; 2157 break;
2165 2158
2166#ifdef MOUSE_WHEEL 2159#ifdef MOUSE_WHEEL
2167 case Button4: 2160 case Button4:
2168 case Button5: 2161 case Button5:
… …
2172 2165
2173 v = ev.button == Button4 ? UP : DN; 2166 v = ev.button == Button4 ? UP : DN;
2174 2167
2175 if (ev.state & ShiftMask) 2168 if (ev.state & ShiftMask)
2176 i = 1; 2169 i = 1;
2177 else if (OPTION (Opt_mouseWheelScrollPage)) 2170 else if (option (Opt_mouseWheelScrollPage))
2178 i = nrow - 1; 2171 i = nrow - 1;
2179 else 2172 else
2180 i = 5; 2173 i = 5;
2181 2174
2182# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
… …
2184 { 2177 {
2185 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2186 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2187 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2188 2181
2189 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2190 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2191
2192 slip_wheel_ev.start ();
2193 } 2184 }
2194 else 2185 else
2186# endif
2195 { 2187 {
2196# endif
2197 scr_page (v, i); 2188 scr_page (v, i);
2198 scrollbar_show (1); 2189 scrollBar.show (1);
2199# ifdef MOUSE_SLIP_WHEELING
2200 } 2190 }
2201# endif
2202 } 2191 }
2203 break; 2192 break;
2204#endif 2193#endif
2205 } 2194 }
2206 } 2195 }
2207} 2196}
2208 2197
2209#ifdef TRANSPARENT
2210#if TINTING
2211/* taken from aterm-0.4.2 */
2212
2213typedef uint32_t RUINT32T;
2214
2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2216{
2217 int sh_r, sh_g, sh_b;
2218 RUINT32T mask_r, mask_g, mask_b;
2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2222 int i;
2223
2224 Visual *visual = term->visual;
2225
2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2227
2228 /* for convenience */
2229 mask_r = visual->red_mask;
2230 mask_g = visual->green_mask;
2231 mask_b = visual->blue_mask;
2232
2233 /* boring lookup table pre-initialization */
2234 switch (srcImage->bits_per_pixel) {
2235 case 15:
2236 if ((mask_r != 0x7c00) ||
2237 (mask_g != 0x03e0) ||
2238 (mask_b != 0x001f))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2241 lookup_r = lookup;
2242 lookup_g = lookup+32;
2243 lookup_b = lookup+32+32;
2244 sh_r = 10;
2245 sh_g = 5;
2246 sh_b = 0;
2247 break;
2248 case 16:
2249 if ((mask_r != 0xf800) ||
2250 (mask_g != 0x07e0) ||
2251 (mask_b != 0x001f))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2254 lookup_r = lookup;
2255 lookup_g = lookup+32;
2256 lookup_b = lookup+32+64;
2257 sh_r = 11;
2258 sh_g = 5;
2259 sh_b = 0;
2260 break;
2261 case 24:
2262 if ((mask_r != 0xff0000) ||
2263 (mask_g != 0x00ff00) ||
2264 (mask_b != 0x0000ff))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2267 lookup_r = lookup;
2268 lookup_g = lookup+256;
2269 lookup_b = lookup+256+256;
2270 sh_r = 16;
2271 sh_g = 8;
2272 sh_b = 0;
2273 break;
2274 case 32:
2275 if ((mask_r != 0xff0000) ||
2276 (mask_g != 0x00ff00) ||
2277 (mask_b != 0x0000ff))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2280 lookup_r = lookup;
2281 lookup_g = lookup+256;
2282 lookup_b = lookup+256+256;
2283 sh_r = 16;
2284 sh_g = 8;
2285 sh_b = 0;
2286 break;
2287 default:
2288 return; /* we do not support this color depth */
2289 }
2290
2291 /* prepare limits for color transformation (each channel is handled separately) */
2292 if (shade < 0) {
2293 shade = -shade;
2294 if (shade < 0) shade = 0;
2295 if (shade > 100) shade = 100;
2296
2297 lower_lim_r = 65535-rm;
2298 lower_lim_g = 65535-gm;
2299 lower_lim_b = 65535-bm;
2300
2301 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2302 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2303 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2304
2305 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2306 } else {
2307 if (shade < 0) shade = 0;
2308 if (shade > 100) shade = 100;
2309
2310 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2311
2312 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2313 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2314 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2315 }
2316
2317 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2318 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2319 {
2320 unsigned int tmp;
2321
2322 tmp = lower_lim_r;
2323 lower_lim_r = lower_lim_b;
2324 lower_lim_b = tmp;
2325
2326 tmp = upper_lim_r;
2327 upper_lim_r = upper_lim_b;
2328 upper_lim_b = tmp;
2329 }
2330
2331 /* fill our lookup tables */
2332 for (i = 0; i <= mask_r>>sh_r; i++)
2333 {
2334 RUINT32T tmp;
2335 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2336 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2337 lookup_r[i] = (tmp/65535)<<sh_r;
2338 }
2339 for (i = 0; i <= mask_g>>sh_g; i++)
2340 {
2341 RUINT32T tmp;
2342 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2343 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2344 lookup_g[i] = (tmp/65535)<<sh_g;
2345 }
2346 for (i = 0; i <= mask_b>>sh_b; i++)
2347 {
2348 RUINT32T tmp;
2349 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2350 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2351 lookup_b[i] = (tmp/65535)<<sh_b;
2352 }
2353
2354 /* apply table to input image (replacing colors by newly calculated ones) */
2355 switch (srcImage->bits_per_pixel)
2356 {
2357 case 15:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0x7c00)>>10] |
2369 lookup_g[(*p & 0x03e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 16:
2377 {
2378 unsigned short *p1, *pf, *p, *pl;
2379 p1 = (unsigned short *) srcImage->data;
2380 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xf800)>>11] |
2388 lookup_g[(*p & 0x07e0)>> 5] |
2389 lookup_b[(*p & 0x001f)];
2390 }
2391 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 24:
2396 {
2397 unsigned char *p1, *pf, *p, *pl;
2398 p1 = (unsigned char *) srcImage->data;
2399 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width * 3;
2404 for (; p < pl; p += 3)
2405 {
2406 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2407 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2408 p[2] = lookup_r[(p[2] & 0x0000ff)];
2409 }
2410 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 32:
2415 {
2416 RUINT32T *p1, *pf, *p, *pl;
2417 p1 = (RUINT32T *) srcImage->data;
2418 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419
2420 while (p1 < pf)
2421 {
2422 p = p1;
2423 pl = p1 + srcImage->width;
2424 for (; p < pl; p++)
2425 {
2426 *p = lookup_r[(*p & 0xff0000)>>16] |
2427 lookup_g[(*p & 0x00ff00)>> 8] |
2428 lookup_b[(*p & 0x0000ff)] |
2429 (*p & ~0xffffff);
2430 }
2431 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2432 }
2433 break;
2434 }
2435 }
2436
2437 free (lookup);
2438}
2439#endif
2440
2441/*
2442 * Check our parents are still who we think they are.
2443 * Do transparency updates if required
2444 */
2445int
2446rxvt_term::check_our_parents ()
2447{
2448 int i, pchanged, aformat, have_pixmap, rootdepth;
2449 unsigned long nitems, bytes_after;
2450 Atom atype;
2451 unsigned char *prop = NULL;
2452 Window root, oldp, *list;
2453 Pixmap rootpixmap = None;
2454 XWindowAttributes wattr, wrootattr;
2455
2456 pchanged = 0;
2457
2458 if (!OPTION (Opt_transparent))
2459 return pchanged; /* Don't try any more */
2460
2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
2462 rootdepth = wrootattr.depth;
2463
2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2465
2466 if (rootdepth != wattr.depth)
2467 {
2468 if (am_transparent)
2469 {
2470 pchanged = 1;
2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2472 am_transparent = am_pixmap_trans = 0;
2473 }
2474
2475 return pchanged; /* Don't try any more */
2476 }
2477
2478 /* Get all X ops out of the queue so that our information is up-to-date. */
2479 XSync (dpy, False);
2480
2481 /*
2482 * Make the frame window set by the window manager have
2483 * the root background. Some window managers put multiple nested frame
2484 * windows for each client, so we have to take care about that.
2485 */
2486 i = (xa[XA_XROOTPMAP_ID]
2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2489 &nitems, &bytes_after, &prop) == Success);
2490
2491 if (!i || prop == NULL)
2492 i = (xa[XA_ESETROOT_PMAP_ID]
2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2495 &nitems, &bytes_after, &prop) == Success);
2496
2497 if (!i || prop == NULL
2498#if TINTING
2499 || !ISSET_PIXCOLOR (Color_tint)
2500#endif
2501 )
2502 have_pixmap = 0;
2503 else
2504 {
2505 have_pixmap = 1;
2506 rootpixmap = *(Pixmap *)prop;
2507 XFree (prop);
2508 }
2509
2510 if (have_pixmap)
2511 {
2512 /*
2513 * Copy display->root pixmap transparency
2514 */
2515 int sx, sy, nx, ny;
2516 unsigned int nw, nh;
2517 Window cr;
2518 XImage *image;
2519 GC gc;
2520 XGCValues gcvalue;
2521
2522 XTranslateCoordinates (dpy, parent[0], display->root,
2523 0, 0, &sx, &sy, &cr);
2524 nw = (unsigned int)szHint.width;
2525 nh = (unsigned int)szHint.height;
2526 nx = ny = 0;
2527
2528 if (sx < 0)
2529 {
2530 nw += sx;
2531 nx = -sx;
2532 sx = 0;
2533 }
2534
2535 if (sy < 0)
2536 {
2537 nh += sy;
2538 ny = -sy;
2539 sy = 0;
2540 }
2541
2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545 XSync (dpy, False);
2546 allowedxerror = -1;
2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2548
2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2550 /* XXX: may need a delay here? */
2551 allowedxerror = 0;
2552
2553 if (image == NULL)
2554 {
2555 if (am_transparent && am_pixmap_trans)
2556 {
2557 pchanged = 1;
2558 if (pixmap != None)
2559 {
2560 XFreePixmap (dpy, pixmap);
2561 pixmap = None;
2562 }
2563 }
2564
2565 am_pixmap_trans = 0;
2566 }
2567 else
2568 {
2569 if (pixmap != None)
2570 XFreePixmap (dpy, pixmap);
2571
2572#if TINTING
2573 if (ISSET_PIXCOLOR (Color_tint))
2574 {
2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2576
2577 rgba c;
2578 pix_colors_focused [Color_tint].get (c);
2579
2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2581 }
2582#endif
2583
2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
2587 nx, ny, image->width, image->height);
2588 XFreeGC (dpy, gc);
2589 XDestroyImage (image);
2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2591 XClearWindow (dpy, parent[0]);
2592
2593 if (!am_transparent || !am_pixmap_trans)
2594 pchanged = 1;
2595
2596 am_transparent = am_pixmap_trans = 1;
2597 }
2598 }
2599
2600 if (am_pixmap_trans)
2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602 else
2603 {
2604 unsigned int n;
2605 /*
2606 * InheritPixmap transparency
2607 */
2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 {
2610 oldp = parent[i];
2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 for (; n < (unsigned int)i; n++)
2630 {
2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639
2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2641 {
2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2644 am_transparent = 0;
2645 /* XXX: also turn off Opt_transparent? */
2646 }
2647 else
2648 {
2649 for (n = 0; n < (unsigned int)i; n++)
2650 {
2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2652 XClearWindow (dpy, parent[n]);
2653 }
2654
2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2656 am_transparent = 1;
2657 }
2658
2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2660 parent[i] = None;
2661 }
2662
2663 if (scrollBar.win)
2664 {
2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2666 scrollBar.setIdle ();
2667 scrollbar_show (0);
2668 }
2669
2670 if (am_transparent)
2671 {
2672 want_refresh = want_full_refresh = 1;
2673 if (am_pixmap_trans)
2674 flush ();
2675 }
2676
2677 return pchanged;
2678}
2679#endif
2680
2681/*}}} */ 2198/*}}} */
2682 2199
2683bool 2200void
2684rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2685{ 2202{
2686 bool flag = false;
2687 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2688 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2689 2205
2690 for (;;) 2206 for (;;)
2691 { 2207 {
2692 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2693 { 2209 {
2694 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2695 ch = next_char (); 2211 ch = next_char ();
2696 2212
2697 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2698 break; 2214 break;
2699 } 2215 }
2700 2216
2701 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))
2702 { 2218 {
2703 if (!seen_input) 2219 if (expect_false (!seen_input))
2704 { 2220 {
2705 seen_input = 1; 2221 seen_input = 1;
2706 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2707 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2708 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
… …
2721 wchar_t *str = buf; 2237 wchar_t *str = buf;
2722 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2723 2239
2724 for (;;) 2240 for (;;)
2725 { 2241 {
2726 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)))
2727 break; 2243 break;
2728 2244
2729 *str++ = ch; 2245 *str++ = ch;
2730 2246
2731 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2732 { 2248 {
2733 if (ch == C0_LF) 2249 if (ch == C0_LF)
2734 nlines++; 2250 nlines++;
2735 2251
2736 refresh_count++; 2252 refresh_count++;
2737 2253
2738 if (!OPTION (Opt_jumpScroll) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2739 || (refresh_count >= refresh_limit * (nrow - 1)))
2740 { 2255 {
2741 refreshnow = true;
2742 refresh_count = 0; 2256 refresh_count = 0;
2257
2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2259 {
2260 refreshnow = true;
2743 ch = NOCHAR; 2261 ch = NOCHAR;
2744 break; 2262 break;
2263 }
2745 } 2264 }
2746 2265
2747 // scr_add_lines only works for nlines <= nrow - 1. 2266 // scr_add_lines only works for nlines <= nrow - 1.
2748 if (nlines >= nrow - 1) 2267 if (nlines >= nrow - 1)
2749 { 2268 {
… …
2777 && 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))))
2778 scr_add_lines (buf, str - buf, nlines); 2297 scr_add_lines (buf, str - buf, nlines);
2779 2298
2780 /* 2299 /*
2781 * 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
2782 * 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.
2783 * the number of pages between refreshes is refresh_limit, which 2302 * if skipScroll is enabled.
2784 * is incremented here because we must be doing flat-out scrolling.
2785 */ 2303 */
2786 if (refreshnow) 2304 if (refreshnow)
2787 { 2305 {
2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2789 refresh_limit++;
2790 else
2791 {
2792 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2794 scr_refresh (); 2306 scr_refresh ();
2795 want_refresh = 1; 2307 want_refresh = 1;
2796 }
2797 } 2308 }
2798
2799 } 2309 }
2800 else 2310 else
2801 { 2311 {
2802 try 2312 try
2803 { 2313 {
… …
2811 } 2321 }
2812 2322
2813 ch = NOCHAR; 2323 ch = NOCHAR;
2814 } 2324 }
2815 } 2325 }
2816
2817 return flag;
2818} 2326}
2819 2327
2820// read the next character 2328// read the next character
2821wchar_t 2329wchar_t
2822rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
2823{ 2331{
2824 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2825 { 2333 {
2826 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2827 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2828 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2829 2337
2830 wchar_t wc; 2338 wchar_t wc;
2831 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);
2832 2340
… …
2836 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2837 break; 2345 break;
2838 } 2346 }
2839 2347
2840 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2841 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 }
2842 2353
2843 // assume wchar == unicode 2354 // assume wchar == unicode
2844 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2845 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2846 } 2357 }
… …
2890/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2891#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2892FILE * 2403FILE *
2893rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2894{ 2405{
2895 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2896 2407
2897 if (stream == NULL) 2408 if (stream == NULL)
2898 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2899 2410
2900 return stream; 2411 return stream;
… …
2911 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2912 */ 2423 */
2913void 2424void
2914rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2915{ 2426{
2916 int done; 2427 FILE *fd = popen_printer ();
2917 FILE *fd;
2918 2428
2919 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2920 return; 2430 return;
2921 2431
2922 /* 2432 /*
2923 * 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
2924 * is received. 2434 * is received.
2925 */ 2435 */
2926 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2927 { 2437 {
2928 unsigned char buf[8]; 2438 unsigned char buf[8];
2929 unicode_t ch; 2439 unicode_t ch;
2930 unsigned int i, len; 2440 unsigned int i, len;
2931 2441
… …
2950 { 2460 {
2951 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2952 break; /* done = 1 */ 2462 break; /* done = 1 */
2953 } 2463 }
2954 } 2464 }
2955 2465
2956 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2957 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2958 { 2468 {
2959 done = 1; 2469 done = 1;
2960 break; 2470 break;
… …
2962 } 2472 }
2963 } 2473 }
2964 2474
2965 pclose_printer (fd); 2475 pclose_printer (fd);
2966} 2476}
2967#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2968/*}}} */ 2478/*}}} */
2969 2479
2970/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2971enum { 2481enum {
2972 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
3022 process_dcs_seq (); 2532 process_dcs_seq ();
3023 break; 2533 break;
3024 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
3025 process_csi_seq (); 2535 process_csi_seq ();
3026 break; 2536 break;
3027 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3028 process_osc_seq (); 2538 process_osc_seq ();
3029 break; 2539 break;
3030#endif 2540#endif
3031 } 2541 }
3032} 2542}
… …
3076 break; 2586 break;
3077 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
3078 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3079 break; 2589 break;
3080 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
3081 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
3082 break; 2592 break;
3083 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
3084 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
3085 /* unimplemented */ 2595 /* unimplemented */
3086 break; 2596 break;
… …
3140 scr_forwardindex (); 2650 scr_forwardindex ();
3141 break; 2651 break;
3142#endif 2652#endif
3143 case '=': 2653 case '=':
3144 case '>': 2654 case '>':
3145 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
3146 break; 2656 break;
3147 2657
3148 case C1_40: 2658 case C1_40:
3149 cmd_getc (); 2659 cmd_getc ();
3150 break; 2660 break;
… …
3189 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3190 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
3191 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3192 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
3193 2703
3194 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3195 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
3196 process_csi_seq (); 2706 process_csi_seq ();
3197 break; 2707 break;
3198 2708
3199 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3200 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
3201 process_osc_seq (); 2711 process_osc_seq ();
3202 break; 2712 break;
3203 2713
3204 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3205 case 'c': 2715 case 'c':
3206 mbstate.reset (); 2716 mbstate.reset ();
3207 scr_poweron (); 2717 scr_poweron ();
3208 scrollbar_show (1); 2718 scrollBar.show (1);
3209 break; 2719 break;
3210 2720
3211 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3212 case 'n': 2722 case 'n':
3213 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
3258rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3259{ 2769{
3260 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3261 unsigned int nargs, p; 2771 unsigned int nargs, p;
3262 int n, ndef; 2772 int n, ndef;
3263 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3264 2774
3265 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3266 arg[--nargs] = 0;
3267 2776
3268 priv = 0; 2777 priv = 0;
3269 ch = cmd_getc (); 2778 ch = cmd_getc ();
3270 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
3271 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
3272 priv = ch; 2782 priv = ch;
3273 ch = cmd_getc (); 2783 ch = cmd_getc ();
3274 } 2784 }
3275 2785
3276 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3315 switch (priv) 2825 switch (priv)
3316 { 2826 {
3317 case '>': 2827 case '>':
3318 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3319 { 2829 {
3320 // 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,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 // 2832 //
3323 // 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
3324 // 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
3325 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3326 // 2836 //
3327 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3328 } 2838 }
3329 break; 2839 break;
2840
3330 case '?': 2841 case '?':
3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3332 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3333 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);
3334 } 2857 }
2858 break;
2859 }
2860
3335 return; 2861 return;
3336 } 2862 }
3337 2863
3338 switch (ch) 2864 switch (ch)
3339 { 2865 {
… …
3459 break; 2985 break;
3460 case 6: /* CPR requested */ 2986 case 6: /* CPR requested */
3461 scr_report_position (); 2987 scr_report_position ();
3462 break; 2988 break;
3463 case 7: /* unofficial extension */ 2989 case 7: /* unofficial extension */
3464 if (OPTION (Opt_insecure)) 2990 if (option (Opt_insecure))
3465 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2991 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3466 break; 2992 break;
3467 case 8: /* unofficial extension */ 2993 case 8: /* unofficial extension */
3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2994 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3469 break; 2995 break;
… …
3633 break; 3159 break;
3634 case 20: /* report icon label */ 3160 case 20: /* report icon label */
3635 { 3161 {
3636 char *s; 3162 char *s;
3637 XGetIconName (dpy, parent[0], &s); 3163 XGetIconName (dpy, parent[0], &s);
3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3639 XFree (s); 3165 XFree (s);
3640 } 3166 }
3641 break; 3167 break;
3642 case 21: /* report window title */ 3168 case 21: /* report window title */
3643 { 3169 {
3644 char *s; 3170 char *s;
3645 XFetchName (dpy, parent[0], &s); 3171 XFetchName (dpy, parent[0], &s);
3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3647 XFree (s); 3173 XFree (s);
3648 } 3174 }
3649 break; 3175 break;
3650 } 3176 }
3651} 3177}
… …
3768 3294
3769/* 3295/*
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3297 */
3772void 3298void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3774{ 3300{
3775 int color; 3301 int color;
3776 char *buf, *name; 3302 char *buf, *name;
3777 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3778 int saveop = op; 3304 int saveop = op;
3779 3305
3780 dLocal (Display *, dpy); 3306 dLocal (Display *, dpy);
3781 3307
3782 assert (str != NULL); 3308 assert (str != NULL);
3783 3309
3784 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)))
3785 return; 3311 return;
3786 3312
3787 switch (op) 3313 switch (op)
3788 { 3314 {
… …
3819 3345
3820 XFree (value); 3346 XFree (value);
3821 } 3347 }
3822 else 3348 else
3823 { 3349 {
3824 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3825 3351
3826 if (eq) 3352 if (eq)
3827 { 3353 {
3828 *eq = 0; 3354 *eq = 0;
3829 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3850 *buf++ = '\0'; 3376 *buf++ = '\0';
3851 3377
3852 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3853 } 3379 }
3854 break; 3380 break;
3381 case Rxvt_restoreFG:
3855 case XTerm_Color00: 3382 case XTerm_Color00:
3856 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3857 break; 3384 break;
3385 case Rxvt_restoreBG:
3858 case XTerm_Color01: 3386 case XTerm_Color01:
3859 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3860 break; 3388 break;
3861#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3862 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
… …
3883 break; 3411 break;
3884 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3885 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3886 break; 3414 break;
3887#endif 3415#endif
3888#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3889 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3890 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3422 {
3423 bool changed = false;
3891 3424
3892 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 ();
3893 3429
3894 if (am_transparent) 3430 if (changed)
3895 want_full_refresh = want_refresh = 1; 3431 update_background ();
3432 }
3896 3433
3897 break; 3434 break;
3898#endif 3435#endif
3899 3436
3437#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3901 { 3439 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3440 {
3904#if XPM_BACKGROUND 3441 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3442
3906 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3907 scr_touch (true); 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3447 }
3910 3448 else
3449 {
3911 int changed = 0; 3450 int changed = 0;
3912 3451
3913 while ((str = strchr (str, ';')) != NULL) 3452 if (*str != ';')
3914 { 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 {
3915 str++; 3465 str++;
3916#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3467 changed++;
3918#endif 3468 str = strchr (str, ';');
3919 } 3469 }
3920 3470
3921 if (changed) 3471 if (changed)
3922 { 3472 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3473 }
3928 }
3929 break; 3474 break;
3930 3475#endif
3931 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str);
3933 break;
3934 case Rxvt_restoreBG:
3935 set_window_color (Color_bg, str);
3936 break;
3937 3476
3938 case XTerm_logfile: 3477 case XTerm_logfile:
3939 // TODO, when secure mode? 3478 // TODO, when secure mode?
3940 break; 3479 break;
3941 3480
… …
3959 case URxvt_italicFont: 3498 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3499 case URxvt_boldItalicFont:
3961#endif 3500#endif
3962 if (query) 3501 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3502 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3503 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3504 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3505 resp);
3967 else 3506 else
3968 { 3507 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3508 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3983 break; 3522 break;
3984 3523
3985#if !ENABLE_MINIMAL 3524#if !ENABLE_MINIMAL
3986 case URxvt_locale: 3525 case URxvt_locale:
3987 if (query) 3526 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3527 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3989 else 3528 else
3990 { 3529 {
3991 set_locale (str); 3530 set_locale (str);
3992 pty->set_utf8_mode (enc_utf8); 3531 pty->set_utf8_mode (enc_utf8);
3993 init_xlocale (); 3532 init_xlocale ();
… …
4008 break; 3547 break;
4009#endif 3548#endif
4010 3549
4011#if ENABLE_PERL 3550#if ENABLE_PERL
4012 case URxvt_perl: 3551 case URxvt_perl:
4013 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));
4014 ; // no responses yet
4015 break; 3553 break;
4016#endif 3554#endif
4017 } 3555 }
4018} 3556}
4019/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
4042 { 3580 {
4043 if (mode == 'r') 3581 if (mode == 'r')
4044 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4045 else 3583 else
4046 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4047 PrivMode (state, bit); 3585 set_privmode (bit, state);
4048 } 3586 }
4049 3587
4050 return state; 3588 return state;
4051} 3589}
4052 3590
… …
4056{ 3594{
4057 unsigned int i, j; 3595 unsigned int i, j;
4058 int state; 3596 int state;
4059 3597
4060 static const struct 3598 static const struct
4061 { 3599 {
4062 const int argval; 3600 const int argval;
4063 const unsigned long bit; 3601 const unsigned long bit;
4064 }
4065
4066 argtopriv[] = { 3602 } argtopriv[] = {
4067 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
4068 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
4069 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
4070 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
4071 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
4072 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
4073 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
4074 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
4075 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
4076 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
4077 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4078#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
4079 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
4080#endif 3617#endif
4081 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
4082 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
4083 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
4084 // 45 margin bell NYI 3622 // 45 margin bell NYI
4085 // 46 start logging 3623 // 46 start logging
4086 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
4087 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4088#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
4089 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
4090#endif 3628#endif
4091 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
4092 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
4093 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
4094 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4095 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4096 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
4097 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
4098 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
4099 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
4100 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
4101 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
4102 { 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 */
4103 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
4104 }; 3642 };
4105 3643
4106 if (nargs == 0) 3644 if (nargs == 0)
4107 return; 3645 return;
4108 3646
… …
4133 3671
4134 scr_touch (true); 3672 scr_touch (true);
4135 break; 3673 break;
4136#endif 3674#endif
4137 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4138 case 1049:
4139 if (OPTION (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
4140 if (mode == 0) 3677 if (mode == 0)
4141 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
4142 else if (mode == 1) 3679 else if (mode == 1)
4143 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
4144 break; 3681 break;
… …
4152 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
4153 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
4154 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
4155 * within VT52 mode 3692 * within VT52 mode
4156 */ 3693 */
4157 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
4158 break; 3695 break;
4159 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
4160 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
4161 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4162 break; 3699 break;
4163 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
4164 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
4165 break; 3702 break;
4166 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
4173 scr_autowrap (state); 3710 scr_autowrap (state);
4174 break; 3711 break;
4175 /* 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 */
4176 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
4177 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
4178 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4179 break; 3716 break;
4180#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
4181 case scrollBar_esc: 3718 case scrollBar_esc:
4182 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
4183 { 3720 {
4184 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
4185 scr_touch (true); 3722 scr_touch (true);
4186 } 3723 }
4187 break; 3724 break;
… …
4196 break; 3733 break;
4197 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
4198 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
4199 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
4200 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3739 break;
4203#if 0
4204 case 1001: 3740 case 1002:
4205 break; /* X11 mouse highlighting */ 3741 case 1003:
4206#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;
4207 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4208 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
4209 break; 3755 break;
4210 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4211 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4212 break; 3758 break;
4213 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4214 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4215 if (current_screen != PRIMARY) 3761 if (!state)
4216 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
4217 scr_change_screen (state); 3764 scr_change_screen (state);
4218 break; 3765 break;
4219 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
4220 scr_change_screen (state); 3771 scr_change_screen (state);
3772
4221 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4222 if (current_screen != PRIMARY) 3774 if (state)
4223 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
4224 break; 3778 break;
4225 default: 3779 default:
4226 break; 3780 break;
4227 } 3781 }
4228 } 3782 }
… …
4388rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
4389{ 3943{
4390 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
4391 3945
4392 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
4393 { /* query graphics */ 3948 /* query graphics */
4394 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
4395 return; 3950 return;
4396 } 3951 }
4397 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
4398 do 3953 do
… …
4448 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4449 4004
4450 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4451 v_buflen += len; 4006 v_buflen += len;
4452 4007
4453 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4454} 4009}
4455 4010
4456void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4457{ 4012{
4458 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));
… …
4463 4018
4464 if (v_buflen == 0) 4019 if (v_buflen == 0)
4465 { 4020 {
4466 free (v_buffer); 4021 free (v_buffer);
4467 v_buffer = 0; 4022 v_buffer = 0;
4468 v_buflen = 0;
4469 4023
4470 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4471 return; 4025 return;
4472 } 4026 }
4473 4027
4474 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4475 } 4029 }
4476 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4477 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4478} 4032}
4479 4033
4480/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4481 4035

Diff Legend

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