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.322 by ayin, Wed May 2 23:06:32 2007 UTC vs.
Revision 1.474 by sf-exg, Fri Jan 28 00:08:58 2011 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
… …
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
… …
942 commit_iso14755 (); 889 commit_iso14755 ();
943 890
944 return; 891 return;
945 } 892 }
946 893
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 895 if (i[0] == keysym)
949 { 896 {
950 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 898 commit_iso14755 ();
952 899
… …
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 (bg_flags & BG_NEEDS_REFRESH)
1034 { 981 {
1035 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
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
… …
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{
… …
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
… …
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) + 1;
1302 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1304 1268
1305 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1306 button_number = 3; 1270 button_number = 3;
1307 else 1271 else
1308 { 1272 {
1309 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1275 if (button_number >= 3)
1312 button_number += (64 - 3); 1276 button_number += 64 - 3;
1313 } 1277 }
1314 1278
1315 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1316 { 1280 {
1317 /* 1281 /*
… …
1349 fputc ('A', stderr); 1313 fputc ('A', stderr);
1350 if (key_state & 32) 1314 if (key_state & 32)
1351 fputc ('2', stderr); 1315 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1317 button_number,
1354 x + 1, 1318 x,
1355 y + 1); 1319 y);
1356#endif 1320#endif
1357 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1358 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1336 code + button_number + key_state,
1360 (32 + x + 1), 1337 32 + x,
1361 (32 + y + 1)); 1338 32 + y);
1362} 1339}
1363 1340
1364/*{{{ process an X event */ 1341/*{{{ process an X event */
1365void 1342void
1366rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1404 focus_out ();
1428 } 1405 }
1429#endif 1406#endif
1430 } 1407 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1408 break;
1436 1409
1437 /* 1410 /*
1438 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1477 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1478 { 1451 {
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1453 ;
1481 1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1473
1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1483 { 1475 {
1484 seen_resize = 1; 1476 seen_resize = 1;
1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1486 } 1478 }
1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1483 {
1484 if (mapped)
1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif
1490 }
1487 1491
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1491 if (option (Opt_transparent))
1492 check_our_parents ();
1493#endif
1494 } 1493 }
1495 break; 1494 break;
1496 1495
1497 case PropertyNotify: 1496 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1501 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502 1501
1503 break; 1502 break;
1504 1503
1505 case SelectionClear: 1504 case SelectionClear:
1506 selection_clear (); 1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break; 1506 break;
1508 1507
1509 case SelectionNotify: 1508 case SelectionNotify:
1510 if (selection_wait == Sel_normal) 1509 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1514 case SelectionRequest: 1513 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1516 break; 1515 break;
1517 1516
1518 case MapNotify: 1517 case MapNotify:
1518#ifdef HAVE_BG_PIXMAP
1519 /* This is needed specifically to fix the case of no window manager or a
1520 * non-reparenting window manager. In those cases we never get first
1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1522 * care of multiplicity of ConfigureNotify events arriving while WM does
1523 * reparenting.
1524 * We should not render background immediately, as there could be several
1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1526 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results.
1530 */
1531 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025);
1533#endif
1519 mapped = 1; 1534 mapped = 1;
1520#ifdef TEXT_BLINK 1535#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1536 text_blink_ev.start ();
1522#endif 1537#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1539 break;
1525 1540
1526 case UnmapNotify: 1541 case UnmapNotify:
… …
1528#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1529 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1530#endif 1545#endif
1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1547 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1548
1540 case GraphicsExpose: 1549 case GraphicsExpose:
1541 case Expose: 1550 case Expose:
1542 if (ev.xany.window == vt) 1551 if (ev.xany.window == vt)
1543 { 1552 {
1544 do 1553 do
1554 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1557 }
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1559
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1561
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, False);
1566 }
1554 1567
1555 want_refresh = 1; 1568 want_refresh = 1;
1556 } 1569 }
1557 else 1570 else
1558 { 1571 {
… …
1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1575 ;
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1577 ;
1565 1578
1566 if (isScrollbarWindow (ev.xany.window)) 1579 if (scrollBar.state && ev.xany.window == scrollBar.win)
1567 { 1580 {
1568 scrollBar.setIdle (); 1581 scrollBar.state = STATE_IDLE;
1569 scrollbar_show (0); 1582 scrollBar.show (0);
1570 } 1583 }
1571
1572#ifdef TRANSPARENT
1573 if (am_transparent && ev.xany.window == parent[0])
1574 XClearWindow (dpy, ev.xany.window);
1575#endif
1576 } 1584 }
1577 break; 1585 break;
1578 1586
1579 case MotionNotify: 1587 case MotionNotify:
1580#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1581 if (hidden_pointer) 1589 if (hidden_pointer)
1582 pointer_unblank (); 1590 pointer_unblank ();
1583#endif 1591#endif
1592 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1593 || priv_modes & PrivMode_MouseAnyEvent)
1594 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1596 break;
1586 1597
1587 if (ev.xany.window == vt) 1598 if (ev.xany.window == vt)
1588 { 1599 {
… …
1622 int dist; 1633 int dist;
1623 1634
1624 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1626 */ 1637 */
1627 if (!sel_scroll_ev.active) 1638 if (!sel_scroll_ev.is_active ())
1628 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1629 1640
1630 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1631 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1632 */ 1643 */
1633 selection_save_x = ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
… …
1655 else 1666 else
1656 { 1667 {
1657 /* we are within the text window, so we 1668 /* we are within the text window, so we
1658 * shouldn't be scrolling 1669 * shouldn't be scrolling
1659 */ 1670 */
1660 if (sel_scroll_ev.active)
1661 sel_scroll_ev.stop(); 1671 sel_scroll_ev.stop();
1662 } 1672 }
1663#endif 1673#endif
1664#ifdef MOUSE_THRESHOLD 1674#ifdef MOUSE_THRESHOLD
1665 } 1675 }
1666#endif 1676#endif
1667 } 1677 }
1668 } 1678 }
1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1670 { 1680 {
1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1672 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1673 ; 1683 ;
1674 1684
… …
1676 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1677 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1678 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1679 &unused_mask); 1689 &unused_mask);
1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1681 scrollbar_size ()); 1691 scrollBar.size ());
1682 want_refresh = 1; 1692 want_refresh = 1;
1683 refresh_limit = 0;
1684 scrollbar_show (1); 1693 scrollBar.show (1);
1685 } 1694 }
1686 break; 1695 break;
1687 } 1696 }
1688 1697
1689#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
… …
1693 { 1702 {
1694 hidden_cursor = 0; 1703 hidden_cursor = 0;
1695 want_refresh = 1; 1704 want_refresh = 1;
1696 } 1705 }
1697 1706
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1699 } 1708 }
1700#endif 1709#endif
1701 1710
1702#if defined(POINTER_BLANK) 1711#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1719
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1720 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1721 pointer_blank ();
1713 } 1722 }
1714#endif 1723#endif
1724
1725 refresh_check ();
1715} 1726}
1727
1728#if ENABLE_FRILLS
1729void
1730rxvt_term::set_urgency (bool enable)
1731{
1732 if (enable == urgency_hint)
1733 return;
1734
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1736 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h);
1739 urgency_hint = enable;
1740 }
1741}
1742#endif
1716 1743
1717void 1744void
1718rxvt_term::focus_in () 1745rxvt_term::focus_in ()
1719{ 1746{
1720 if (!focus) 1747 if (!focus)
1721 { 1748 {
1722 focus = 1; 1749 focus = 1;
1723 want_refresh = 1; 1750 want_refresh = 1;
1724 1751
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1752#if USE_XIM
1728 if (Input_Context != NULL) 1753 if (Input_Context != NULL)
1729 { 1754 {
1730 IMSetPosition (); 1755 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1756 XSetICFocus (Input_Context);
1732 } 1757 }
1733#endif 1758#endif
1734#if CURSOR_BLINK 1759#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1760 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1761 cursor_blink_ev.again ();
1737#endif 1762#endif
1738#if OFF_FOCUS_FADING 1763#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1764 if (rs[Rs_fade])
1740 { 1765 {
1741 pix_colors = pix_colors_focused; 1766 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1767 scr_recolour ();
1743 } 1768 }
1744#endif 1769#endif
1745#if ENABLE_FRILLS 1770#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1771 if (option (Opt_urgentOnBell))
1747 { 1772 set_urgency (0);
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif 1773#endif
1774
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1776 }
1759} 1777}
1760 1778
1761void 1779void
1762rxvt_term::focus_out () 1780rxvt_term::focus_out ()
… …
1764 if (focus) 1782 if (focus)
1765 { 1783 {
1766 focus = 0; 1784 focus = 0;
1767 want_refresh = 1; 1785 want_refresh = 1;
1768 1786
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1787#if ENABLE_FRILLS
1770 1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1771#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1792 if (iso14755buf)
1773 { 1793 {
1774 iso14755buf = 0; 1794 iso14755buf = 0;
1775# if ENABLE_OVERLAY 1795# if ISO_14755
1776 scr_overlay_off (); 1796 scr_overlay_off ();
1777# endif 1797# endif
1778 } 1798 }
1779#endif 1799#endif
1780#if USE_XIM 1800#if USE_XIM
… …
1782 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1783#endif 1803#endif
1784#if CURSOR_BLINK 1804#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1805 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1806 cursor_blink_ev.stop ();
1807
1787 hidden_cursor = 0; 1808 hidden_cursor = 0;
1788#endif 1809#endif
1789#if OFF_FOCUS_FADING 1810#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1811 if (rs[Rs_fade])
1791 { 1812 {
1792 pix_colors = pix_colors_unfocused; 1813 pix_colors = pix_colors_unfocused;
1793 scr_recolour (); 1814 scr_recolour ();
1794 } 1815 }
1795#endif 1816#endif
1817
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796 } 1819 }
1797} 1820}
1798 1821
1799void 1822void
1800rxvt_term::update_fade_color (unsigned int idx) 1823rxvt_term::update_fade_color (unsigned int idx)
… …
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1830 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 } 1831 }
1809#endif 1832#endif
1810} 1833}
1811 1834
1812#if TRANSPARENT || ENABLE_PERL 1835#if ENABLE_TRANSPARENCY || ENABLE_PERL
1813void 1836void
1814rxvt_term::rootwin_cb (XEvent &ev) 1837rxvt_term::rootwin_cb (XEvent &ev)
1815{ 1838{
1816 make_current (); 1839 make_current ();
1817 1840
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return; 1843 return;
1821 1844
1822# if TRANSPARENT 1845# if ENABLE_TRANSPARENCY
1823 switch (ev.type) 1846 switch (ev.type)
1824 { 1847 {
1825 case PropertyNotify: 1848 case PropertyNotify:
1826 /* 1849 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1850 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1829 */ 1852 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1855 {
1856 bg_set_root_pixmap ();
1857 update_background ();
1858 }
1833 1859
1834 /* FALLTHROUGH */
1835 case ReparentNotify:
1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1860 break;
1839 } 1861 }
1840# endif 1862# endif
1863
1864 refresh_check ();
1841} 1865}
1842#endif 1866#endif
1843 1867
1844void 1868void
1845rxvt_term::button_press (XButtonEvent &ev) 1869rxvt_term::button_press (XButtonEvent &ev)
… …
1876 /* save the xbutton state (for ButtonRelease) */ 1900 /* save the xbutton state (for ButtonRelease) */
1877 MEvent.state = ev.state; 1901 MEvent.state = ev.state;
1878#ifdef MOUSE_REPORT_DOUBLECLICK 1902#ifdef MOUSE_REPORT_DOUBLECLICK
1879 if (ev.button == MEvent.button && clickintime) 1903 if (ev.button == MEvent.button && clickintime)
1880 { 1904 {
1881 /* same button, within alloted time */ 1905 /* same button, within allowed time */
1882 MEvent.clicks++; 1906 MEvent.clicks++;
1883 1907
1884 if (MEvent.clicks > 1) 1908 if (MEvent.clicks > 1)
1885 { 1909 {
1886 /* only report double clicks */ 1910 /* only report double clicks */
… …
1900 mouse_report (ev); 1924 mouse_report (ev);
1901 } 1925 }
1902#else 1926#else
1903 MEvent.button = ev.button; 1927 MEvent.button = ev.button;
1904 mouse_report (ev); 1928 mouse_report (ev);
1905#endif /* MOUSE_REPORT_DOUBLECLICK */ 1929#endif /* MOUSE_REPORT_DOUBLECLICK */
1906 1930
1907 } 1931 }
1908 else 1932 else
1909 { 1933 {
1910 if (ev.button != MEvent.button) 1934 if (ev.button != MEvent.button)
… …
1958 } 1982 }
1959 1983
1960 /* 1984 /*
1961 * Scrollbar window processing of button press 1985 * Scrollbar window processing of button press
1962 */ 1986 */
1963 if (isScrollbarWindow (ev.window)) 1987 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 1988 {
1965 scrollBar.setIdle (); 1989 page_dirn direction = NO_DIR;
1990
1991 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */
1995
1996 scrollBar.state = STATE_IDLE;
1966 /* 1997 /*
1967 * Rxvt-style scrollbar: 1998 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 1999 * move up if mouse is above slider
1969 * move dn if mouse is below slider 2000 * move dn if mouse is below slider
1970 * 2001 *
… …
1979 /* 2010 /*
1980 * Mouse report disabled scrollbar: 2011 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 2012 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 2013 * click on scrollbar - send pageup/down
1983 */ 2014 */
1984 if ((scrollBar.style == R_SB_NEXT 2015 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 2016 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 2017 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 2018 tt_printf ("\033[B");
1994 else 2019 else
1995 switch (ev.button) 2020 switch (ev.button)
1996 { 2021 {
1997 case Button2: 2022 case Button2:
… …
2004 tt_printf ("\033[5~"); 2029 tt_printf ("\033[5~");
2005 break; 2030 break;
2006 } 2031 }
2007 } 2032 }
2008 else 2033 else
2009#endif /* NO_SCROLLBAR_REPORT */ 2034#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 2035 {
2016 if (scrollbarnext_upButton (ev.y)) 2036 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 2037 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2039 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2041#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 2042 if (scr_page (direction, 1))
2034 { 2043 {
2035 if (upordown < 0) 2044 if (direction == UP)
2036 scrollBar.setUp (); 2045 scrollBar.state = STATE_UP;
2037 else 2046 else
2038 scrollBar.setDn (); 2047 scrollBar.state = STATE_DOWN;
2039 } 2048 }
2040 } 2049 }
2041 else 2050 else
2042 switch (ev.button) 2051 switch (ev.button)
2043 { 2052 {
2044 case Button2: 2053 case Button2:
2045 switch (scrollbar_align) 2054 switch (scrollBar.align)
2046 { 2055 {
2047 case R_SB_ALIGN_TOP: 2056 case R_SB_ALIGN_TOP:
2048 csrO = 0; 2057 csrO = 0;
2049 break; 2058 break;
2050 case R_SB_ALIGN_CENTRE: 2059 case R_SB_ALIGN_CENTRE:
… …
2056 } 2065 }
2057 2066
2058 if (scrollBar.style == R_SB_XTERM 2067 if (scrollBar.style == R_SB_XTERM
2059 || scrollbar_above_slider (ev.y) 2068 || scrollbar_above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2069 || scrollbar_below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2062 2071
2063 scrollBar.setMotion (); 2072 scrollBar.state = STATE_MOTION;
2064 break; 2073 break;
2065 2074
2066 case Button1: 2075 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2076 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2077 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2078 /* FALLTHROUGH */
2070 2079
2071 case Button3: 2080 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2081 if (scrollBar.style != R_SB_XTERM)
… …
2082 scr_page (DN, nrow - 1); 2091 scr_page (DN, nrow - 1);
2083# else 2092# else
2084 scr_page (DN, nrow / 4); 2093 scr_page (DN, nrow / 4);
2085# endif 2094# endif
2086 else 2095 else
2087 scrollBar.setMotion (); 2096 scrollBar.state = STATE_MOTION;
2088 } 2097 }
2089 else 2098 else
2090 { 2099 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2100 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2101 (nrow
2093 * scrollbar_position (ev.y) 2102 * scrollbar_position (ev.y)
2094 / scrollbar_size ())); 2103 / scrollBar.size ()));
2095 } 2104 }
2096 2105
2097 break; 2106 break;
2098 } 2107 }
2099 } 2108 }
… …
2109 2118
2110 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2120 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2122
2114 if (scrollbar_isUpDn ()) 2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2115 { 2124 {
2116 scrollBar.setIdle (); 2125 scrollBar.state = STATE_IDLE;
2117 scrollbar_show (0); 2126 scrollBar.show (0);
2118 } 2127 }
2119 2128
2120#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2121 if (sel_scroll_ev.active)
2122 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2123#endif 2131#endif
2124 2132
2125 if (ev.window == vt) 2133 if (ev.window == vt)
2126 { 2134 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151 mouse_report (ev); 2159 mouse_report (ev);
2152 } 2160 }
2153#else /* MOUSE_REPORT_DOUBLECLICK */ 2161#else /* MOUSE_REPORT_DOUBLECLICK */
2154 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
2155 mouse_report (ev); 2163 mouse_report (ev);
2156#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
2157 return; 2165 return;
2158 } 2166 }
2159 2167
2160 /* 2168 /*
2161 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
… …
2173 selection_make (ev.time); 2181 selection_make (ev.time);
2174 break; 2182 break;
2175 2183
2176 case Button2: 2184 case Button2:
2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2179 break; 2187 break;
2180 2188
2181#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2182 case Button4: 2190 case Button4:
2183 case Button5: 2191 case Button5:
… …
2199 { 2207 {
2200 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2203 2211
2204 if (slip_wheel_ev.at < NOW) 2212 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206
2207 slip_wheel_ev.start ();
2208 } 2214 }
2209 else 2215 else
2216# endif
2210 { 2217 {
2211# endif
2212 scr_page (v, i); 2218 scr_page (v, i);
2213 scrollbar_show (1); 2219 scrollBar.show (1);
2214# ifdef MOUSE_SLIP_WHEELING
2215 } 2220 }
2216# endif
2217 } 2221 }
2218 break; 2222 break;
2219#endif 2223#endif
2220 } 2224 }
2221 } 2225 }
2222} 2226}
2223 2227
2224#ifdef TRANSPARENT
2225#if TINTING
2226/* taken from aterm-0.4.2 */
2227
2228typedef uint32_t RUINT32T;
2229
2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2231{
2232 int sh_r, sh_g, sh_b;
2233 RUINT32T mask_r, mask_g, mask_b;
2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2237 int i;
2238
2239 Visual *visual = term->visual;
2240
2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2242
2243 /* for convenience */
2244 mask_r = visual->red_mask;
2245 mask_g = visual->green_mask;
2246 mask_b = visual->blue_mask;
2247
2248 /* boring lookup table pre-initialization */
2249 switch (srcImage->bits_per_pixel) {
2250 case 15:
2251 if ((mask_r != 0x7c00) ||
2252 (mask_g != 0x03e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+32;
2259 sh_r = 10;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 16:
2264 if ((mask_r != 0xf800) ||
2265 (mask_g != 0x07e0) ||
2266 (mask_b != 0x001f))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2269 lookup_r = lookup;
2270 lookup_g = lookup+32;
2271 lookup_b = lookup+32+64;
2272 sh_r = 11;
2273 sh_g = 5;
2274 sh_b = 0;
2275 break;
2276 case 24:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 case 32:
2290 if ((mask_r != 0xff0000) ||
2291 (mask_g != 0x00ff00) ||
2292 (mask_b != 0x0000ff))
2293 return;
2294 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2295 lookup_r = lookup;
2296 lookup_g = lookup+256;
2297 lookup_b = lookup+256+256;
2298 sh_r = 16;
2299 sh_g = 8;
2300 sh_b = 0;
2301 break;
2302 default:
2303 return; /* we do not support this color depth */
2304 }
2305
2306 /* prepare limits for color transformation (each channel is handled separately) */
2307 if (shade < 0) {
2308 shade = -shade;
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = 65535-rm;
2313 lower_lim_g = 65535-gm;
2314 lower_lim_b = 65535-bm;
2315
2316 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2317 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2318 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2319
2320 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2321 } else {
2322 if (shade < 0) shade = 0;
2323 if (shade > 100) shade = 100;
2324
2325 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2326
2327 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2328 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2329 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2330 }
2331
2332 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2333 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2334 {
2335 unsigned int tmp;
2336
2337 tmp = lower_lim_r;
2338 lower_lim_r = lower_lim_b;
2339 lower_lim_b = tmp;
2340
2341 tmp = upper_lim_r;
2342 upper_lim_r = upper_lim_b;
2343 upper_lim_b = tmp;
2344 }
2345
2346 /* fill our lookup tables */
2347 for (i = 0; i <= mask_r>>sh_r; i++)
2348 {
2349 RUINT32T tmp;
2350 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2351 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2352 lookup_r[i] = (tmp/65535)<<sh_r;
2353 }
2354 for (i = 0; i <= mask_g>>sh_g; i++)
2355 {
2356 RUINT32T tmp;
2357 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2358 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2359 lookup_g[i] = (tmp/65535)<<sh_g;
2360 }
2361 for (i = 0; i <= mask_b>>sh_b; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2365 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2366 lookup_b[i] = (tmp/65535)<<sh_b;
2367 }
2368
2369 /* apply table to input image (replacing colors by newly calculated ones) */
2370 switch (srcImage->bits_per_pixel)
2371 {
2372 case 15:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0x7c00)>>10] |
2384 lookup_g[(*p & 0x03e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 16:
2392 {
2393 unsigned short *p1, *pf, *p, *pl;
2394 p1 = (unsigned short *) srcImage->data;
2395 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xf800)>>11] |
2403 lookup_g[(*p & 0x07e0)>> 5] |
2404 lookup_b[(*p & 0x001f)];
2405 }
2406 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 24:
2411 {
2412 unsigned char *p1, *pf, *p, *pl;
2413 p1 = (unsigned char *) srcImage->data;
2414 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width * 3;
2419 for (; p < pl; p += 3)
2420 {
2421 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2422 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2423 p[2] = lookup_r[(p[2] & 0x0000ff)];
2424 }
2425 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2426 }
2427 break;
2428 }
2429 case 32:
2430 {
2431 RUINT32T *p1, *pf, *p, *pl;
2432 p1 = (RUINT32T *) srcImage->data;
2433 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2434
2435 while (p1 < pf)
2436 {
2437 p = p1;
2438 pl = p1 + srcImage->width;
2439 for (; p < pl; p++)
2440 {
2441 *p = lookup_r[(*p & 0xff0000)>>16] |
2442 lookup_g[(*p & 0x00ff00)>> 8] |
2443 lookup_b[(*p & 0x0000ff)] |
2444 (*p & ~0xffffff);
2445 }
2446 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2447 }
2448 break;
2449 }
2450 }
2451
2452 free (lookup);
2453}
2454#endif
2455
2456/*
2457 * Check our parents are still who we think they are.
2458 * Do transparency updates if required
2459 */
2460int
2461rxvt_term::check_our_parents ()
2462{
2463 int i, pchanged, aformat, have_pixmap, rootdepth;
2464 unsigned long nitems, bytes_after;
2465 Atom atype;
2466 unsigned char *prop = NULL;
2467 Window root, oldp, *list;
2468 Pixmap rootpixmap = None;
2469 XWindowAttributes wattr, wrootattr;
2470
2471 pchanged = 0;
2472
2473 if (!option (Opt_transparent))
2474 return pchanged; /* Don't try any more */
2475
2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2477 rootdepth = wrootattr.depth;
2478
2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2480
2481 if (rootdepth != wattr.depth)
2482 {
2483 if (am_transparent)
2484 {
2485 pchanged = 1;
2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2487 am_transparent = am_pixmap_trans = 0;
2488 }
2489
2490 return pchanged; /* Don't try any more */
2491 }
2492
2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2494 XSync (dpy, False);
2495
2496 /*
2497 * Make the frame window set by the window manager have
2498 * the root background. Some window managers put multiple nested frame
2499 * windows for each client, so we have to take care about that.
2500 */
2501 i = (xa[XA_XROOTPMAP_ID]
2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2504 &nitems, &bytes_after, &prop) == Success);
2505
2506 if (!i || prop == NULL)
2507 i = (xa[XA_ESETROOT_PMAP_ID]
2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2510 &nitems, &bytes_after, &prop) == Success);
2511
2512 if (!i || prop == NULL
2513#if TINTING
2514 || !ISSET_PIXCOLOR (Color_tint)
2515#endif
2516 )
2517 have_pixmap = 0;
2518 else
2519 {
2520 have_pixmap = 1;
2521 rootpixmap = *(Pixmap *)prop;
2522 XFree (prop);
2523 }
2524
2525 if (have_pixmap)
2526 {
2527 /*
2528 * Copy display->root pixmap transparency
2529 */
2530 int sx, sy, nx, ny;
2531 unsigned int nw, nh;
2532 Window cr;
2533 XImage *image;
2534 GC gc;
2535 XGCValues gcvalue;
2536
2537 XTranslateCoordinates (dpy, parent[0], display->root,
2538 0, 0, &sx, &sy, &cr);
2539 nw = (unsigned int)szHint.width;
2540 nh = (unsigned int)szHint.height;
2541 nx = ny = 0;
2542
2543 if (sx < 0)
2544 {
2545 nw += sx;
2546 nx = -sx;
2547 sx = 0;
2548 }
2549
2550 if (sy < 0)
2551 {
2552 nh += sy;
2553 ny = -sy;
2554 sy = 0;
2555 }
2556
2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2559
2560 XSync (dpy, False);
2561 allowedxerror = -1;
2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2563
2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2565 /* XXX: may need a delay here? */
2566 allowedxerror = 0;
2567
2568 if (image == NULL)
2569 {
2570 if (am_transparent && am_pixmap_trans)
2571 {
2572 pchanged = 1;
2573 if (pixmap != None)
2574 {
2575 XFreePixmap (dpy, pixmap);
2576 pixmap = None;
2577 }
2578 }
2579
2580 am_pixmap_trans = 0;
2581 }
2582 else
2583 {
2584 if (pixmap != None)
2585 XFreePixmap (dpy, pixmap);
2586
2587#if TINTING
2588 if (ISSET_PIXCOLOR (Color_tint))
2589 {
2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2591
2592 rgba c;
2593 pix_colors_focused [Color_tint].get (c);
2594
2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2596 }
2597#endif
2598
2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2602 nx, ny, image->width, image->height);
2603 XFreeGC (dpy, gc);
2604 XDestroyImage (image);
2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2606 XClearWindow (dpy, parent[0]);
2607
2608 if (!am_transparent || !am_pixmap_trans)
2609 pchanged = 1;
2610
2611 am_transparent = am_pixmap_trans = 1;
2612 }
2613 }
2614
2615 if (am_pixmap_trans)
2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2617 else
2618 {
2619 unsigned int n;
2620 /*
2621 * InheritPixmap transparency
2622 */
2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2624 {
2625 oldp = parent[i];
2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2627 XFree (list);
2628
2629 if (parent[i] == display->root)
2630 {
2631 if (oldp != None)
2632 pchanged = 1;
2633
2634 break;
2635 }
2636
2637 if (oldp != parent[i])
2638 pchanged = 1;
2639 }
2640
2641 n = 0;
2642
2643 if (pchanged)
2644 for (; n < (unsigned int)i; n++)
2645 {
2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2649 {
2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2651 break;
2652 }
2653 }
2654
2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2656 {
2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2659 am_transparent = 0;
2660 /* XXX: also turn off Opt_transparent? */
2661 }
2662 else
2663 {
2664 for (n = 0; n < (unsigned int)i; n++)
2665 {
2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2667 XClearWindow (dpy, parent[n]);
2668 }
2669
2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2671 am_transparent = 1;
2672 }
2673
2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2675 parent[i] = None;
2676 }
2677
2678 if (scrollBar.win)
2679 {
2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2681 scrollBar.setIdle ();
2682 scrollbar_show (0);
2683 }
2684
2685 if (am_transparent)
2686 {
2687 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans)
2689 flush ();
2690 }
2691
2692 return pchanged;
2693}
2694#endif
2695
2696/*}}} */ 2228/*}}} */
2697 2229
2698bool 2230void
2699rxvt_term::cmd_parse () 2231rxvt_term::cmd_parse ()
2700{ 2232{
2701 bool flag = false;
2702 wchar_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2703 char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2704 2235
2705 for (;;) 2236 for (;;)
2706 { 2237 {
2707 if (ch == NOCHAR) 2238 if (expect_false (ch == NOCHAR))
2708 { 2239 {
2709 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2710 ch = next_char (); 2241 ch = next_char ();
2711 2242
2712 if (ch == NOCHAR) 2243 if (ch == NOCHAR)
2713 break; 2244 break;
2714 } 2245 }
2715 2246
2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2717 { 2248 {
2718 if (!seen_input) 2249 if (expect_false (!seen_input))
2719 { 2250 {
2720 seen_input = 1; 2251 seen_input = 1;
2721 // many badly-written programs (e.g. jed) contain a race condition: 2252 // many badly-written programs (e.g. jed) contain a race condition:
2722 // they first read the screensize and then install a SIGWINCH handler. 2253 // they first read the screensize and then install a SIGWINCH handler.
2723 // some window managers resize the window early, and these programs 2254 // some window managers resize the window early, and these programs
… …
2736 wchar_t *str = buf; 2267 wchar_t *str = buf;
2737 wchar_t *eol = str + min (ncol, UBUFSIZ); 2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2738 2269
2739 for (;;) 2270 for (;;)
2740 { 2271 {
2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2742 break; 2273 break;
2743 2274
2744 *str++ = ch; 2275 *str++ = ch;
2745 2276
2746 if (ch == C0_LF || str >= eol) 2277 if (expect_false (ch == C0_LF || str >= eol))
2747 { 2278 {
2748 if (ch == C0_LF) 2279 if (ch == C0_LF)
2749 nlines++; 2280 nlines++;
2750 2281
2751 refresh_count++; 2282 refresh_count++;
2752 2283
2753 if (!option (Opt_jumpScroll) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2755 { 2285 {
2756 refreshnow = true;
2757 refresh_count = 0; 2286 refresh_count = 0;
2287
2288 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2289 {
2290 refreshnow = true;
2758 ch = NOCHAR; 2291 ch = NOCHAR;
2759 break; 2292 break;
2293 }
2760 } 2294 }
2761 2295
2762 // scr_add_lines only works for nlines <= nrow - 1. 2296 // scr_add_lines only works for nlines <= nrow - 1.
2763 if (nlines >= nrow - 1) 2297 if (nlines >= nrow - 1)
2764 { 2298 {
… …
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2327 scr_add_lines (buf, str - buf, nlines);
2794 2328
2795 /* 2329 /*
2796 * If there have been a lot of new lines, then update the screen 2330 * If there have been a lot of new lines, then update the screen
2797 * What the heck I'll cheat and only refresh less than every page-full. 2331 * What the heck we'll cheat and only refresh less than every page-full.
2798 * the number of pages between refreshes is refresh_limit, which 2332 * if skipScroll is enabled.
2799 * is incremented here because we must be doing flat-out scrolling.
2800 */ 2333 */
2801 if (refreshnow) 2334 if (refreshnow)
2802 { 2335 {
2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2804 refresh_limit++;
2805 else
2806 {
2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2809 scr_refresh (); 2336 scr_refresh ();
2810 want_refresh = 1; 2337 want_refresh = 1;
2811 }
2812 } 2338 }
2813
2814 } 2339 }
2815 else 2340 else
2816 { 2341 {
2817 try 2342 try
2818 { 2343 {
… …
2826 } 2351 }
2827 2352
2828 ch = NOCHAR; 2353 ch = NOCHAR;
2829 } 2354 }
2830 } 2355 }
2831
2832 return flag;
2833} 2356}
2834 2357
2835// read the next character 2358// read the next character
2836wchar_t 2359wchar_t
2837rxvt_term::next_char () NOTHROW 2360rxvt_term::next_char () NOTHROW
2838{ 2361{
2839 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2840 { 2363 {
2841 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2842 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2843 return *cmdbuf_ptr++; 2366 return *cmdbuf_ptr++;
2844 2367
2845 wchar_t wc; 2368 wchar_t wc;
2846 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2847 2370
… …
2851 cmdbuf_ptr = cmdbuf_endp; 2374 cmdbuf_ptr = cmdbuf_endp;
2852 break; 2375 break;
2853 } 2376 }
2854 2377
2855 if (len == (size_t)-1) 2378 if (len == (size_t)-1)
2379 {
2380 mbstate.reset (); // reset now undefined conversion state
2856 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 }
2857 2383
2858 // assume wchar == unicode 2384 // assume wchar == unicode
2859 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2860 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2861 } 2387 }
… …
2905/*----------------------------------------------------------------------*/ 2431/*----------------------------------------------------------------------*/
2906#ifdef PRINTPIPE 2432#ifdef PRINTPIPE
2907FILE * 2433FILE *
2908rxvt_term::popen_printer () 2434rxvt_term::popen_printer ()
2909{ 2435{
2910 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2911 2437
2912 if (stream == NULL) 2438 if (stream == NULL)
2913 rxvt_warn ("can't open printer pipe, not printing.\n"); 2439 rxvt_warn ("can't open printer pipe, not printing.\n");
2914 2440
2915 return stream; 2441 return stream;
… …
2926 * simulate attached vt100 printer 2452 * simulate attached vt100 printer
2927 */ 2453 */
2928void 2454void
2929rxvt_term::process_print_pipe () 2455rxvt_term::process_print_pipe ()
2930{ 2456{
2931 int done; 2457 FILE *fd = popen_printer ();
2932 FILE *fd;
2933 2458
2934 if ((fd = popen_printer ()) == NULL) 2459 if (!fd)
2935 return; 2460 return;
2936 2461
2937 /* 2462 /*
2938 * Send all input to the printer until either ESC[4i or ESC[?4i 2463 * Send all input to the printer until either ESC[4i or ESC[?4i
2939 * is received. 2464 * is received.
2940 */ 2465 */
2941 for (done = 0; !done;) 2466 for (int done = 0; !done; )
2942 { 2467 {
2943 unsigned char buf[8]; 2468 unsigned char buf[8];
2944 unicode_t ch; 2469 unicode_t ch;
2945 unsigned int i, len; 2470 unsigned int i, len;
2946 2471
… …
2965 { 2490 {
2966 if ((buf[len++] = cmd_getc ()) == 'i') 2491 if ((buf[len++] = cmd_getc ()) == 'i')
2967 break; /* done = 1 */ 2492 break; /* done = 1 */
2968 } 2493 }
2969 } 2494 }
2970 2495
2971 for (i = 0; i < len; i++) 2496 for (i = 0; i < len; i++)
2972 if (putc (buf[i], fd) == EOF) 2497 if (putc (buf[i], fd) == EOF)
2973 { 2498 {
2974 done = 1; 2499 done = 1;
2975 break; 2500 break;
… …
2977 } 2502 }
2978 } 2503 }
2979 2504
2980 pclose_printer (fd); 2505 pclose_printer (fd);
2981} 2506}
2982#endif /* PRINTPIPE */ 2507#endif /* PRINTPIPE */
2983/*}}} */ 2508/*}}} */
2984 2509
2985/* *INDENT-OFF* */ 2510/* *INDENT-OFF* */
2986enum { 2511enum {
2987 C1_40 = 0x40, 2512 C1_40 = 0x40,
… …
3037 process_dcs_seq (); 2562 process_dcs_seq ();
3038 break; 2563 break;
3039 case 0x9b: /* CSI */ 2564 case 0x9b: /* CSI */
3040 process_csi_seq (); 2565 process_csi_seq ();
3041 break; 2566 break;
3042 case 0x9d: /* CSI */ 2567 case 0x9d: /* OSC */
3043 process_osc_seq (); 2568 process_osc_seq ();
3044 break; 2569 break;
3045#endif 2570#endif
3046 } 2571 }
3047} 2572}
… …
3091 break; 2616 break;
3092 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
3093 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3094 break; 2619 break;
3095 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
3096 PrivMode (0, PrivMode_vt52); 2621 set_privmode (PrivMode_vt52, 0);
3097 break; 2622 break;
3098 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
3099 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
3100 /* unimplemented */ 2625 /* unimplemented */
3101 break; 2626 break;
… …
3155 scr_forwardindex (); 2680 scr_forwardindex ();
3156 break; 2681 break;
3157#endif 2682#endif
3158 case '=': 2683 case '=':
3159 case '>': 2684 case '>':
3160 PrivMode ((ch == '='), PrivMode_aplKP); 2685 set_privmode (PrivMode_aplKP, ch == '=');
3161 break; 2686 break;
3162 2687
3163 case C1_40: 2688 case C1_40:
3164 cmd_getc (); 2689 cmd_getc ();
3165 break; 2690 break;
… …
3169 2694
3170 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
3171 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
3172 { 2697 {
3173 wchar_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
3174 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3175 } 2700 }
3176 break; 2701 break;
3177 2702
3178 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
3179 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
… …
3204 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2729 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3205 case C1_SCI: /* ESC Z */ 2730 case C1_SCI: /* ESC Z */
3206 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2731 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3207 break; /* steal obsolete ESC [ c */ 2732 break; /* steal obsolete ESC [ c */
3208 2733
3209 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2734 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3210 case C1_CSI: /* ESC [ */ 2735 case C1_CSI: /* ESC [ */
3211 process_csi_seq (); 2736 process_csi_seq ();
3212 break; 2737 break;
3213 2738
3214 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2739 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3215 case C1_OSC: /* ESC ] */ 2740 case C1_OSC: /* ESC ] */
3216 process_osc_seq (); 2741 process_osc_seq ();
3217 break; 2742 break;
3218 2743
3219 /* 8.3.106: RESET TO INITIAL STATE */ 2744 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3220 case 'c': 2745 case 'c':
3221 mbstate.reset (); 2746 mbstate.reset ();
3222 scr_poweron (); 2747 scr_poweron ();
3223 scrollbar_show (1); 2748 scrollBar.show (1);
3224 break; 2749 break;
3225 2750
3226 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2751 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3227 case 'n': 2752 case 'n':
3228 scr_charset_choose (2); 2753 scr_charset_choose (2);
… …
3248 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3249 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3250 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3251}; 2776};
3252 2777
3253#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3254 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3255 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3256#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
3257 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3258 2783
3259const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
3260 { 2785 {
3261 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3262 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3263 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3264 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3273rxvt_term::process_csi_seq () 2798rxvt_term::process_csi_seq ()
3274{ 2799{
3275 unicode_t ch, priv, i; 2800 unicode_t ch, priv, i;
3276 unsigned int nargs, p; 2801 unsigned int nargs, p;
3277 int n, ndef; 2802 int n, ndef;
3278 int arg[ESC_ARGS]; 2803 int arg[ESC_ARGS] = { };
3279 2804
3280 for (nargs = ESC_ARGS; nargs > 0;) 2805 nargs = 0;
3281 arg[--nargs] = 0;
3282 2806
3283 priv = 0; 2807 priv = 0;
3284 ch = cmd_getc (); 2808 ch = cmd_getc ();
3285 if (ch >= '<' && ch <= '?') 2809 if ((ch >= '<' && ch <= '?') || ch == '!')
2810 {
3286 { /* '<' '=' '>' '?' */ 2811 /* '<' '=' '>' '?' '!' */
3287 priv = ch; 2812 priv = ch;
3288 ch = cmd_getc (); 2813 ch = cmd_getc ();
3289 } 2814 }
3290 2815
3291 /* read any numerical arguments */ 2816 /* read any numerical arguments */
… …
3330 switch (priv) 2855 switch (priv)
3331 { 2856 {
3332 case '>': 2857 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3334 { 2859 {
3335 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 // 2862 //
3338 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3339 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3340 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
3341 // 2866 //
3342 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
3343 } 2868 }
3344 break; 2869 break;
2870
3345 case '?': 2871 case '?':
3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3347 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
3348 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3349 } 2887 }
2888 break;
2889 }
2890
3350 return; 2891 return;
3351 } 2892 }
3352 2893
3353 switch (ch) 2894 switch (ch)
3354 { 2895 {
… …
3721 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3722 */ 3263 */
3723void 3264void
3724rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3725{ 3266{
3726 char *s;
3727 unicode_t eh;
3728
3729 /* 3267 /*
3730 * Not handled yet 3268 * Not handled yet
3731 */ 3269 */
3270
3271 unicode_t eh;
3732 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3733 if (s) 3273 if (s)
3734 free (s); 3274 free (s);
3735 3275
3736 return; 3276 return;
3737} 3277}
… …
3741 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3742 */ 3282 */
3743void 3283void
3744rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3745{ 3285{
3746 unicode_t ch, eh;
3747 int arg; 3286 int arg;
3748 3287
3749 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3750 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3751 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3752 3291
3753 if (ch == ';') 3292 if (ch == ';')
3754 { 3293 {
3294 unicode_t eh;
3755 char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3756 3296
3757 if (s) 3297 if (s)
3758 { 3298 {
3759 process_xterm_seq (arg, s, eh); 3299 process_xterm_seq (arg, s, eh);
… …
3783 3323
3784/* 3324/*
3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3325 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3786 */ 3326 */
3787void 3327void
3788rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3328rxvt_term::process_xterm_seq (int op, char *str, char resp)
3789{ 3329{
3790 int color; 3330 int color;
3791 char *buf, *name; 3331 char *buf, *name;
3792 bool query = str[0] == '?' && !str[1]; 3332 bool query = str[0] == '?' && !str[1];
3793 int saveop = op; 3333 int saveop = op;
3794 3334
3795 dLocal (Display *, dpy); 3335 dLocal (Display *, dpy);
3796 3336
3797 assert (str != NULL); 3337 assert (str != NULL);
3798 3338
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3339 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return; 3340 return;
3801 3341
3802 switch (op) 3342 switch (op)
3803 { 3343 {
… …
3834 3374
3835 XFree (value); 3375 XFree (value);
3836 } 3376 }
3837 else 3377 else
3838 { 3378 {
3839 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3379 char *eq = strchr (str, '=');
3840 3380
3841 if (eq) 3381 if (eq)
3842 { 3382 {
3843 *eq = 0; 3383 *eq = 0;
3844 set_utf8_property (display->atom (str), eq + 1); 3384 set_utf8_property (display->atom (str), eq + 1);
… …
3865 *buf++ = '\0'; 3405 *buf++ = '\0';
3866 3406
3867 process_color_seq (op, color, name, resp); 3407 process_color_seq (op, color, name, resp);
3868 } 3408 }
3869 break; 3409 break;
3410 case Rxvt_restoreFG:
3870 case XTerm_Color00: 3411 case XTerm_Color00:
3871 process_color_seq (op, Color_fg, str, resp); 3412 process_color_seq (op, Color_fg, str, resp);
3872 break; 3413 break;
3414 case Rxvt_restoreBG:
3873 case XTerm_Color01: 3415 case XTerm_Color01:
3874 process_color_seq (op, Color_bg, str, resp); 3416 process_color_seq (op, Color_bg, str, resp);
3875 break; 3417 break;
3876#ifndef NO_CURSORCOLOR 3418#ifndef NO_CURSORCOLOR
3877 case XTerm_Color_cursor: 3419 case XTerm_Color_cursor:
… …
3882 process_color_seq (op, Color_pointer_fg, str, resp); 3424 process_color_seq (op, Color_pointer_fg, str, resp);
3883 break; 3425 break;
3884 case XTerm_Color_pointer_bg: 3426 case XTerm_Color_pointer_bg:
3885 process_color_seq (op, Color_pointer_bg, str, resp); 3427 process_color_seq (op, Color_pointer_bg, str, resp);
3886 break; 3428 break;
3429#ifdef OPTION_HC
3430 case XTerm_Color_HC:
3431 process_color_seq (op, Color_HC, str, resp);
3432 break;
3433 case XTerm_Color_HTC:
3434 process_color_seq (op, Color_HTC, str, resp);
3435 break;
3436#endif
3887#ifndef NO_BOLD_UNDERLINE_REVERSE 3437#ifndef NO_BOLD_UNDERLINE_REVERSE
3888 case XTerm_Color_RV:
3889 process_color_seq (op, Color_RV, str, resp);
3890 break;
3891 case Rxvt_Color_BD:
3892 case URxvt_Color_BD: 3438 case URxvt_Color_BD:
3893 process_color_seq (op, Color_BD, str, resp); 3439 process_color_seq (op, Color_BD, str, resp);
3894 break; 3440 break;
3895 case Rxvt_Color_UL:
3896 case URxvt_Color_UL: 3441 case URxvt_Color_UL:
3897 process_color_seq (op, Color_UL, str, resp); 3442 process_color_seq (op, Color_UL, str, resp);
3898 break; 3443 break;
3899 case URxvt_Color_IT: 3444 case URxvt_Color_IT:
3900 process_color_seq (op, Color_IT, str, resp); 3445 process_color_seq (op, Color_IT, str, resp);
3901 break; 3446 break;
3902#endif 3447#endif
3903#if TRANSPARENT && TINTING 3448 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp);
3450 break;
3451#if ENABLE_TRANSPARENCY
3904 case URxvt_Color_tint: 3452 case URxvt_Color_tint:
3905 process_color_seq (op, Color_tint, str, resp); 3453 process_color_seq (op, Color_tint, str, resp);
3454 {
3455 bool changed = false;
3906 3456
3907 check_our_parents (); 3457 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3908 3459
3909 if (am_transparent) 3460 if (changed)
3910 want_full_refresh = want_refresh = 1; 3461 update_background ();
3462 }
3911 3463
3912 break; 3464 break;
3913#endif 3465#endif
3914 3466
3467#if BG_IMAGE_FROM_FILE
3915 case Rxvt_Pixmap: 3468 case Rxvt_Pixmap:
3916 { 3469 if (!strcmp (str, "?"))
3917 if (*str != ';')
3918 { 3470 {
3919#if XPM_BACKGROUND 3471 char str[256];
3920 scale_pixmap (""); /* reset to default scaling */ 3472
3921 set_bgPixmap (str); /* change pixmap */ 3473 sprintf (str, "[%dx%d+%d+%d]",
3922 scr_touch (true); 3474 min (h_scale, 32767), min (v_scale, 32767),
3923#endif 3475 min (h_align, 32767), min (v_align, 32767));
3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3924 } 3477 }
3925 3478 else
3479 {
3926 int changed = 0; 3480 int changed = 0;
3927 3481
3928 while ((str = strchr (str, ';')) != NULL) 3482 if (*str != ';')
3929 { 3483 {
3484 if (bg_set_file (str)) /* change pixmap */
3485 {
3486 changed++;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bg_set_default_geometry ();
3490 else
3491 bg_set_geometry (str+1);
3492 }
3493 }
3494 else
3495 {
3930 str++; 3496 str++;
3931#if XPM_BACKGROUND 3497 if (bg_set_geometry (str, true))
3932 changed += scale_pixmap (str); 3498 changed++;
3933#endif
3934 } 3499 }
3935 3500
3936 if (changed) 3501 if (changed)
3937 { 3502 {
3938#ifdef XPM_BACKGROUND 3503 if (bg_window_position_sensitive ())
3939 resize_pixmap (); 3504 {
3940 scr_touch (true); 3505 int x, y;
3941#endif 3506 get_window_origin (x, y);
3507 bg_set_position (x, y);
3508 }
3509 update_background ();
3942 } 3510 }
3943 } 3511 }
3944 break; 3512 break;
3945 3513#endif
3946 case Rxvt_restoreFG:
3947 set_window_color (Color_fg, str);
3948 break;
3949 case Rxvt_restoreBG:
3950 set_window_color (Color_bg, str);
3951 break;
3952 3514
3953 case XTerm_logfile: 3515 case XTerm_logfile:
3954 // TODO, when secure mode? 3516 // TODO, when secure mode?
3955 break; 3517 break;
3956 3518
… …
4023 break; 3585 break;
4024#endif 3586#endif
4025 3587
4026#if ENABLE_PERL 3588#if ENABLE_PERL
4027 case URxvt_perl: 3589 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3590 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4029 ; // no responses yet
4030 break; 3591 break;
4031#endif 3592#endif
4032 } 3593 }
4033} 3594}
4034/*----------------------------------------------------------------------*/ 3595/*----------------------------------------------------------------------*/
… …
4057 { 3618 {
4058 if (mode == 'r') 3619 if (mode == 'r')
4059 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4060 else 3621 else
4061 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3622 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4062 PrivMode (state, bit); 3623
3624 set_privmode (bit, state);
4063 } 3625 }
4064 3626
4065 return state; 3627 return state;
4066} 3628}
4067 3629
… …
4071{ 3633{
4072 unsigned int i, j; 3634 unsigned int i, j;
4073 int state; 3635 int state;
4074 3636
4075 static const struct 3637 static const struct
4076 { 3638 {
4077 const int argval; 3639 const int argval;
4078 const unsigned long bit; 3640 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3641 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3642 { 1, PrivMode_aplCUR }, // DECCKM
4083 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3644 { 3, PrivMode_132 }, // DECCOLM
4085 { 4, PrivMode_smoothScroll }, 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
4086 { 5, PrivMode_rVideo }, 3646 { 5, PrivMode_rVideo }, // DECSCNM
4087 { 6, PrivMode_relOrigin }, 3647 { 6, PrivMode_relOrigin }, // DECOM
4088 { 7, PrivMode_Autowrap }, 3648 { 7, PrivMode_Autowrap }, // DECAWM
4089 // 8, bi-directional support mode 3649 // 8, auto-repeat keys // DECARM
4090 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
4091 // 18, 19 printing-related 3651 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region
4092 { 25, PrivMode_VisibleCursor }, 3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4093#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
4094 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
4095#endif 3656#endif
4096 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK
4097 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
4098 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
4099 // 45 margin bell NYI 3661 // 45 margin bell NYI
4100 // 46 start logging 3662 // 46 start logging
4101 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
4102 { 66, PrivMode_aplKP }, 3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4103#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
4104 { 67, PrivMode_BackSpace }, 3666 { 67, PrivMode_BackSpace }, // DECBKM
4105#endif 3667#endif
4106 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
4107 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3669 { 1002, PrivMode_MouseBtnEvent },
4108 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3670 { 1003, PrivMode_MouseAnyEvent },
4109 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
4110 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4111 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
4112 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
4113 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
4114 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
4115 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
4116 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
4117 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4118 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3686 { 2004, PrivMode_BracketPaste },
4119 }; 3687 };
4120 3688
4121 if (nargs == 0) 3689 if (nargs == 0)
4122 return; 3690 return;
4123 3691
… …
4130 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
4131 { 3699 {
4132 state = -1; 3700 state = -1;
4133 3701
4134 /* basic handling */ 3702 /* basic handling */
4135 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4136 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
4137 { 3705 {
4138 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
4139 break; 3707 break;
4140 } 3708 }
… …
4148 3716
4149 scr_touch (true); 3717 scr_touch (true);
4150 break; 3718 break;
4151#endif 3719#endif
4152 case 1048: /* alternative cursor save */ 3720 case 1048: /* alternative cursor save */
4153 case 1049:
4154 if (option (Opt_secondaryScreen)) 3721 if (option (Opt_secondaryScreen))
4155 if (mode == 0) 3722 if (mode == 0)
4156 scr_cursor (RESTORE); 3723 scr_cursor (RESTORE);
4157 else if (mode == 1) 3724 else if (mode == 1)
4158 scr_cursor (SAVE); 3725 scr_cursor (SAVE);
… …
4167 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
4168 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
4169 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
4170 * within VT52 mode 3737 * within VT52 mode
4171 */ 3738 */
4172 PrivMode (1, PrivMode_vt52); 3739 set_privmode (PrivMode_vt52, 1);
4173 break; 3740 break;
4174 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
4175 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
4176 set_widthheight (((state ? 132 : 80) * fwidth), height); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4177 break; 3744 break;
4178 case 4: /* smooth scrolling */ 3745 case 4: /* smooth scrolling */
4179 set_option (Opt_jumpScroll, !state); 3746 set_option (Opt_jumpScroll, !state);
4180 break; 3747 break;
4181 case 5: /* reverse video */ 3748 case 5: /* reverse video */
… …
4188 scr_autowrap (state); 3755 scr_autowrap (state);
4189 break; 3756 break;
4190 /* case 8: - auto repeat, can't do on a per window basis */ 3757 /* case 8: - auto repeat, can't do on a per window basis */
4191 case 9: /* X10 mouse reporting */ 3758 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3761 break;
4195#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
4196 case scrollBar_esc: 3763 case scrollBar_esc:
4197 if (scrollbar_mapping (state)) 3764 if (scrollBar.map (state))
4198 { 3765 {
4199 resize_all_windows (0, 0, 0); 3766 resize_all_windows (0, 0, 0);
4200 scr_touch (true); 3767 scr_touch (true);
4201 } 3768 }
4202 break; 3769 break;
… …
4211 break; 3778 break;
4212 /* case 66: - application key pad */ 3779 /* case 66: - application key pad */
4213 /* case 67: - backspace key */ 3780 /* case 67: - backspace key */
4214 case 1000: /* X11 mouse reporting */ 3781 case 1000: /* X11 mouse reporting */
4215 if (state) /* orthogonal */ 3782 if (state) /* orthogonal */
4216 priv_modes &= ~PrivMode_MouseX10; 3783 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4217 break; 3784 break;
4218#if 0
4219 case 1001: 3785 case 1002:
4220 break; /* X11 mouse highlighting */ 3786 case 1003:
4221#endif 3787 if (state)
3788 {
3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3792 vt_emask_mouse = PointerMotionMask;
3793 }
3794 else
3795 vt_emask_mouse = NoEventMask;
3796
3797 vt_select_input ();
3798 break;
4222 case 1010: /* scroll to bottom on TTY output inhibit */ 3799 case 1010: /* scroll to bottom on TTY output inhibit */
4223 set_option (Opt_scrollTtyOutput, !state); 3800 set_option (Opt_scrollTtyOutput, !state);
4224 break; 3801 break;
4225 case 1011: /* scroll to bottom on key press */ 3802 case 1011: /* scroll to bottom on key press */
4226 set_option (Opt_scrollTtyKeypress, state); 3803 set_option (Opt_scrollTtyKeypress, state);
4227 break; 3804 break;
4228 case 1047: /* secondary screen w/ clearing last */ 3805 case 1047: /* secondary screen w/ clearing last */
4229 if (option (Opt_secondaryScreen)) 3806 if (option (Opt_secondaryScreen))
4230 if (current_screen != PRIMARY) 3807 if (!state)
4231 scr_erase_screen (2); 3808 scr_erase_screen (2);
3809
4232 scr_change_screen (state); 3810 scr_change_screen (state);
4233 break; 3811 break;
4234 case 1049: /* secondary screen w/ clearing first */ 3812 case 1049: /* secondary screen w/ clearing first */
3813 if (option (Opt_secondaryScreen))
3814 if (state)
3815 scr_cursor (SAVE);
3816
4235 scr_change_screen (state); 3817 scr_change_screen (state);
3818
4236 if (option (Opt_secondaryScreen)) 3819 if (option (Opt_secondaryScreen))
4237 if (current_screen != PRIMARY) 3820 if (state)
4238 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822 else
3823 scr_cursor (RESTORE);
4239 break; 3824 break;
4240 default: 3825 default:
4241 break; 3826 break;
4242 } 3827 }
4243 } 3828 }
… …
4403rxvt_term::process_graphics () 3988rxvt_term::process_graphics ()
4404{ 3989{
4405 unicode_t ch, cmd = cmd_getc (); 3990 unicode_t ch, cmd = cmd_getc ();
4406 3991
4407 if (cmd == 'Q') 3992 if (cmd == 'Q')
3993 {
4408 { /* query graphics */ 3994 /* query graphics */
4409 tt_printf ("\033G0\012"); /* no graphics */ 3995 tt_printf ("\033G0\012"); /* no graphics */
4410 return; 3996 return;
4411 } 3997 }
4412 /* swallow other graphics sequences until terminating ':' */ 3998 /* swallow other graphics sequences until terminating ':' */
4413 do 3999 do
… …
4436 4022
4437/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
4438/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* Write data to the pty as typed by the user, pasted with the mouse,
4439 * or generated by us in response to a query ESC sequence. 4025 * or generated by us in response to a query ESC sequence.
4440 */ 4026 */
4441const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4442 4028
4443void 4029void
4444rxvt_term::tt_write (const char *data, unsigned int len) 4030rxvt_term::tt_write (const char *data, unsigned int len)
4445{ 4031{
4446 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4458 4044
4459 data += written; 4045 data += written;
4460 len -= written; 4046 len -= written;
4461 } 4047 }
4462 4048
4463 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4049 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4464 4050
4465 memcpy (v_buffer + v_buflen, data, len); 4051 memcpy (v_buffer + v_buflen, data, len);
4466 v_buflen += len; 4052 v_buflen += len;
4467 4053
4468 pty_ev.set (EVENT_READ | EVENT_WRITE); 4054 pty_ev.set (ev::READ | ev::WRITE);
4469} 4055}
4470 4056
4471void rxvt_term::pty_write () 4057void rxvt_term::pty_write ()
4472{ 4058{
4473 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4059 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4478 4064
4479 if (v_buflen == 0) 4065 if (v_buflen == 0)
4480 { 4066 {
4481 free (v_buffer); 4067 free (v_buffer);
4482 v_buffer = 0; 4068 v_buffer = 0;
4483 v_buflen = 0;
4484 4069
4485 pty_ev.set (EVENT_READ); 4070 pty_ev.set (ev::READ);
4486 return; 4071 return;
4487 } 4072 }
4488 4073
4489 memmove (v_buffer, v_buffer + written, v_buflen); 4074 memmove (v_buffer, v_buffer + written, v_buflen);
4490 } 4075 }
4491 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4076 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4492 pty_ev.set (EVENT_READ); 4077 pty_ev.set (ev::READ);
4493} 4078}
4494 4079
4495/*----------------------- end-of-file (C source) -----------------------*/ 4080/*----------------------- end-of-file (C source) -----------------------*/
4496 4081

Diff Legend

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