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.311 by root, Sat Mar 4 20:14:35 2006 UTC vs.
Revision 1.452 by sf-exg, Mon Jul 26 09:57:53 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.check_clearChanged ())
1034 { 981 {
1035 want_full_refresh = 0; 982// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 983 scr_touch (false);
1038 } 984 }
1039#endif 985#endif
1040 986
1041 if (want_refresh) 987 if (want_refresh)
… …
1077 } 1023 }
1078 while (row < end_row); 1024 while (row < end_row);
1079 } 1025 }
1080 1026
1081 scr_refresh (); 1027 scr_refresh ();
1082 scrollbar_show (1); 1028 scrollBar.show (1);
1083#ifdef USE_XIM 1029#ifdef USE_XIM
1084 IMSendSpot (); 1030 IMSendSpot ();
1085#endif 1031#endif
1086 } 1032 }
1087 1033
1088 display->flush (); 1034 display->flush ();
1089} 1035}
1090 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1091void 1038void
1092rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1040{
1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1043
1044 display->flush ();
1045}
1046
1047void
1048rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1049{
1094 make_current (); 1050 make_current ();
1095 1051
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; 1052 refresh_count = 0;
1109 flush (); 1053 flush ();
1110} 1054}
1111 1055
1112#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1113void 1057void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1059{
1116 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1061 want_refresh = 1;
1118 1062 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1063}
1121#endif 1064#endif
1122 1065
1123#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1124void 1067void
1125rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1069{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1071 {
1129 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1130 want_refresh = 1; 1073 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1132 } 1075 }
1076 else
1077 w.stop ();
1133} 1078}
1134#endif 1079#endif
1135 1080
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1082void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1084{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1087 {
1143 want_refresh = 1; 1088 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1145 } 1090 }
1091 else
1092 w.stop ();
1146} 1093}
1147#endif 1094#endif
1148 1095
1149#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1150void 1097void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1099{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1101 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1103 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1158 } 1105 }
1106 else
1107 w.stop ();
1159} 1108}
1160#endif 1109#endif
1161 1110
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1112void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1114{
1166 if (mouse_slip_wheel_speed == 0 1115 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 { 1116 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1117 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1175 } 1125 }
1176} 1126}
1177#endif 1127#endif
1178 1128
1179#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1180static struct event_handler 1130static struct event_handler
1181{ 1131{
1182 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1183 1133
1184 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1185 { 1135 {
1186 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1190 1143
1191 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1193 1146
1194 w.stop (); 1147 w.stop ();
1195 } 1148 }
1196 1149
… …
1232 } 1185 }
1233 else 1186 else
1234 { 1187 {
1235 pty_ev.stop (); 1188 pty_ev.stop ();
1236 1189
1237 if (!OPTION (Opt_hold)) 1190 if (!option (Opt_hold))
1238 destroy (); 1191 destroy ();
1239 } 1192 }
1240 1193
1241 return false; 1194 return false;
1242} 1195}
1243 1196
1244void 1197void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1199{
1247 make_current (); 1200 make_current ();
1248 1201
1249 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1205 cmd_parse ();
1253 break;
1254 1206
1255 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1256 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1257} 1211}
1258 1212
1259void 1213void
1260rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1261{ 1215{
… …
1263 recolour_cursor (); 1217 recolour_cursor ();
1264 1218
1265#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1220 hidden_pointer = 0;
1267 1221
1268 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1270#endif 1224#endif
1271} 1225}
1272 1226
1273#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1274void 1228void
1275rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1276{ 1230{
1277 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1278 return; 1232 return;
1279 1233
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1235 XFlush (dpy);
1282 1236
1283 hidden_pointer = 1; 1237 hidden_pointer = 1;
1284} 1238}
1285 1239
1286void 1240void
1287rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1242{
1289 make_current (); 1243 make_current ();
1290 1244
1291 pointer_blank (); 1245 pointer_blank ();
1292} 1246}
… …
1295void 1249void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1251{
1298 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1299 int x, y; 1253 int x, y;
1254 int code = 32;
1300 1255
1301 x = ev.x; 1256 x = Pixel2Col (ev.x);
1302 y = ev.y; 1257 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1304 1266
1305 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1306 button_number = 3; 1268 button_number = 3;
1307 else 1269 else
1308 { 1270 {
… …
1354 x + 1, 1316 x + 1,
1355 y + 1); 1317 y + 1);
1356#endif 1318#endif
1357 1319
1358 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1360 (32 + x + 1), 1322 (32 + x + 1),
1361 (32 + y + 1)); 1323 (32 + y + 1));
1362} 1324}
1363 1325
1364/*{{{ process an X event */ 1326/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1389 focus_out ();
1428 } 1390 }
1429#endif 1391#endif
1430 } 1392 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1393 break;
1436 1394
1437 /* 1395 /*
1438 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1458 break; 1416 break;
1459 } 1417 }
1460 break; 1418 break;
1461 1419
1462 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1424 focus_in ();
1464 break; 1425 break;
1465 1426
1466 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1431 focus_out ();
1468 break; 1432 break;
1469 1433
1470 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1471 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1472 { 1439 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1441 ;
1475 1442
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1444 {
1478 seen_resize = 1; 1445 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1447 }
1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif
1459 }
1481 1460
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 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 } 1462 }
1489 break; 1463 break;
1490 1464
1491 case PropertyNotify: 1465 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1495 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496 1470
1497 break; 1471 break;
1498 1472
1499 case SelectionClear: 1473 case SelectionClear:
1500 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break; 1475 break;
1502 1476
1503 case SelectionNotify: 1477 case SelectionNotify:
1504 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1508 case SelectionRequest: 1482 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1510 break; 1484 break;
1511 1485
1512 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed specifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting.
1493 * We should not render background immediately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1513 mapped = 1; 1503 mapped = 1;
1514#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1505 text_blink_ev.start ();
1516#endif 1506#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1508 break;
1519 1509
1520 case UnmapNotify: 1510 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1524#endif 1514#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1516 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1517
1534 case GraphicsExpose: 1518 case GraphicsExpose:
1535 case Expose: 1519 case Expose:
1536 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1537 { 1521 {
1538 do 1522 do
1523 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1528
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1530
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1535 }
1548 1536
1549 want_refresh = 1; 1537 want_refresh = 1;
1550 } 1538 }
1551 else 1539 else
1552 { 1540 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1544 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1546 ;
1559 1547
1560 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1549 {
1562 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1551 scrollBar.show (0);
1564 } 1552 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1553 }
1571 break; 1554 break;
1572 1555
1573 case MotionNotify: 1556 case MotionNotify:
1574#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1558 if (hidden_pointer)
1576 pointer_unblank (); 1559 pointer_unblank ();
1577#endif 1560#endif
1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1562 || priv_modes & PrivMode_MouseAnyEvent)
1563 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1565 break;
1580 1566
1581 if (ev.xany.window == vt) 1567 if (ev.xany.window == vt)
1582 { 1568 {
… …
1616 int dist; 1602 int dist;
1617 1603
1618 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1620 */ 1606 */
1621 if (!sel_scroll_ev.active) 1607 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1609
1624 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1626 */ 1612 */
1627 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
… …
1649 else 1635 else
1650 { 1636 {
1651 /* we are within the text window, so we 1637 /* we are within the text window, so we
1652 * shouldn't be scrolling 1638 * shouldn't be scrolling
1653 */ 1639 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1656 } 1641 }
1657#endif 1642#endif
1658#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1659 } 1644 }
1660#endif 1645#endif
1661 } 1646 }
1662 } 1647 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1649 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1667 ; 1652 ;
1668 1653
… …
1670 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1658 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1660 scrollBar.size ());
1676 want_refresh = 1; 1661 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1662 scrollBar.show (1);
1679 } 1663 }
1680 break; 1664 break;
1681 } 1665 }
1682 1666
1683#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1668 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1669 {
1686 if (hidden_cursor) 1670 if (hidden_cursor)
1687 { 1671 {
1688 hidden_cursor = 0; 1672 hidden_cursor = 0;
1689 want_refresh = 1; 1673 want_refresh = 1;
1690 } 1674 }
1691 1675
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1676 cursor_blink_ev.again ();
1693 } 1677 }
1694#endif 1678#endif
1695 1679
1696#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1682 {
1699 if (ev.type == MotionNotify 1683 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1684 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1685 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1686 if (hidden_pointer)
… …
1704 1688
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1689 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1690 pointer_blank ();
1707 } 1691 }
1708#endif 1692#endif
1693
1694 refresh_check ();
1709} 1695}
1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1710 1712
1711void 1713void
1712rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1713{ 1715{
1714 if (!focus) 1716 if (!focus)
1715 { 1717 {
1716 focus = 1; 1718 focus = 1;
1717 want_refresh = 1; 1719 want_refresh = 1;
1718 1720
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1721#if USE_XIM
1722 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1723 { 1723 {
1724 IMSetPosition (); 1724 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1726 } 1726 }
1727#endif 1727#endif
1728#if CURSOR_BLINK 1728#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1729 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1730 cursor_blink_ev.again ();
1731#endif 1731#endif
1732#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1734 { 1734 {
1735 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1736 scr_recolour ();
1737 } 1737 }
1738#endif 1738#endif
1739#if ENABLE_FRILLS
1740 if (option (Opt_urgentOnBell))
1741 set_urgency (0);
1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739 } 1745 }
1740} 1746}
1741 1747
1742void 1748void
1743rxvt_term::focus_out () 1749rxvt_term::focus_out ()
… …
1745 if (focus) 1751 if (focus)
1746 { 1752 {
1747 focus = 0; 1753 focus = 0;
1748 want_refresh = 1; 1754 want_refresh = 1;
1749 1755
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1751 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1752#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1761 if (iso14755buf)
1754 { 1762 {
1755 iso14755buf = 0; 1763 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1764# if ISO_14755
1757 scr_overlay_off (); 1765 scr_overlay_off ();
1758# endif 1766# endif
1759 } 1767 }
1760#endif 1768#endif
1761#if USE_XIM 1769#if USE_XIM
1762 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1764#endif 1772#endif
1765#if CURSOR_BLINK 1773#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1768 hidden_cursor = 0; 1777 hidden_cursor = 0;
1769#endif 1778#endif
1770#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1772 { 1781 {
1773 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1783 scr_recolour ();
1775 } 1784 }
1776#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1788 }
1789}
1790
1791void
1792rxvt_term::update_fade_color (unsigned int idx)
1793{
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1777 } 1796 {
1797 rgba c;
1798 pix_colors [Color_fade].get (c);
1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1800 }
1801#endif
1778} 1802}
1779 1803
1780#if TRANSPARENT 1804#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1805void
1782rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1807{
1784 make_current (); 1808 make_current ();
1785 1809
1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1812 return;
1813
1814# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1815 switch (ev.type)
1787 { 1816 {
1788 case PropertyNotify: 1817 case PropertyNotify:
1789 /* 1818 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1819 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1820 * use the property to determine the pixmap. We use it later on.
1792 */ 1821 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1824 {
1825 bgPixmap.set_root_pixmap ();
1826 update_background ();
1827 }
1796 1828
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1829 break;
1802 } 1830 }
1831# endif
1832
1833 refresh_check ();
1803} 1834}
1804#endif 1835#endif
1805 1836
1806void 1837void
1807rxvt_term::button_press (XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
… …
1838 /* save the xbutton state (for ButtonRelease) */ 1869 /* save the xbutton state (for ButtonRelease) */
1839 MEvent.state = ev.state; 1870 MEvent.state = ev.state;
1840#ifdef MOUSE_REPORT_DOUBLECLICK 1871#ifdef MOUSE_REPORT_DOUBLECLICK
1841 if (ev.button == MEvent.button && clickintime) 1872 if (ev.button == MEvent.button && clickintime)
1842 { 1873 {
1843 /* same button, within alloted time */ 1874 /* same button, within allowed time */
1844 MEvent.clicks++; 1875 MEvent.clicks++;
1845 1876
1846 if (MEvent.clicks > 1) 1877 if (MEvent.clicks > 1)
1847 { 1878 {
1848 /* only report double clicks */ 1879 /* only report double clicks */
… …
1862 mouse_report (ev); 1893 mouse_report (ev);
1863 } 1894 }
1864#else 1895#else
1865 MEvent.button = ev.button; 1896 MEvent.button = ev.button;
1866 mouse_report (ev); 1897 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1899
1869 } 1900 }
1870 else 1901 else
1871 { 1902 {
1872 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
… …
1920 } 1951 }
1921 1952
1922 /* 1953 /*
1923 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1924 */ 1955 */
1925 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 1957 {
1927 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1928 /* 1966 /*
1929 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 1968 * move up if mouse is above slider
1931 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1932 * 1970 *
… …
1941 /* 1979 /*
1942 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1943 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1944 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1945 */ 1983 */
1946 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1947 && scrollbarnext_upButton (ev.y))
1948 || (scrollBar.style == R_SB_RXVT
1949 && scrollbarrxvt_upButton (ev.y)))
1950 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
1951 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
1952 && scrollbarnext_dnButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_dnButton (ev.y)))
1955 tt_printf ("\033[B"); 1987 tt_printf ("\033[B");
1956 else 1988 else
1957 switch (ev.button) 1989 switch (ev.button)
1958 { 1990 {
1959 case Button2: 1991 case Button2:
… …
1966 tt_printf ("\033[5~"); 1998 tt_printf ("\033[5~");
1967 break; 1999 break;
1968 } 2000 }
1969 } 2001 }
1970 else 2002 else
1971#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
1972
1973 {
1974 char upordown = 0;
1975
1976 if (scrollBar.style == R_SB_NEXT)
1977 { 2004 {
1978 if (scrollbarnext_upButton (ev.y)) 2005 if (direction != NO_DIR)
1979 upordown = -1; /* up */
1980 else if (scrollbarnext_dnButton (ev.y))
1981 upordown = 1; /* down */
1982 }
1983 else if (scrollBar.style == R_SB_RXVT)
1984 {
1985 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 if (upordown)
1991 { 2006 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2010#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
1996 { 2012 {
1997 if (upordown < 0) 2013 if (direction == UP)
1998 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
1999 else 2015 else
2000 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2001 } 2017 }
2002 } 2018 }
2003 else 2019 else
2004 switch (ev.button) 2020 switch (ev.button)
2005 { 2021 {
2006 case Button2: 2022 case Button2:
2007 switch (scrollbar_align) 2023 switch (scrollBar.align)
2008 { 2024 {
2009 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2010 csrO = 0; 2026 csrO = 0;
2011 break; 2027 break;
2012 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
2018 } 2034 }
2019 2035
2020 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2021 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2022 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2024 2040
2025 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2026 break; 2042 break;
2027 2043
2028 case Button1: 2044 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2032 2048
2033 case Button3: 2049 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
… …
2044 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2045# else 2061# else
2046 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2047# endif 2063# endif
2048 else 2064 else
2049 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2050 } 2066 }
2051 else 2067 else
2052 { 2068 {
2053 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2054 (nrow 2070 (nrow
2055 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2056 / scrollbar_size ())); 2072 / scrollBar.size ()));
2057 } 2073 }
2058 2074
2059 break; 2075 break;
2060 } 2076 }
2061 } 2077 }
… …
2071 2087
2072 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2073 if (!bypass_keystate) 2089 if (!bypass_keystate)
2074 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2075 2091
2076 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2077 { 2093 {
2078 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2079 scrollbar_show (0); 2095 scrollBar.show (0);
2080 } 2096 }
2081 2097
2082#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2085#endif 2100#endif
2086 2101
2087 if (ev.window == vt) 2102 if (ev.window == vt)
2088 { 2103 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2104 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2113 mouse_report (ev); 2128 mouse_report (ev);
2114 } 2129 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2130#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2131 MEvent.button = AnyButton;
2117 mouse_report (ev); 2132 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2134 return;
2120 } 2135 }
2121 2136
2122 /* 2137 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
… …
2135 selection_make (ev.time); 2150 selection_make (ev.time);
2136 break; 2151 break;
2137 2152
2138 case Button2: 2153 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2156 break;
2142 2157
2143#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2144 case Button4: 2159 case Button4:
2145 case Button5: 2160 case Button5:
… …
2149 2164
2150 v = ev.button == Button4 ? UP : DN; 2165 v = ev.button == Button4 ? UP : DN;
2151 2166
2152 if (ev.state & ShiftMask) 2167 if (ev.state & ShiftMask)
2153 i = 1; 2168 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2169 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2170 i = nrow - 1;
2156 else 2171 else
2157 i = 5; 2172 i = 5;
2158 2173
2159# ifdef MOUSE_SLIP_WHEELING 2174# ifdef MOUSE_SLIP_WHEELING
… …
2161 { 2176 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2177 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2180
2166 if (slip_wheel_ev.at < NOW) 2181 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2183 }
2171 else 2184 else
2185# endif
2172 { 2186 {
2173# endif
2174 scr_page (v, i); 2187 scr_page (v, i);
2175 scrollbar_show (1); 2188 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2189 }
2178# endif
2179 } 2190 }
2180 break; 2191 break;
2181#endif 2192#endif
2182 } 2193 }
2183 } 2194 }
2184} 2195}
2185 2196
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
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 & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657
2658/*}}} */ 2197/*}}} */
2659 2198
2660bool 2199void
2661rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2662{ 2201{
2663 bool flag = false;
2664 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2665 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2666 2204
2667 for (;;) 2205 for (;;)
2668 { 2206 {
2669 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2670 { 2208 {
2671 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2672 ch = next_char (); 2210 ch = next_char ();
2673 2211
2674 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2675 break; 2213 break;
2676 } 2214 }
2677 2215
2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2679 { 2217 {
2680 if (!seen_input) 2218 if (expect_false (!seen_input))
2681 { 2219 {
2682 seen_input = 1; 2220 seen_input = 1;
2683 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2684 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2685 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
… …
2698 wchar_t *str = buf; 2236 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2700 2238
2701 for (;;) 2239 for (;;)
2702 { 2240 {
2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2704 break; 2242 break;
2705 2243
2706 *str++ = ch; 2244 *str++ = ch;
2707 2245
2708 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2709 { 2247 {
2710 if (ch == C0_LF) 2248 if (ch == C0_LF)
2711 nlines++; 2249 nlines++;
2712 2250
2713 refresh_count++; 2251 refresh_count++;
2714 2252
2715 if (!OPTION (Opt_jumpScroll) 2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2254 {
2718 refreshnow = true;
2719 refresh_count = 0; 2255 refresh_count = 0;
2256
2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2258 {
2259 refreshnow = true;
2720 ch = NOCHAR; 2260 ch = NOCHAR;
2721 break; 2261 break;
2262 }
2722 } 2263 }
2723 2264
2724 // scr_add_lines only works for nlines <= nrow - 1. 2265 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2266 if (nlines >= nrow - 1)
2726 { 2267 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2296 scr_add_lines (buf, str - buf, nlines);
2756 2297
2757 /* 2298 /*
2758 * If there have been a lot of new lines, then update the screen 2299 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2301 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2302 */
2763 if (refreshnow) 2303 if (refreshnow)
2764 { 2304 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2305 scr_refresh ();
2772 want_refresh = 1; 2306 want_refresh = 1;
2773 }
2774 } 2307 }
2775
2776 } 2308 }
2777 else 2309 else
2778 { 2310 {
2779 try 2311 try
2780 { 2312 {
… …
2788 } 2320 }
2789 2321
2790 ch = NOCHAR; 2322 ch = NOCHAR;
2791 } 2323 }
2792 } 2324 }
2793
2794 return flag;
2795} 2325}
2796 2326
2797// read the next character 2327// read the next character
2798wchar_t 2328wchar_t
2799rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2800{ 2330{
2801 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2802 { 2332 {
2803 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2805 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2806 2336
2807 wchar_t wc; 2337 wchar_t wc;
2808 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2809 2339
… …
2813 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2814 break; 2344 break;
2815 } 2345 }
2816 2346
2817 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2819 2352
2820 // assume wchar == unicode 2353 // assume wchar == unicode
2821 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2822 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2823 } 2356 }
… …
2867/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2868#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2869FILE * 2402FILE *
2870rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2871{ 2404{
2872 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2873 2406
2874 if (stream == NULL) 2407 if (stream == NULL)
2875 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2876 2409
2877 return stream; 2410 return stream;
… …
2888 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2889 */ 2422 */
2890void 2423void
2891rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2892{ 2425{
2893 int done; 2426 FILE *fd = popen_printer ();
2894 FILE *fd;
2895 2427
2896 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2897 return; 2429 return;
2898 2430
2899 /* 2431 /*
2900 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2901 * is received. 2433 * is received.
2902 */ 2434 */
2903 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2904 { 2436 {
2905 unsigned char buf[8]; 2437 unsigned char buf[8];
2906 unicode_t ch; 2438 unicode_t ch;
2907 unsigned int i, len; 2439 unsigned int i, len;
2908 2440
… …
2927 { 2459 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2460 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2461 break; /* done = 1 */
2930 } 2462 }
2931 } 2463 }
2932 2464
2933 for (i = 0; i < len; i++) 2465 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2466 if (putc (buf[i], fd) == EOF)
2935 { 2467 {
2936 done = 1; 2468 done = 1;
2937 break; 2469 break;
… …
2939 } 2471 }
2940 } 2472 }
2941 2473
2942 pclose_printer (fd); 2474 pclose_printer (fd);
2943} 2475}
2944#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2945/*}}} */ 2477/*}}} */
2946 2478
2947/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2948enum { 2480enum {
2949 C1_40 = 0x40, 2481 C1_40 = 0x40,
… …
2999 process_dcs_seq (); 2531 process_dcs_seq ();
3000 break; 2532 break;
3001 case 0x9b: /* CSI */ 2533 case 0x9b: /* CSI */
3002 process_csi_seq (); 2534 process_csi_seq ();
3003 break; 2535 break;
3004 case 0x9d: /* CSI */ 2536 case 0x9d: /* OSC */
3005 process_osc_seq (); 2537 process_osc_seq ();
3006 break; 2538 break;
3007#endif 2539#endif
3008 } 2540 }
3009} 2541}
… …
3053 break; 2585 break;
3054 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
3055 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3056 break; 2588 break;
3057 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
3058 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
3059 break; 2591 break;
3060 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
3061 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
3062 /* unimplemented */ 2594 /* unimplemented */
3063 break; 2595 break;
… …
3117 scr_forwardindex (); 2649 scr_forwardindex ();
3118 break; 2650 break;
3119#endif 2651#endif
3120 case '=': 2652 case '=':
3121 case '>': 2653 case '>':
3122 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
3123 break; 2655 break;
3124 2656
3125 case C1_40: 2657 case C1_40:
3126 cmd_getc (); 2658 cmd_getc ();
3127 break; 2659 break;
… …
3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3167 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3169 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
3170 2702
3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3172 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
3173 process_csi_seq (); 2705 process_csi_seq ();
3174 break; 2706 break;
3175 2707
3176 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3177 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
3178 process_osc_seq (); 2710 process_osc_seq ();
3179 break; 2711 break;
3180 2712
3181 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3182 case 'c': 2714 case 'c':
3183 mbstate.reset (); 2715 mbstate.reset ();
3184 scr_poweron (); 2716 scr_poweron ();
3185 scrollbar_show (1); 2717 scrollBar.show (1);
3186 break; 2718 break;
3187 2719
3188 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3189 case 'n': 2721 case 'n':
3190 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
3235rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
3236{ 2768{
3237 unicode_t ch, priv, i; 2769 unicode_t ch, priv, i;
3238 unsigned int nargs, p; 2770 unsigned int nargs, p;
3239 int n, ndef; 2771 int n, ndef;
3240 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
3241 2773
3242 for (nargs = ESC_ARGS; nargs > 0;) 2774 nargs = 0;
3243 arg[--nargs] = 0;
3244 2775
3245 priv = 0; 2776 priv = 0;
3246 ch = cmd_getc (); 2777 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
3248 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
3249 priv = ch; 2781 priv = ch;
3250 ch = cmd_getc (); 2782 ch = cmd_getc ();
3251 } 2783 }
3252 2784
3253 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
3292 switch (priv) 2824 switch (priv)
3293 { 2825 {
3294 case '>': 2826 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2827 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2828 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2831 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2832 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2833 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2834 // versions.
3303 // 2835 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2837 }
3306 break; 2838 break;
2839
3307 case '?': 2840 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3311 } 2856 }
2857 break;
2858 }
2859
3312 return; 2860 return;
3313 } 2861 }
3314 2862
3315 switch (ch) 2863 switch (ch)
3316 { 2864 {
… …
3436 break; 2984 break;
3437 case 6: /* CPR requested */ 2985 case 6: /* CPR requested */
3438 scr_report_position (); 2986 scr_report_position ();
3439 break; 2987 break;
3440 case 7: /* unofficial extension */ 2988 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 2989 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2990 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 2991 break;
3444 case 8: /* unofficial extension */ 2992 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2993 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 2994 break;
… …
3610 break; 3158 break;
3611 case 20: /* report icon label */ 3159 case 20: /* report icon label */
3612 { 3160 {
3613 char *s; 3161 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3162 XGetIconName (dpy, parent[0], &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3164 XFree (s);
3617 } 3165 }
3618 break; 3166 break;
3619 case 21: /* report window title */ 3167 case 21: /* report window title */
3620 { 3168 {
3621 char *s; 3169 char *s;
3622 XFetchName (dpy, parent[0], &s); 3170 XFetchName (dpy, parent[0], &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3172 XFree (s);
3625 } 3173 }
3626 break; 3174 break;
3627 } 3175 }
3628} 3176}
… …
3655 seen_esc = true; 3203 seen_esc = true;
3656 continue; 3204 continue;
3657 } 3205 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3206 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3207 break;
3208 else if (ch == C0_SYN)
3209 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3210 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3211 return NULL; /* other control character - exit */
3662 3212
3663 seen_esc = false; 3213 seen_esc = false;
3664 3214
3665 if (n >= STRING_MAX - 1) 3215 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3216 // stop at some sane length
3667 return NULL; 3217 return NULL;
3668 3218
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3219 string[n++] = ch;
3673 } 3220 }
3674 3221
3675 string[n++] = '\0'; 3222 string[n++] = '\0';
3676 3223
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3224 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3684 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3685 */ 3232 */
3686void 3233void
3687rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
3688{ 3235{
3689 char *s;
3690 unicode_t eh;
3691
3692 /* 3236 /*
3693 * Not handled yet 3237 * Not handled yet
3694 */ 3238 */
3239
3240 unicode_t eh;
3695 s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3696 if (s) 3242 if (s)
3697 free (s); 3243 free (s);
3698 3244
3699 return; 3245 return;
3700} 3246}
… …
3704 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3705 */ 3251 */
3706void 3252void
3707rxvt_term::process_osc_seq () 3253rxvt_term::process_osc_seq ()
3708{ 3254{
3709 unicode_t ch, eh;
3710 int arg; 3255 int arg;
3711 3256
3712 ch = cmd_getc (); 3257 unicode_t ch = cmd_getc ();
3713 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3714 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3715 3260
3716 if (ch == ';') 3261 if (ch == ';')
3717 { 3262 {
3263 unicode_t eh;
3718 char *s = get_to_st (eh); 3264 char *s = get_to_st (eh);
3719 3265
3720 if (s) 3266 if (s)
3721 { 3267 {
3722 process_xterm_seq (arg, s, eh); 3268 process_xterm_seq (arg, s, eh);
… …
3746 3292
3747/* 3293/*
3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3749 */ 3295 */
3750void 3296void
3751rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3297rxvt_term::process_xterm_seq (int op, char *str, char resp)
3752{ 3298{
3753 int color; 3299 int color;
3754 char *buf, *name; 3300 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3302 int saveop = op;
3757 3303
3758 dLocal (Display *, dpy); 3304 dLocal (Display *, dpy);
3759 3305
3760 assert (str != NULL); 3306 assert (str != NULL);
3761 3307
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3308 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 ; // no responses yet 3309 return;
3764 3310
3765 switch (op) 3311 switch (op)
3766 { 3312 {
3767 case XTerm_name: 3313 case XTerm_name:
3768 set_title (str); 3314 set_title (str);
… …
3797 3343
3798 XFree (value); 3344 XFree (value);
3799 } 3345 }
3800 else 3346 else
3801 { 3347 {
3802 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3348 char *eq = strchr (str, '=');
3803 3349
3804 if (eq) 3350 if (eq)
3805 { 3351 {
3806 *eq = 0; 3352 *eq = 0;
3807 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
… …
3828 *buf++ = '\0'; 3374 *buf++ = '\0';
3829 3375
3830 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3831 } 3377 }
3832 break; 3378 break;
3379 case Rxvt_restoreFG:
3833 case XTerm_Color00: 3380 case XTerm_Color00:
3834 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3835 break; 3382 break;
3383 case Rxvt_restoreBG:
3836 case XTerm_Color01: 3384 case XTerm_Color01:
3837 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3838 break; 3386 break;
3839#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3840 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3845 process_color_seq (op, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3846 break; 3394 break;
3847 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3848 process_color_seq (op, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3849 break; 3397 break;
3398#ifdef OPTION_HC
3399 case XTerm_Color_HC:
3400 process_color_seq (op, Color_HC, str, resp);
3401 break;
3402 case XTerm_Color_HTC:
3403 process_color_seq (op, Color_HTC, str, resp);
3404 break;
3405#endif
3850#ifndef NO_BOLD_UNDERLINE_REVERSE 3406#ifndef NO_BOLD_UNDERLINE_REVERSE
3851 case XTerm_Color_RV:
3852 process_color_seq (op, Color_RV, str, resp);
3853 break;
3854 case Rxvt_Color_BD:
3855 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3856 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3857 break; 3409 break;
3858 case Rxvt_Color_UL:
3859 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3860 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3861 break; 3412 break;
3862 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3864 break; 3415 break;
3865#endif 3416#endif
3866#if TRANSPARENT && TINTING 3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3420#if ENABLE_TRANSPARENCY
3867 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3423 {
3424 bool changed = false;
3869 3425
3870 check_our_parents (); 3426 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3871 3430
3872 if (am_transparent) 3431 if (changed)
3873 want_full_refresh = want_refresh = 1; 3432 update_background ();
3433 }
3874 3434
3875 break; 3435 break;
3876#endif 3436#endif
3877 3437
3438#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3879 { 3440 if (!strcmp (str, "?"))
3880 if (*str != ';')
3881 { 3441 {
3882#if XPM_BACKGROUND 3442 char str[256];
3883 scale_pixmap (""); /* reset to default scaling */ 3443
3884 set_bgPixmap (str); /* change pixmap */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3885 scr_touch (true); 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3886#endif 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3887 } 3448 }
3888 3449 else
3450 {
3889 int changed = 0; 3451 int changed = 0;
3890 3452
3891 while ((str = strchr (str, ';')) != NULL) 3453 if (*str != ';')
3892 { 3454 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */
3458 changed++;
3459 str = strchr (str, ';');
3460 if (str == NULL)
3461 bgPixmap.set_defaultGeometry ();
3462 }
3463
3464 while (str)
3465 {
3893 str++; 3466 str++;
3894#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3895 changed += scale_pixmap (str); 3468 changed++;
3896#endif 3469 str = strchr (str, ';');
3897 } 3470 }
3898 3471
3899 if (changed) 3472 if (changed)
3900 { 3473 update_background ();
3901#ifdef XPM_BACKGROUND
3902 resize_pixmap ();
3903 scr_touch (true);
3904#endif
3905 } 3474 }
3906 }
3907 break; 3475 break;
3908 3476#endif
3909 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str);
3911 break;
3912 case Rxvt_restoreBG:
3913 set_window_color (Color_bg, str);
3914 break;
3915 3477
3916 case XTerm_logfile: 3478 case XTerm_logfile:
3917 // TODO, when secure mode? 3479 // TODO, when secure mode?
3918 break; 3480 break;
3919 3481
… …
3937 case URxvt_italicFont: 3499 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3500 case URxvt_boldItalicFont:
3939#endif 3501#endif
3940 if (query) 3502 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3505 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3506 resp);
3945 else 3507 else
3946 { 3508 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3523 break;
3962 3524
3963#if !ENABLE_MINIMAL 3525#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3526 case URxvt_locale:
3965 if (query) 3527 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3529 else
3968 { 3530 {
3969 set_locale (str); 3531 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3532 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3533 init_xlocale ();
… …
3986 break; 3548 break;
3987#endif 3549#endif
3988 3550
3989#if ENABLE_PERL 3551#if ENABLE_PERL
3990 case URxvt_perl: 3552 case URxvt_perl:
3991 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3553 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3992 ; // no responses yet
3993 break; 3554 break;
3994#endif 3555#endif
3995 } 3556 }
3996} 3557}
3997/*----------------------------------------------------------------------*/ 3558/*----------------------------------------------------------------------*/
… …
4020 { 3581 {
4021 if (mode == 'r') 3582 if (mode == 'r')
4022 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4023 else 3584 else
4024 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4025 PrivMode (state, bit); 3586
3587 set_privmode (bit, state);
4026 } 3588 }
4027 3589
4028 return state; 3590 return state;
4029} 3591}
4030 3592
… …
4034{ 3596{
4035 unsigned int i, j; 3597 unsigned int i, j;
4036 int state; 3598 int state;
4037 3599
4038 static const struct 3600 static const struct
4039 { 3601 {
4040 const int argval; 3602 const int argval;
4041 const unsigned long bit; 3603 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3604 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
4046 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
4047 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
4048 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
4049 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
4050 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
4051 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
4052 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
4053 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
4054 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
4055 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4056#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
4057 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
4058#endif 3619#endif
4059 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
4060 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
4061 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
4062 // 45 margin bell NYI 3624 // 45 margin bell NYI
4063 // 46 start logging 3625 // 46 start logging
4064 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
4065 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4066#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
4068#endif 3630#endif
4069 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3632 { 1002, PrivMode_MouseBtnEvent },
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3633 { 1003, PrivMode_MouseAnyEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3635 { 1011, PrivMode_Keypress }, // rxvt extension
4075 // 1035 enable modifiers for alt, numlock NYI 3636 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3637 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3638 // 1037 send DEL for keypad delete NYI
4078 { 1047, PrivMode_Screen }, 3639 { 1047, PrivMode_Screen },
4079 // 1048 save and restore cursor 3640 // 1048 save and restore cursor
4080 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4081 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste },
4082 }; 3644 };
4083 3645
4084 if (nargs == 0) 3646 if (nargs == 0)
4085 return; 3647 return;
4086 3648
… …
4111 3673
4112 scr_touch (true); 3674 scr_touch (true);
4113 break; 3675 break;
4114#endif 3676#endif
4115 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
4116 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3679 if (mode == 0)
4119 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
4120 else if (mode == 1) 3681 else if (mode == 1)
4121 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
4122 break; 3683 break;
… …
4130 case 2: /* VT52 mode */ 3691 case 2: /* VT52 mode */
4131 /* oddball mode. should be set regardless of set/reset 3692 /* oddball mode. should be set regardless of set/reset
4132 * parameter. Return from VT52 mode with an ESC < from 3693 * parameter. Return from VT52 mode with an ESC < from
4133 * within VT52 mode 3694 * within VT52 mode
4134 */ 3695 */
4135 PrivMode (1, PrivMode_vt52); 3696 set_privmode (PrivMode_vt52, 1);
4136 break; 3697 break;
4137 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
4138 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
4139 set_widthheight (((state ? 132 : 80) * fwidth), height); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4140 break; 3701 break;
4141 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
4142 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
4143 break; 3704 break;
4144 case 5: /* reverse video */ 3705 case 5: /* reverse video */
… …
4151 scr_autowrap (state); 3712 scr_autowrap (state);
4152 break; 3713 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3718 break;
4158#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
4159 case scrollBar_esc: 3720 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3721 if (scrollBar.map (state))
4161 { 3722 {
4162 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
4163 scr_touch (true); 3724 scr_touch (true);
4164 } 3725 }
4165 break; 3726 break;
… …
4174 break; 3735 break;
4175 /* case 66: - application key pad */ 3736 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3737 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3738 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3741 break;
4181#if 0
4182 case 1001: 3742 case 1002:
4183 break; /* X11 mouse highlighting */ 3743 case 1003:
4184#endif 3744 if (state)
3745 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3748 vt_emask_mouse = PointerMotionMask;
3749 }
3750 else
3751 vt_emask_mouse = NoEventMask;
3752
3753 vt_select_input ();
3754 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3757 break;
4188 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3760 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3763 if (!state)
4194 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
4195 scr_change_screen (state); 3766 scr_change_screen (state);
4196 break; 3767 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
4198 scr_change_screen (state); 3773 scr_change_screen (state);
3774
4199 if (OPTION (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3776 if (state)
4201 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
4202 break; 3780 break;
4203 default: 3781 default:
4204 break; 3782 break;
4205 } 3783 }
4206 } 3784 }
… …
4366rxvt_term::process_graphics () 3944rxvt_term::process_graphics ()
4367{ 3945{
4368 unicode_t ch, cmd = cmd_getc (); 3946 unicode_t ch, cmd = cmd_getc ();
4369 3947
4370 if (cmd == 'Q') 3948 if (cmd == 'Q')
3949 {
4371 { /* query graphics */ 3950 /* query graphics */
4372 tt_printf ("\033G0\012"); /* no graphics */ 3951 tt_printf ("\033G0\012"); /* no graphics */
4373 return; 3952 return;
4374 } 3953 }
4375 /* swallow other graphics sequences until terminating ':' */ 3954 /* swallow other graphics sequences until terminating ':' */
4376 do 3955 do
… …
4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4427 4006
4428 memcpy (v_buffer + v_buflen, data, len); 4007 memcpy (v_buffer + v_buflen, data, len);
4429 v_buflen += len; 4008 v_buflen += len;
4430 4009
4431 pty_ev.set (EVENT_READ | EVENT_WRITE); 4010 pty_ev.set (ev::READ | ev::WRITE);
4432} 4011}
4433 4012
4434void rxvt_term::pty_write () 4013void rxvt_term::pty_write ()
4435{ 4014{
4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4015 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4441 4020
4442 if (v_buflen == 0) 4021 if (v_buflen == 0)
4443 { 4022 {
4444 free (v_buffer); 4023 free (v_buffer);
4445 v_buffer = 0; 4024 v_buffer = 0;
4446 v_buflen = 0;
4447 4025
4448 pty_ev.set (EVENT_READ); 4026 pty_ev.set (ev::READ);
4449 return; 4027 return;
4450 } 4028 }
4451 4029
4452 memmove (v_buffer, v_buffer + written, v_buflen); 4030 memmove (v_buffer, v_buffer + written, v_buflen);
4453 } 4031 }
4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4455 pty_ev.set (EVENT_READ); 4033 pty_ev.set (ev::READ);
4456} 4034}
4457 4035
4458/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
4459 4037

Diff Legend

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