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.314 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.462 by root, Wed Nov 24 04:07:39 2010 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 593 {
498 commit_iso14755 (); 594 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
500# if ISO_14755 596# if ISO_14755
501 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 606# endif
503 return; 607 return;
504 } 608 }
505 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
506 { 610 {
… …
511# endif 615# endif
512 return; 616 return;
513 } 617 }
514 else 618 else
515 { 619 {
516# if ENABLE_OVERLAY 620# if ISO_14755
517 scr_overlay_off (); 621 scr_overlay_off ();
518# endif 622# endif
519 iso14755buf = 0; 623 iso14755buf = 0;
520 } 624 }
521 } 625 }
626 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
525 { 630 {
526 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 632# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 635# endif
531 } 636 }
532#endif 637#endif
533 638
534#ifdef PRINTPIPE 639#ifdef PRINTPIPE
535 if (keysym == XK_Print) 640 if (keysym == XK_Print)
536 { 641 {
537 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
538 return; 643 return;
539 } 644 }
540#endif 645#endif
541 646
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
544 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
545 newlen = 1; 689 newlen = 0;
546 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
547 { 773 {
548#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
549 case XK_BackSpace: 775 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 777 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; 778 newlen = 0;
832 break;
833 } 779 }
834 780 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
838 785
839 /* 786 /*
840 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
841 */ 788 */
842#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
877 return; 824 return;
878 825
879 if (len <= 0) 826 if (len <= 0)
880 return; /* not mapped */ 827 return; /* not mapped */
881 828
882 if (OPTION (Opt_scrollTtyKeypress)) 829 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 830 if (view_start)
884 { 831 {
885 view_start = 0; 832 view_start = 0;
886 want_refresh = 1; 833 want_refresh = 1;
887 } 834 }
… …
926#if ENABLE_FRILLS || ISO_14755 873#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 874 // ISO 14755 support
928 if (iso14755buf) 875 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 876 if (iso14755buf & ISO_14755_52)
930 { 877 {
931# if ENABLE_OVERLAY 878# if ISO_14755
932 scr_overlay_off (); 879 scr_overlay_off ();
933# endif 880# endif
934# if ISO_14755 881# if ISO_14755
935 // iso14755 part 5.2 handling: release time 882 // iso14755 part 5.2 handling: release time
936 // first: controls 883 // first: controls
… …
959 906
960 return; 907 return;
961 } 908 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 910 {
964# if ENABLE_OVERLAY 911# if ISO_14755
965 scr_overlay_off (); 912 scr_overlay_off ();
966# endif 913# endif
967 if (iso14755buf & ISO_14755_51) 914 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 915 commit_iso14755 ();
969#if ISO_14755 916#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 918 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 920
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 974void
1028rxvt_term::flush () 975rxvt_term::flush ()
1029{ 976{
1030 flush_ev.stop (); 977 flush_ev.stop ();
1031 978
1032#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
1034 { 981 {
1035 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
1036 scr_clear (); 983// scr_clear (true); This needs to be researched further!
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) + 1;
1302 y = ev.y; 1258 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1259
1260 if (ev.type == MotionNotify)
1261 {
1262 if (x == mouse_row && y == mouse_col)
1263 return;
1264
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1304 1269
1305 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1306 button_number = 3; 1271 button_number = 3;
1307 else 1272 else
1308 { 1273 {
1309 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1276 if (button_number >= 3)
1312 button_number += (64 - 3); 1277 button_number += 64 - 3;
1313 } 1278 }
1314 1279
1315 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1316 { 1281 {
1317 /* 1282 /*
… …
1349 fputc ('A', stderr); 1314 fputc ('A', stderr);
1350 if (key_state & 32) 1315 if (key_state & 32)
1351 fputc ('2', stderr); 1316 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1318 button_number,
1354 x + 1, 1319 x,
1355 y + 1); 1320 y);
1356#endif 1321#endif
1357 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1358 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1337 code + button_number + key_state,
1360 (32 + x + 1), 1338 32 + x,
1361 (32 + y + 1)); 1339 32 + y);
1362} 1340}
1363 1341
1364/*{{{ process an X event */ 1342/*{{{ process an X event */
1365void 1343void
1366rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1404 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1405 focus_out ();
1428 } 1406 }
1429#endif 1407#endif
1430 } 1408 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1409 break;
1436 1410
1437 /* 1411 /*
1438 * XXX: this is not the _current_ arrangement 1412 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1413 * Here's my conclusion:
… …
1458 break; 1432 break;
1459 } 1433 }
1460 break; 1434 break;
1461 1435
1462 case FocusIn: 1436 case FocusIn:
1437 if (ev.xfocus.detail != NotifyInferior
1438 && ev.xfocus.detail != NotifyPointer
1439 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1440 focus_in ();
1464 break; 1441 break;
1465 1442
1466 case FocusOut: 1443 case FocusOut:
1444 if (ev.xfocus.detail != NotifyInferior
1445 && ev.xfocus.detail != NotifyPointer
1446 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1447 focus_out ();
1468 break; 1448 break;
1469 1449
1470 case ConfigureNotify: 1450 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1472 { 1452 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1454 ;
1475 1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1474
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1476 {
1478 seen_resize = 1; 1477 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1479 }
1480 else
1481 {
1482#ifdef HAVE_BG_PIXMAP
1483 if (moved)
1484 {
1485 if (mapped)
1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif
1491 }
1481 1492
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1494 }
1489 break; 1495 break;
1490 1496
1491 case PropertyNotify: 1497 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1495 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496 1502
1497 break; 1503 break;
1498 1504
1499 case SelectionClear: 1505 case SelectionClear:
1500 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break; 1507 break;
1502 1508
1503 case SelectionNotify: 1509 case SelectionNotify:
1504 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1508 case SelectionRequest: 1514 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1510 break; 1516 break;
1511 1517
1512 case MapNotify: 1518 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1513 mapped = 1; 1535 mapped = 1;
1514#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1537 text_blink_ev.start ();
1516#endif 1538#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1540 break;
1519 1541
1520 case UnmapNotify: 1542 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1524#endif 1546#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1548 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1549
1534 case GraphicsExpose: 1550 case GraphicsExpose:
1535 case Expose: 1551 case Expose:
1536 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1537 { 1553 {
1538 do 1554 do
1555 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1558 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1560
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1562
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1567 }
1548 1568
1549 want_refresh = 1; 1569 want_refresh = 1;
1550 } 1570 }
1551 else 1571 else
1552 { 1572 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1576 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1578 ;
1559 1579
1560 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1581 {
1562 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1583 scrollBar.show (0);
1564 } 1584 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1585 }
1571 break; 1586 break;
1572 1587
1573 case MotionNotify: 1588 case MotionNotify:
1574#ifdef POINTER_BLANK 1589#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1590 if (hidden_pointer)
1576 pointer_unblank (); 1591 pointer_unblank ();
1577#endif 1592#endif
1593 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1594 || priv_modes & PrivMode_MouseAnyEvent)
1595 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1597 break;
1580 1598
1581 if (ev.xany.window == vt) 1599 if (ev.xany.window == vt)
1582 { 1600 {
… …
1616 int dist; 1634 int dist;
1617 1635
1618 /* don't clobber the current delay if we are 1636 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1637 * already in the middle of scrolling.
1620 */ 1638 */
1621 if (!sel_scroll_ev.active) 1639 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1640 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1641
1624 /* save the event params so we can highlight 1642 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1643 * the selection in the pending-scroll loop
1626 */ 1644 */
1627 selection_save_x = ev.xbutton.x; 1645 selection_save_x = ev.xbutton.x;
… …
1649 else 1667 else
1650 { 1668 {
1651 /* we are within the text window, so we 1669 /* we are within the text window, so we
1652 * shouldn't be scrolling 1670 * shouldn't be scrolling
1653 */ 1671 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1656 } 1673 }
1657#endif 1674#endif
1658#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1659 } 1676 }
1660#endif 1677#endif
1661 } 1678 }
1662 } 1679 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1681 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1667 ; 1684 ;
1668 1685
… …
1670 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1690 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1692 scrollBar.size ());
1676 want_refresh = 1; 1693 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1694 scrollBar.show (1);
1679 } 1695 }
1680 break; 1696 break;
1681 } 1697 }
1682 1698
1683#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1701 {
1686 if (hidden_cursor) 1702 if (hidden_cursor)
1687 { 1703 {
1688 hidden_cursor = 0; 1704 hidden_cursor = 0;
1689 want_refresh = 1; 1705 want_refresh = 1;
1690 } 1706 }
1691 1707
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1708 cursor_blink_ev.again ();
1693 } 1709 }
1694#endif 1710#endif
1695 1711
1696#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1714 {
1699 if (ev.type == MotionNotify 1715 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1716 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1717 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1718 if (hidden_pointer)
… …
1704 1720
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1722 pointer_blank ();
1707 } 1723 }
1708#endif 1724#endif
1725
1726 refresh_check ();
1709} 1727}
1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1710 1744
1711void 1745void
1712rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1713{ 1747{
1714 if (!focus) 1748 if (!focus)
1715 { 1749 {
1716 focus = 1; 1750 focus = 1;
1717 want_refresh = 1; 1751 want_refresh = 1;
1718 1752
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1753#if USE_XIM
1722 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1723 { 1755 {
1724 IMSetPosition (); 1756 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
1726 } 1758 }
1727#endif 1759#endif
1728#if CURSOR_BLINK 1760#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1761 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1762 cursor_blink_ev.again ();
1731#endif 1763#endif
1732#if OFF_FOCUS_FADING 1764#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1765 if (rs[Rs_fade])
1734 { 1766 {
1735 pix_colors = pix_colors_focused; 1767 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1768 scr_recolour ();
1737 } 1769 }
1738#endif 1770#endif
1771#if ENABLE_FRILLS
1772 if (option (Opt_urgentOnBell))
1773 set_urgency (0);
1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739 } 1777 }
1740} 1778}
1741 1779
1742void 1780void
1743rxvt_term::focus_out () 1781rxvt_term::focus_out ()
… …
1745 if (focus) 1783 if (focus)
1746 { 1784 {
1747 focus = 0; 1785 focus = 0;
1748 want_refresh = 1; 1786 want_refresh = 1;
1749 1787
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1751 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1752#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1793 if (iso14755buf)
1754 { 1794 {
1755 iso14755buf = 0; 1795 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1796# if ISO_14755
1757 scr_overlay_off (); 1797 scr_overlay_off ();
1758# endif 1798# endif
1759 } 1799 }
1760#endif 1800#endif
1761#if USE_XIM 1801#if USE_XIM
1762 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1764#endif 1804#endif
1765#if CURSOR_BLINK 1805#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1806 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1808
1768 hidden_cursor = 0; 1809 hidden_cursor = 0;
1769#endif 1810#endif
1770#if OFF_FOCUS_FADING 1811#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1812 if (rs[Rs_fade])
1772 { 1813 {
1773 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1815 scr_recolour ();
1775 } 1816 }
1776#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777 } 1820 }
1778} 1821}
1779 1822
1780void 1823void
1781rxvt_term::update_fade_color (unsigned int idx) 1824rxvt_term::update_fade_color (unsigned int idx)
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1832 }
1790#endif 1833#endif
1791} 1834}
1792 1835
1793#if TRANSPARENT || ENABLE_PERL 1836#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1837void
1795rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1839{
1797 make_current (); 1840 make_current ();
1798 1841
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1844 return;
1802 1845
1803# if TRANSPARENT 1846# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1847 switch (ev.type)
1805 { 1848 {
1806 case PropertyNotify: 1849 case PropertyNotify:
1807 /* 1850 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1851 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1852 * use the property to determine the pixmap. We use it later on.
1810 */ 1853 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1856 {
1857 bgPixmap.set_root_pixmap ();
1858 update_background ();
1859 }
1814 1860
1815 /* FALLTHROUGH */
1816 case ReparentNotify:
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1861 break;
1820 } 1862 }
1821# endif 1863# endif
1864
1865 refresh_check ();
1822} 1866}
1823#endif 1867#endif
1824 1868
1825void 1869void
1826rxvt_term::button_press (XButtonEvent &ev) 1870rxvt_term::button_press (XButtonEvent &ev)
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1861 { 1905 {
1862 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1863 MEvent.clicks++; 1907 MEvent.clicks++;
1864 1908
1865 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1866 { 1910 {
1867 /* only report double clicks */ 1911 /* only report double clicks */
… …
1881 mouse_report (ev); 1925 mouse_report (ev);
1882 } 1926 }
1883#else 1927#else
1884 MEvent.button = ev.button; 1928 MEvent.button = ev.button;
1885 mouse_report (ev); 1929 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1930#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1931
1888 } 1932 }
1889 else 1933 else
1890 { 1934 {
1891 if (ev.button != MEvent.button) 1935 if (ev.button != MEvent.button)
… …
1939 } 1983 }
1940 1984
1941 /* 1985 /*
1942 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1943 */ 1987 */
1944 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1989 {
1946 scrollBar.setIdle (); 1990 page_dirn direction = NO_DIR;
1991
1992 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */
1996
1997 scrollBar.state = STATE_IDLE;
1947 /* 1998 /*
1948 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 2000 * move up if mouse is above slider
1950 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1951 * 2002 *
… …
1960 /* 2011 /*
1961 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1964 */ 2015 */
1965 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
1975 else 2020 else
1976 switch (ev.button) 2021 switch (ev.button)
1977 { 2022 {
1978 case Button2: 2023 case Button2:
… …
1985 tt_printf ("\033[5~"); 2030 tt_printf ("\033[5~");
1986 break; 2031 break;
1987 } 2032 }
1988 } 2033 }
1989 else 2034 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2036 {
1997 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2038 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2042#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
2015 { 2044 {
2016 if (upordown < 0) 2045 if (direction == UP)
2017 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
2018 else 2047 else
2019 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
2020 } 2049 }
2021 } 2050 }
2022 else 2051 else
2023 switch (ev.button) 2052 switch (ev.button)
2024 { 2053 {
2025 case Button2: 2054 case Button2:
2026 switch (scrollbar_align) 2055 switch (scrollBar.align)
2027 { 2056 {
2028 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
2029 csrO = 0; 2058 csrO = 0;
2030 break; 2059 break;
2031 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
… …
2037 } 2066 }
2038 2067
2039 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2040 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2043 2072
2044 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2045 break; 2074 break;
2046 2075
2047 case Button1: 2076 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2051 2080
2052 case Button3: 2081 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
… …
2063 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2064# else 2093# else
2065 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2066# endif 2095# endif
2067 else 2096 else
2068 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2069 } 2098 }
2070 else 2099 else
2071 { 2100 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2102 (nrow
2074 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2075 / scrollbar_size ())); 2104 / scrollBar.size ()));
2076 } 2105 }
2077 2106
2078 break; 2107 break;
2079 } 2108 }
2080 } 2109 }
… …
2090 2119
2091 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2121 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2123
2095 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2096 { 2125 {
2097 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2098 scrollbar_show (0); 2127 scrollBar.show (0);
2099 } 2128 }
2100 2129
2101#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2104#endif 2132#endif
2105 2133
2106 if (ev.window == vt) 2134 if (ev.window == vt)
2107 { 2135 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2132 mouse_report (ev); 2160 mouse_report (ev);
2133 } 2161 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2162#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
2136 mouse_report (ev); 2164 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2166 return;
2139 } 2167 }
2140 2168
2141 /* 2169 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
… …
2154 selection_make (ev.time); 2182 selection_make (ev.time);
2155 break; 2183 break;
2156 2184
2157 case Button2: 2185 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2188 break;
2161 2189
2162#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2163 case Button4: 2191 case Button4:
2164 case Button5: 2192 case Button5:
… …
2168 2196
2169 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2170 2198
2171 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2172 i = 1; 2200 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2202 i = nrow - 1;
2175 else 2203 else
2176 i = 5; 2204 i = 5;
2177 2205
2178# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2180 { 2208 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2212
2185 if (slip_wheel_ev.at < NOW) 2213 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2215 }
2190 else 2216 else
2217# endif
2191 { 2218 {
2192# endif
2193 scr_page (v, i); 2219 scr_page (v, i);
2194 scrollbar_show (1); 2220 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2221 }
2197# endif
2198 } 2222 }
2199 break; 2223 break;
2200#endif 2224#endif
2201 } 2225 }
2202 } 2226 }
2203} 2227}
2204 2228
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676
2677/*}}} */ 2229/*}}} */
2678 2230
2679bool 2231void
2680rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2681{ 2233{
2682 bool flag = false;
2683 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2684 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2685 2236
2686 for (;;) 2237 for (;;)
2687 { 2238 {
2688 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2689 { 2240 {
2690 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2242 ch = next_char ();
2692 2243
2693 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2694 break; 2245 break;
2695 } 2246 }
2696 2247
2697 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2698 { 2249 {
2699 if (!seen_input) 2250 if (expect_false (!seen_input))
2700 { 2251 {
2701 seen_input = 1; 2252 seen_input = 1;
2702 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2703 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2704 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
… …
2717 wchar_t *str = buf; 2268 wchar_t *str = buf;
2718 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2719 2270
2720 for (;;) 2271 for (;;)
2721 { 2272 {
2722 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2723 break; 2274 break;
2724 2275
2725 *str++ = ch; 2276 *str++ = ch;
2726 2277
2727 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2728 { 2279 {
2729 if (ch == C0_LF) 2280 if (ch == C0_LF)
2730 nlines++; 2281 nlines++;
2731 2282
2732 refresh_count++; 2283 refresh_count++;
2733 2284
2734 if (!OPTION (Opt_jumpScroll) 2285 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2286 {
2737 refreshnow = true;
2738 refresh_count = 0; 2287 refresh_count = 0;
2288
2289 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2290 {
2291 refreshnow = true;
2739 ch = NOCHAR; 2292 ch = NOCHAR;
2740 break; 2293 break;
2294 }
2741 } 2295 }
2742 2296
2743 // scr_add_lines only works for nlines <= nrow - 1. 2297 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2298 if (nlines >= nrow - 1)
2745 { 2299 {
… …
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2327 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2774 scr_add_lines (buf, str - buf, nlines); 2328 scr_add_lines (buf, str - buf, nlines);
2775 2329
2776 /* 2330 /*
2777 * If there have been a lot of new lines, then update the screen 2331 * If there have been a lot of new lines, then update the screen
2778 * What the heck I'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2779 * the number of pages between refreshes is refresh_limit, which 2333 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2334 */
2782 if (refreshnow) 2335 if (refreshnow)
2783 { 2336 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2337 scr_refresh ();
2791 want_refresh = 1; 2338 want_refresh = 1;
2792 }
2793 } 2339 }
2794
2795 } 2340 }
2796 else 2341 else
2797 { 2342 {
2798 try 2343 try
2799 { 2344 {
… …
2807 } 2352 }
2808 2353
2809 ch = NOCHAR; 2354 ch = NOCHAR;
2810 } 2355 }
2811 } 2356 }
2812
2813 return flag;
2814} 2357}
2815 2358
2816// read the next character 2359// read the next character
2817wchar_t 2360wchar_t
2818rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2819{ 2362{
2820 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2821 { 2364 {
2822 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2824 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2825 2368
2826 wchar_t wc; 2369 wchar_t wc;
2827 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2828 2371
… …
2832 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2833 break; 2376 break;
2834 } 2377 }
2835 2378
2836 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2837 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2838 2384
2839 // assume wchar == unicode 2385 // assume wchar == unicode
2840 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2841 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2842 } 2388 }
… …
2886/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2887#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2888FILE * 2434FILE *
2889rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2890{ 2436{
2891 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2892 2438
2893 if (stream == NULL) 2439 if (stream == NULL)
2894 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2895 2441
2896 return stream; 2442 return stream;
… …
2907 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2908 */ 2454 */
2909void 2455void
2910rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2911{ 2457{
2912 int done; 2458 FILE *fd = popen_printer ();
2913 FILE *fd;
2914 2459
2915 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2916 return; 2461 return;
2917 2462
2918 /* 2463 /*
2919 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2920 * is received. 2465 * is received.
2921 */ 2466 */
2922 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2923 { 2468 {
2924 unsigned char buf[8]; 2469 unsigned char buf[8];
2925 unicode_t ch; 2470 unicode_t ch;
2926 unsigned int i, len; 2471 unsigned int i, len;
2927 2472
… …
2946 { 2491 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2493 break; /* done = 1 */
2949 } 2494 }
2950 } 2495 }
2951 2496
2952 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2954 { 2499 {
2955 done = 1; 2500 done = 1;
2956 break; 2501 break;
… …
2958 } 2503 }
2959 } 2504 }
2960 2505
2961 pclose_printer (fd); 2506 pclose_printer (fd);
2962} 2507}
2963#endif /* PRINTPIPE */ 2508#endif /* PRINTPIPE */
2964/*}}} */ 2509/*}}} */
2965 2510
2966/* *INDENT-OFF* */ 2511/* *INDENT-OFF* */
2967enum { 2512enum {
2968 C1_40 = 0x40, 2513 C1_40 = 0x40,
… …
3018 process_dcs_seq (); 2563 process_dcs_seq ();
3019 break; 2564 break;
3020 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
3021 process_csi_seq (); 2566 process_csi_seq ();
3022 break; 2567 break;
3023 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3024 process_osc_seq (); 2569 process_osc_seq ();
3025 break; 2570 break;
3026#endif 2571#endif
3027 } 2572 }
3028} 2573}
… …
3072 break; 2617 break;
3073 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
3074 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3075 break; 2620 break;
3076 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
3077 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
3078 break; 2623 break;
3079 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
3080 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
3081 /* unimplemented */ 2626 /* unimplemented */
3082 break; 2627 break;
… …
3136 scr_forwardindex (); 2681 scr_forwardindex ();
3137 break; 2682 break;
3138#endif 2683#endif
3139 case '=': 2684 case '=':
3140 case '>': 2685 case '>':
3141 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
3142 break; 2687 break;
3143 2688
3144 case C1_40: 2689 case C1_40:
3145 cmd_getc (); 2690 cmd_getc ();
3146 break; 2691 break;
… …
3185 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3186 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
3187 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3188 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
3189 2734
3190 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3191 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
3192 process_csi_seq (); 2737 process_csi_seq ();
3193 break; 2738 break;
3194 2739
3195 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3196 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
3197 process_osc_seq (); 2742 process_osc_seq ();
3198 break; 2743 break;
3199 2744
3200 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3201 case 'c': 2746 case 'c':
3202 mbstate.reset (); 2747 mbstate.reset ();
3203 scr_poweron (); 2748 scr_poweron ();
3204 scrollbar_show (1); 2749 scrollBar.show (1);
3205 break; 2750 break;
3206 2751
3207 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3208 case 'n': 2753 case 'n':
3209 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
3254rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3255{ 2800{
3256 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2802 unsigned int nargs, p;
3258 int n, ndef; 2803 int n, ndef;
3259 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3260 2805
3261 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3262 arg[--nargs] = 0;
3263 2807
3264 priv = 0; 2808 priv = 0;
3265 ch = cmd_getc (); 2809 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2811 {
3267 { /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
3268 priv = ch; 2813 priv = ch;
3269 ch = cmd_getc (); 2814 ch = cmd_getc ();
3270 } 2815 }
3271 2816
3272 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
3311 switch (priv) 2856 switch (priv)
3312 { 2857 {
3313 case '>': 2858 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2859 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2860 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2863 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2866 // versions.
3322 // 2867 //
3323 tt_printf ("\033[>%d;94;0c", 'U'); 2868 tt_printf ("\033[>%d;95;0c", 'U');
3324 } 2869 }
3325 break; 2870 break;
2871
3326 case '?': 2872 case '?':
3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3328 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
3329 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3330 } 2888 }
2889 break;
2890 }
2891
3331 return; 2892 return;
3332 } 2893 }
3333 2894
3334 switch (ch) 2895 switch (ch)
3335 { 2896 {
… …
3455 break; 3016 break;
3456 case 6: /* CPR requested */ 3017 case 6: /* CPR requested */
3457 scr_report_position (); 3018 scr_report_position ();
3458 break; 3019 break;
3459 case 7: /* unofficial extension */ 3020 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 3021 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3022 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 3023 break;
3463 case 8: /* unofficial extension */ 3024 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3025 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 3026 break;
… …
3629 break; 3190 break;
3630 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3631 { 3192 {
3632 char *s; 3193 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent[0], &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3196 XFree (s);
3636 } 3197 }
3637 break; 3198 break;
3638 case 21: /* report window title */ 3199 case 21: /* report window title */
3639 { 3200 {
3640 char *s; 3201 char *s;
3641 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent[0], &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3204 XFree (s);
3644 } 3205 }
3645 break; 3206 break;
3646 } 3207 }
3647} 3208}
… …
3674 seen_esc = true; 3235 seen_esc = true;
3675 continue; 3236 continue;
3676 } 3237 }
3677 else if (ch == C0_BEL || ch == CHAR_ST) 3238 else if (ch == C0_BEL || ch == CHAR_ST)
3678 break; 3239 break;
3240 else if (ch == C0_SYN)
3241 ch = cmd_get8 ();
3679 else if (ch < 0x20) 3242 else if (ch < 0x20)
3680 return NULL; /* other control character - exit */ 3243 return NULL; /* other control character - exit */
3681 3244
3682 seen_esc = false; 3245 seen_esc = false;
3683 3246
3684 if (n >= STRING_MAX - 1) 3247 if (n >= STRING_MAX - 1)
3685 // stop at some sane length 3248 // stop at some sane length
3686 return NULL; 3249 return NULL;
3687 3250
3688 if (ch == C0_SYN)
3689 string[n++] = cmd_get8 ();
3690 else
3691 string[n++] = ch; 3251 string[n++] = ch;
3692 } 3252 }
3693 3253
3694 string[n++] = '\0'; 3254 string[n++] = '\0';
3695 3255
3696 ends_how = (ch == 0x5c ? C0_ESC : ch); 3256 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3703 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3704 */ 3264 */
3705void 3265void
3706rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3707{ 3267{
3708 char *s;
3709 unicode_t eh;
3710
3711 /* 3268 /*
3712 * Not handled yet 3269 * Not handled yet
3713 */ 3270 */
3271
3272 unicode_t eh;
3714 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3715 if (s) 3274 if (s)
3716 free (s); 3275 free (s);
3717 3276
3718 return; 3277 return;
3719} 3278}
… …
3723 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3724 */ 3283 */
3725void 3284void
3726rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3727{ 3286{
3728 unicode_t ch, eh;
3729 int arg; 3287 int arg;
3730 3288
3731 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3732 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3733 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3734 3292
3735 if (ch == ';') 3293 if (ch == ';')
3736 { 3294 {
3295 unicode_t eh;
3737 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3738 3297
3739 if (s) 3298 if (s)
3740 { 3299 {
3741 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3765 3324
3766/* 3325/*
3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3768 */ 3327 */
3769void 3328void
3770rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3771{ 3330{
3772 int color; 3331 int color;
3773 char *buf, *name; 3332 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3334 int saveop = op;
3776 3335
3777 dLocal (Display *, dpy); 3336 dLocal (Display *, dpy);
3778 3337
3779 assert (str != NULL); 3338 assert (str != NULL);
3780 3339
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3340 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return; 3341 return;
3783 3342
3784 switch (op) 3343 switch (op)
3785 { 3344 {
… …
3816 3375
3817 XFree (value); 3376 XFree (value);
3818 } 3377 }
3819 else 3378 else
3820 { 3379 {
3821 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3822 3381
3823 if (eq) 3382 if (eq)
3824 { 3383 {
3825 *eq = 0; 3384 *eq = 0;
3826 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
… …
3847 *buf++ = '\0'; 3406 *buf++ = '\0';
3848 3407
3849 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3850 } 3409 }
3851 break; 3410 break;
3411 case Rxvt_restoreFG:
3852 case XTerm_Color00: 3412 case XTerm_Color00:
3853 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3854 break; 3414 break;
3415 case Rxvt_restoreBG:
3855 case XTerm_Color01: 3416 case XTerm_Color01:
3856 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3857 break; 3418 break;
3858#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
… …
3864 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3426 break;
3866 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3867 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV:
3871 process_color_seq (op, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3876 break; 3441 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3880 break; 3444 break;
3881 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3882 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3883 break; 3447 break;
3884#endif 3448#endif
3885#if TRANSPARENT && TINTING 3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3452#if ENABLE_TRANSPARENCY
3886 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3887 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3888 3457
3889 check_our_parents (); 3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3890 3462
3891 if (am_transparent) 3463 if (changed)
3892 want_full_refresh = want_refresh = 1; 3464 update_background ();
3465 }
3893 3466
3894 break; 3467 break;
3895#endif 3468#endif
3896 3469
3470#if BG_IMAGE_FROM_FILE
3897 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3898 { 3472 if (!strcmp (str, "?"))
3899 if (*str != ';')
3900 { 3473 {
3901#if XPM_BACKGROUND 3474 char str[256];
3902 scale_pixmap (""); /* reset to default scaling */ 3475
3903 set_bgPixmap (str); /* change pixmap */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3904 scr_touch (true); 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3905#endif 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3906 } 3480 }
3907 3481 else
3482 {
3908 int changed = 0; 3483 int changed = 0;
3909 3484
3910 while ((str = strchr (str, ';')) != NULL) 3485 if (*str != ';')
3911 { 3486 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3489 changed++;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3496 }
3497 else
3498 {
3912 str++; 3499 str++;
3913#if XPM_BACKGROUND 3500 if (bgPixmap.set_geometry (str, true))
3914 changed += scale_pixmap (str); 3501 changed++;
3915#endif
3916 } 3502 }
3917 3503
3918 if (changed) 3504 if (changed)
3919 { 3505 {
3920#ifdef XPM_BACKGROUND 3506 if (bgPixmap.window_position_sensitive ())
3921 resize_pixmap (); 3507 {
3922 scr_touch (true); 3508 int x, y;
3923#endif 3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3512 update_background ();
3924 } 3513 }
3925 } 3514 }
3926 break; 3515 break;
3927 3516#endif
3928 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str);
3930 break;
3931 case Rxvt_restoreBG:
3932 set_window_color (Color_bg, str);
3933 break;
3934 3517
3935 case XTerm_logfile: 3518 case XTerm_logfile:
3936 // TODO, when secure mode? 3519 // TODO, when secure mode?
3937 break; 3520 break;
3938 3521
… …
3956 case URxvt_italicFont: 3539 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3540 case URxvt_boldItalicFont:
3958#endif 3541#endif
3959 if (query) 3542 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3543 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3544 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3545 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3546 resp);
3964 else 3547 else
3965 { 3548 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3549 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3980 break; 3563 break;
3981 3564
3982#if !ENABLE_MINIMAL 3565#if !ENABLE_MINIMAL
3983 case URxvt_locale: 3566 case URxvt_locale:
3984 if (query) 3567 if (query)
3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3568 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3986 else 3569 else
3987 { 3570 {
3988 set_locale (str); 3571 set_locale (str);
3989 pty->set_utf8_mode (enc_utf8); 3572 pty->set_utf8_mode (enc_utf8);
3990 init_xlocale (); 3573 init_xlocale ();
… …
4005 break; 3588 break;
4006#endif 3589#endif
4007 3590
4008#if ENABLE_PERL 3591#if ENABLE_PERL
4009 case URxvt_perl: 3592 case URxvt_perl:
4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4011 ; // no responses yet
4012 break; 3594 break;
4013#endif 3595#endif
4014 } 3596 }
4015} 3597}
4016/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
… …
4039 { 3621 {
4040 if (mode == 'r') 3622 if (mode == 'r')
4041 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4042 else 3624 else
4043 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4044 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
4045 } 3628 }
4046 3629
4047 return state; 3630 return state;
4048} 3631}
4049 3632
… …
4053{ 3636{
4054 unsigned int i, j; 3637 unsigned int i, j;
4055 int state; 3638 int state;
4056 3639
4057 static const struct 3640 static const struct
4058 { 3641 {
4059 const int argval; 3642 const int argval;
4060 const unsigned long bit; 3643 const unsigned long bit;
4061 }
4062
4063 argtopriv[] = { 3644 } argtopriv[] = {
4064 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
4065 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
4066 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
4067 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
4068 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
4069 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
4070 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
4071 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
4072 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
4073 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
4074 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4075#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
4076 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
4077#endif 3659#endif
4078 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
4079 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
4080 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
4081 // 45 margin bell NYI 3664 // 45 margin bell NYI
4082 // 46 start logging 3665 // 46 start logging
4083 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
4084 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4085#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
4086 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
4087#endif 3670#endif
4088 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
4089 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3672 { 1002, PrivMode_MouseBtnEvent },
4090 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3673 { 1003, PrivMode_MouseAnyEvent },
4091 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
4092 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4093 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
4094 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
4095 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
4096 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
4097 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
4098 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
4099 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4100 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3689 { 2004, PrivMode_BracketPaste },
4101 }; 3690 };
4102 3691
4103 if (nargs == 0) 3692 if (nargs == 0)
4104 return; 3693 return;
4105 3694
… …
4130 3719
4131 scr_touch (true); 3720 scr_touch (true);
4132 break; 3721 break;
4133#endif 3722#endif
4134 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
4135 case 1049:
4136 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4137 if (mode == 0) 3725 if (mode == 0)
4138 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
4139 else if (mode == 1) 3727 else if (mode == 1)
4140 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
4141 break; 3729 break;
… …
4149 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
4150 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
4151 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
4152 * within VT52 mode 3740 * within VT52 mode
4153 */ 3741 */
4154 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
4155 break; 3743 break;
4156 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
4157 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
4158 set_widthheight (((state ? 132 : 80) * fwidth), height); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4159 break; 3747 break;
4160 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
4161 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
4162 break; 3750 break;
4163 case 5: /* reverse video */ 3751 case 5: /* reverse video */
… …
4170 scr_autowrap (state); 3758 scr_autowrap (state);
4171 break; 3759 break;
4172 /* case 8: - auto repeat, can't do on a per window basis */ 3760 /* case 8: - auto repeat, can't do on a per window basis */
4173 case 9: /* X10 mouse reporting */ 3761 case 9: /* X10 mouse reporting */
4174 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
4175 priv_modes &= ~PrivMode_MouseX11; 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4176 break; 3764 break;
4177#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
4178 case scrollBar_esc: 3766 case scrollBar_esc:
4179 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
4180 { 3768 {
4181 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
4182 scr_touch (true); 3770 scr_touch (true);
4183 } 3771 }
4184 break; 3772 break;
… …
4193 break; 3781 break;
4194 /* case 66: - application key pad */ 3782 /* case 66: - application key pad */
4195 /* case 67: - backspace key */ 3783 /* case 67: - backspace key */
4196 case 1000: /* X11 mouse reporting */ 3784 case 1000: /* X11 mouse reporting */
4197 if (state) /* orthogonal */ 3785 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX10; 3786 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4199 break; 3787 break;
4200#if 0
4201 case 1001: 3788 case 1002:
4202 break; /* X11 mouse highlighting */ 3789 case 1003:
4203#endif 3790 if (state)
3791 {
3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3795 vt_emask_mouse = PointerMotionMask;
3796 }
3797 else
3798 vt_emask_mouse = NoEventMask;
3799
3800 vt_select_input ();
3801 break;
4204 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
4205 set_option (Opt_scrollTtyOutput, !state); 3803 set_option (Opt_scrollTtyOutput, !state);
4206 break; 3804 break;
4207 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
4208 set_option (Opt_scrollTtyKeypress, state); 3806 set_option (Opt_scrollTtyKeypress, state);
4209 break; 3807 break;
4210 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
4211 if (OPTION (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
4212 if (current_screen != PRIMARY) 3810 if (!state)
4213 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
4214 scr_change_screen (state); 3813 scr_change_screen (state);
4215 break; 3814 break;
4216 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
4217 scr_change_screen (state); 3820 scr_change_screen (state);
3821
4218 if (OPTION (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
4219 if (current_screen != PRIMARY) 3823 if (state)
4220 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
4221 break; 3827 break;
4222 default: 3828 default:
4223 break; 3829 break;
4224 } 3830 }
4225 } 3831 }
… …
4385rxvt_term::process_graphics () 3991rxvt_term::process_graphics ()
4386{ 3992{
4387 unicode_t ch, cmd = cmd_getc (); 3993 unicode_t ch, cmd = cmd_getc ();
4388 3994
4389 if (cmd == 'Q') 3995 if (cmd == 'Q')
3996 {
4390 { /* query graphics */ 3997 /* query graphics */
4391 tt_printf ("\033G0\012"); /* no graphics */ 3998 tt_printf ("\033G0\012"); /* no graphics */
4392 return; 3999 return;
4393 } 4000 }
4394 /* swallow other graphics sequences until terminating ':' */ 4001 /* swallow other graphics sequences until terminating ':' */
4395 do 4002 do
… …
4445 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4446 4053
4447 memcpy (v_buffer + v_buflen, data, len); 4054 memcpy (v_buffer + v_buflen, data, len);
4448 v_buflen += len; 4055 v_buflen += len;
4449 4056
4450 pty_ev.set (EVENT_READ | EVENT_WRITE); 4057 pty_ev.set (ev::READ | ev::WRITE);
4451} 4058}
4452 4059
4453void rxvt_term::pty_write () 4060void rxvt_term::pty_write ()
4454{ 4061{
4455 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4062 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4460 4067
4461 if (v_buflen == 0) 4068 if (v_buflen == 0)
4462 { 4069 {
4463 free (v_buffer); 4070 free (v_buffer);
4464 v_buffer = 0; 4071 v_buffer = 0;
4465 v_buflen = 0;
4466 4072
4467 pty_ev.set (EVENT_READ); 4073 pty_ev.set (ev::READ);
4468 return; 4074 return;
4469 } 4075 }
4470 4076
4471 memmove (v_buffer, v_buffer + written, v_buflen); 4077 memmove (v_buffer, v_buffer + written, v_buflen);
4472 } 4078 }
4473 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4079 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4474 pty_ev.set (EVENT_READ); 4080 pty_ev.set (ev::READ);
4475} 4081}
4476 4082
4477/*----------------------- end-of-file (C source) -----------------------*/ 4083/*----------------------- end-of-file (C source) -----------------------*/
4478 4084

Diff Legend

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