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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.447 by sf-exg, Sat Apr 3 16:30:39 2010 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 615# endif
520 return; 616 return;
521 } 617 }
522 else 618 else
523 { 619 {
524# if ENABLE_OVERLAY 620# if ISO_14755
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 635# endif
539 } 636 }
540#endif 637#endif
… …
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 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
553 newlen = 1; 689 newlen = 0;
554 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:
555 { 773 {
556#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
557 case XK_BackSpace: 775 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 777 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 778 newlen = 0;
840 break;
841 } 779 }
842 780 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
846 785
847 /* 786 /*
848 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
849 */ 788 */
850#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
934#if ENABLE_FRILLS || ISO_14755 873#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 874 // ISO 14755 support
936 if (iso14755buf) 875 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 876 if (iso14755buf & ISO_14755_52)
938 { 877 {
939# if ENABLE_OVERLAY 878# if ISO_14755
940 scr_overlay_off (); 879 scr_overlay_off ();
941# endif 880# endif
942# if ISO_14755 881# if ISO_14755
943 // iso14755 part 5.2 handling: release time 882 // iso14755 part 5.2 handling: release time
944 // first: controls 883 // first: controls
… …
967 906
968 return; 907 return;
969 } 908 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 910 {
972# if ENABLE_OVERLAY 911# if ISO_14755
973 scr_overlay_off (); 912 scr_overlay_off ();
974# endif 913# endif
975 if (iso14755buf & ISO_14755_51) 914 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 915 commit_iso14755 ();
977#if ISO_14755 916#if ISO_14755
… …
1035void 974void
1036rxvt_term::flush () 975rxvt_term::flush ()
1037{ 976{
1038 flush_ev.stop (); 977 flush_ev.stop ();
1039 978
1040#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 980 if (bgPixmap.check_clearChanged ())
1042 { 981 {
1043 want_full_refresh = 0; 982// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 983 scr_touch (false);
1046 } 984 }
1047#endif 985#endif
1048 986
1049 if (want_refresh) 987 if (want_refresh)
… …
1085 } 1023 }
1086 while (row < end_row); 1024 while (row < end_row);
1087 } 1025 }
1088 1026
1089 scr_refresh (); 1027 scr_refresh ();
1090 scrollbar_show (1); 1028 scrollBar.show (1);
1091#ifdef USE_XIM 1029#ifdef USE_XIM
1092 IMSendSpot (); 1030 IMSendSpot ();
1093#endif 1031#endif
1094 } 1032 }
1095 1033
1096 display->flush (); 1034 display->flush ();
1097} 1035}
1098 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1099void 1038void
1100rxvt_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)
1101{ 1049{
1102 make_current (); 1050 make_current ();
1103 1051
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1052 refresh_count = 0;
1117 flush (); 1053 flush ();
1118} 1054}
1119 1055
1120#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1121void 1057void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1059{
1124 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1061 want_refresh = 1;
1126 1062 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1063}
1129#endif 1064#endif
1130 1065
1131#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1132void 1067void
1133rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1069{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1071 {
1137 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1138 want_refresh = 1; 1073 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1140 } 1075 }
1076 else
1077 w.stop ();
1141} 1078}
1142#endif 1079#endif
1143 1080
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1082void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1084{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1087 {
1151 want_refresh = 1; 1088 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1153 } 1090 }
1091 else
1092 w.stop ();
1154} 1093}
1155#endif 1094#endif
1156 1095
1157#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1158void 1097void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1099{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1101 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1103 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1166 } 1105 }
1106 else
1107 w.stop ();
1167} 1108}
1168#endif 1109#endif
1169 1110
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1112void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1114{
1174 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1116 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1117 want_refresh = 1;
1182 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 ();
1183 } 1125 }
1184} 1126}
1185#endif 1127#endif
1186 1128
1187#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1188static struct event_handler 1130static struct event_handler
1189{ 1131{
1190 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1191 1133
1192 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1193 { 1135 {
1194 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // 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.
1198 1143
1199 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1201 1146
1202 w.stop (); 1147 w.stop ();
1203 } 1148 }
1204 1149
… …
1248 1193
1249 return false; 1194 return false;
1250} 1195}
1251 1196
1252void 1197void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1199{
1255 make_current (); 1200 make_current ();
1256 1201
1257 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1205 cmd_parse ();
1261 break;
1262 1206
1263 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1264 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1265} 1211}
1266 1212
1267void 1213void
1268rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1269{ 1215{
… …
1272 1218
1273#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1220 hidden_pointer = 0;
1275 1221
1276 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1278#endif 1224#endif
1279} 1225}
1280 1226
1281#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1282void 1228void
… …
1290 1236
1291 hidden_pointer = 1; 1237 hidden_pointer = 1;
1292} 1238}
1293 1239
1294void 1240void
1295rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1242{
1297 make_current (); 1243 make_current ();
1298 1244
1299 pointer_blank (); 1245 pointer_blank ();
1300} 1246}
… …
1303void 1249void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1251{
1306 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1307 int x, y; 1253 int x, y;
1254 int code = 32;
1308 1255
1309 x = ev.x; 1256 x = Pixel2Col (ev.x);
1310 y = ev.y; 1257 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1312 1266
1313 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1314 button_number = 3; 1268 button_number = 3;
1315 else 1269 else
1316 { 1270 {
… …
1362 x + 1, 1316 x + 1,
1363 y + 1); 1317 y + 1);
1364#endif 1318#endif
1365 1319
1366 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1368 (32 + x + 1), 1322 (32 + x + 1),
1369 (32 + y + 1)); 1323 (32 + y + 1));
1370} 1324}
1371 1325
1372/*{{{ process an X event */ 1326/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1389 focus_out ();
1436 } 1390 }
1437#endif 1391#endif
1438 } 1392 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1393 break;
1444 1394
1445 /* 1395 /*
1446 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1431 focus_out ();
1482 break; 1432 break;
1483 1433
1484 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1486 { 1439 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1441 ;
1489 1442
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1444 {
1492 seen_resize = 1; 1445 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1447 }
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1496 { 1452 {
1453 if (mapped)
1454 update_background ();
1497 resize_pixmap (); 1455 else
1498 scr_touch (true); 1456 bgPixmap.invalidate ();
1499 } 1457 }
1500#endif 1458#endif
1501 } 1459 }
1502 1460
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1462 }
1510 break; 1463 break;
1511 1464
1512 case PropertyNotify: 1465 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1470
1518 break; 1471 break;
1519 1472
1520 case SelectionClear: 1473 case SelectionClear:
1521 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break; 1475 break;
1523 1476
1524 case SelectionNotify: 1477 case SelectionNotify:
1525 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1529 case SelectionRequest: 1482 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1531 break; 1484 break;
1532 1485
1533 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1534 mapped = 1; 1503 mapped = 1;
1535#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1505 text_blink_ev.start ();
1537#endif 1506#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1508 break;
1540 1509
1541 case UnmapNotify: 1510 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1545#endif 1514#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1516 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1517
1555 case GraphicsExpose: 1518 case GraphicsExpose:
1556 case Expose: 1519 case Expose:
1557 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1558 { 1521 {
1559 do 1522 do
1523 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1528
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1530
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1535 }
1569 1536
1570 want_refresh = 1; 1537 want_refresh = 1;
1571 } 1538 }
1572 else 1539 else
1573 { 1540 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1544 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1546 ;
1580 1547
1581 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1549 {
1583 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1551 scrollBar.show (0);
1585 } 1552 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1553 }
1592 break; 1554 break;
1593 1555
1594 case MotionNotify: 1556 case MotionNotify:
1595#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1558 if (hidden_pointer)
1597 pointer_unblank (); 1559 pointer_unblank ();
1598#endif 1560#endif
1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1562 || priv_modes & PrivMode_MouseAnyEvent)
1563 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1565 break;
1601 1566
1602 if (ev.xany.window == vt) 1567 if (ev.xany.window == vt)
1603 { 1568 {
… …
1637 int dist; 1602 int dist;
1638 1603
1639 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1641 */ 1606 */
1642 if (!sel_scroll_ev.active) 1607 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1609
1645 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1647 */ 1612 */
1648 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
… …
1670 else 1635 else
1671 { 1636 {
1672 /* we are within the text window, so we 1637 /* we are within the text window, so we
1673 * shouldn't be scrolling 1638 * shouldn't be scrolling
1674 */ 1639 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1677 } 1641 }
1678#endif 1642#endif
1679#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1680 } 1644 }
1681#endif 1645#endif
1682 } 1646 }
1683 } 1647 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1649 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1688 ; 1652 ;
1689 1653
… …
1691 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1658 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1660 scrollBar.size ());
1697 want_refresh = 1; 1661 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1662 scrollBar.show (1);
1700 } 1663 }
1701 break; 1664 break;
1702 } 1665 }
1703 1666
1704#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
… …
1708 { 1671 {
1709 hidden_cursor = 0; 1672 hidden_cursor = 0;
1710 want_refresh = 1; 1673 want_refresh = 1;
1711 } 1674 }
1712 1675
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1676 cursor_blink_ev.again ();
1714 } 1677 }
1715#endif 1678#endif
1716 1679
1717#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1725 1688
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1689 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1690 pointer_blank ();
1728 } 1691 }
1729#endif 1692#endif
1693
1694 refresh_check ();
1730} 1695}
1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1731 1712
1732void 1713void
1733rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1734{ 1715{
1735 if (!focus) 1716 if (!focus)
1736 { 1717 {
1737 focus = 1; 1718 focus = 1;
1738 want_refresh = 1; 1719 want_refresh = 1;
1739 1720
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1721#if USE_XIM
1743 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1744 { 1723 {
1745 IMSetPosition (); 1724 IMSetPosition ();
1746 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1747 } 1726 }
1748#endif 1727#endif
1749#if CURSOR_BLINK 1728#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1729 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1730 cursor_blink_ev.again ();
1752#endif 1731#endif
1753#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1755 { 1734 {
1756 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1736 scr_recolour ();
1758 } 1737 }
1759#endif 1738#endif
1760#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1762 { 1741 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1773 } 1745 }
1774} 1746}
1775 1747
1776void 1748void
1777rxvt_term::focus_out () 1749rxvt_term::focus_out ()
… …
1779 if (focus) 1751 if (focus)
1780 { 1752 {
1781 focus = 0; 1753 focus = 0;
1782 want_refresh = 1; 1754 want_refresh = 1;
1783 1755
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1785 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1786#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1761 if (iso14755buf)
1788 { 1762 {
1789 iso14755buf = 0; 1763 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1764# if ISO_14755
1791 scr_overlay_off (); 1765 scr_overlay_off ();
1792# endif 1766# endif
1793 } 1767 }
1794#endif 1768#endif
1795#if USE_XIM 1769#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1798#endif 1772#endif
1799#if CURSOR_BLINK 1773#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1802 hidden_cursor = 0; 1777 hidden_cursor = 0;
1803#endif 1778#endif
1804#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1806 { 1781 {
1807 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1783 scr_recolour ();
1809 } 1784 }
1810#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1811 } 1788 }
1812} 1789}
1813 1790
1814void 1791void
1815rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1799 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1800 }
1824#endif 1801#endif
1825} 1802}
1826 1803
1827#if TRANSPARENT || ENABLE_PERL 1804#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1805void
1829rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1807{
1831 make_current (); 1808 make_current ();
1832 1809
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1810 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1811 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1812 return;
1836 1813
1837# if TRANSPARENT 1814# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1815 switch (ev.type)
1839 { 1816 {
1840 case PropertyNotify: 1817 case PropertyNotify:
1841 /* 1818 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1819 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1820 * use the property to determine the pixmap. We use it later on.
1844 */ 1821 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1824 {
1825 bgPixmap.set_root_pixmap ();
1826 update_background ();
1827 }
1848 1828
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1829 break;
1854 } 1830 }
1855# endif 1831# endif
1832
1833 refresh_check ();
1856} 1834}
1857#endif 1835#endif
1858 1836
1859void 1837void
1860rxvt_term::button_press (XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
… …
1915 mouse_report (ev); 1893 mouse_report (ev);
1916 } 1894 }
1917#else 1895#else
1918 MEvent.button = ev.button; 1896 MEvent.button = ev.button;
1919 mouse_report (ev); 1897 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1899
1922 } 1900 }
1923 else 1901 else
1924 { 1902 {
1925 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
… …
1973 } 1951 }
1974 1952
1975 /* 1953 /*
1976 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1977 */ 1955 */
1978 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1957 {
1980 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1981 /* 1966 /*
1982 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1968 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1985 * 1970 *
… …
1994 /* 1979 /*
1995 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1998 */ 1983 */
1999 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 1987 tt_printf ("\033[B");
2009 else 1988 else
2010 switch (ev.button) 1989 switch (ev.button)
2011 { 1990 {
2012 case Button2: 1991 case Button2:
… …
2019 tt_printf ("\033[5~"); 1998 tt_printf ("\033[5~");
2020 break; 1999 break;
2021 } 2000 }
2022 } 2001 }
2023 else 2002 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2004 {
2031 if (scrollbarnext_upButton (ev.y)) 2005 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2006 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2010#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
2049 { 2012 {
2050 if (upordown < 0) 2013 if (direction == UP)
2051 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
2052 else 2015 else
2053 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2054 } 2017 }
2055 } 2018 }
2056 else 2019 else
2057 switch (ev.button) 2020 switch (ev.button)
2058 { 2021 {
2059 case Button2: 2022 case Button2:
2060 switch (scrollbar_align) 2023 switch (scrollBar.align)
2061 { 2024 {
2062 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2026 csrO = 0;
2064 break; 2027 break;
2065 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
2071 } 2034 }
2072 2035
2073 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2077 2040
2078 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2079 break; 2042 break;
2080 2043
2081 case Button1: 2044 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2085 2048
2086 case Button3: 2049 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
… …
2097 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2098# else 2061# else
2099 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2100# endif 2063# endif
2101 else 2064 else
2102 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2103 } 2066 }
2104 else 2067 else
2105 { 2068 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2070 (nrow
2108 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2109 / scrollbar_size ())); 2072 / scrollBar.size ()));
2110 } 2073 }
2111 2074
2112 break; 2075 break;
2113 } 2076 }
2114 } 2077 }
… …
2124 2087
2125 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2089 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2091
2129 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2093 {
2131 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2095 scrollBar.show (0);
2133 } 2096 }
2134 2097
2135#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2138#endif 2100#endif
2139 2101
2140 if (ev.window == vt) 2102 if (ev.window == vt)
2141 { 2103 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2104 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2166 mouse_report (ev); 2128 mouse_report (ev);
2167 } 2129 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2130#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2131 MEvent.button = AnyButton;
2170 mouse_report (ev); 2132 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2134 return;
2173 } 2135 }
2174 2136
2175 /* 2137 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
… …
2188 selection_make (ev.time); 2150 selection_make (ev.time);
2189 break; 2151 break;
2190 2152
2191 case Button2: 2153 case Button2:
2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2156 break;
2195 2157
2196#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2197 case Button4: 2159 case Button4:
2198 case Button5: 2160 case Button5:
… …
2214 { 2176 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2177 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2180
2219 if (slip_wheel_ev.at < NOW) 2181 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2183 }
2224 else 2184 else
2185# endif
2225 { 2186 {
2226# endif
2227 scr_page (v, i); 2187 scr_page (v, i);
2228 scrollbar_show (1); 2188 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2189 }
2231# endif
2232 } 2190 }
2233 break; 2191 break;
2234#endif 2192#endif
2235 } 2193 }
2236 } 2194 }
2237} 2195}
2238 2196
2239/*}}} */ 2197/*}}} */
2240 2198
2241bool 2199void
2242rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2243{ 2201{
2244 bool flag = false;
2245 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2246 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2247 2204
2248 for (;;) 2205 for (;;)
2249 { 2206 {
2250 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2251 { 2208 {
2252 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2253 ch = next_char (); 2210 ch = next_char ();
2254 2211
2255 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2256 break; 2213 break;
2257 } 2214 }
2258 2215
2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2260 { 2217 {
2261 if (!seen_input) 2218 if (expect_false (!seen_input))
2262 { 2219 {
2263 seen_input = 1; 2220 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
… …
2279 wchar_t *str = buf; 2236 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2281 2238
2282 for (;;) 2239 for (;;)
2283 { 2240 {
2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2285 break; 2242 break;
2286 2243
2287 *str++ = ch; 2244 *str++ = ch;
2288 2245
2289 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2290 { 2247 {
2291 if (ch == C0_LF) 2248 if (ch == C0_LF)
2292 nlines++; 2249 nlines++;
2293 2250
2294 refresh_count++; 2251 refresh_count++;
2295 2252
2296 if (!option (Opt_jumpScroll) 2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2254 {
2299 refreshnow = true;
2300 refresh_count = 0; 2255 refresh_count = 0;
2256
2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2258 {
2259 refreshnow = true;
2301 ch = NOCHAR; 2260 ch = NOCHAR;
2302 break; 2261 break;
2262 }
2303 } 2263 }
2304 2264
2305 // scr_add_lines only works for nlines <= nrow - 1. 2265 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2266 if (nlines >= nrow - 1)
2307 { 2267 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2296 scr_add_lines (buf, str - buf, nlines);
2337 2297
2338 /* 2298 /*
2339 * If there have been a lot of new lines, then update the screen 2299 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2301 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2302 */
2344 if (refreshnow) 2303 if (refreshnow)
2345 { 2304 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2305 scr_refresh ();
2353 want_refresh = 1; 2306 want_refresh = 1;
2354 }
2355 } 2307 }
2356
2357 } 2308 }
2358 else 2309 else
2359 { 2310 {
2360 try 2311 try
2361 { 2312 {
… …
2369 } 2320 }
2370 2321
2371 ch = NOCHAR; 2322 ch = NOCHAR;
2372 } 2323 }
2373 } 2324 }
2374
2375 return flag;
2376} 2325}
2377 2326
2378// read the next character 2327// read the next character
2379wchar_t 2328wchar_t
2380rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2381{ 2330{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2332 {
2384 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2387 2336
2388 wchar_t wc; 2337 wchar_t wc;
2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2339
… …
2394 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2344 break;
2396 } 2345 }
2397 2346
2398 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2400 2352
2401 // assume wchar == unicode 2353 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2403 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2404 } 2356 }
… …
2448/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2449#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2450FILE * 2402FILE *
2451rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2452{ 2404{
2453 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2454 2406
2455 if (stream == NULL) 2407 if (stream == NULL)
2456 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2457 2409
2458 return stream; 2410 return stream;
… …
2469 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2470 */ 2422 */
2471void 2423void
2472rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2473{ 2425{
2474 int done; 2426 FILE *fd = popen_printer ();
2475 FILE *fd;
2476 2427
2477 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2478 return; 2429 return;
2479 2430
2480 /* 2431 /*
2481 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2482 * is received. 2433 * is received.
2483 */ 2434 */
2484 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2485 { 2436 {
2486 unsigned char buf[8]; 2437 unsigned char buf[8];
2487 unicode_t ch; 2438 unicode_t ch;
2488 unsigned int i, len; 2439 unsigned int i, len;
2489 2440
… …
2520 } 2471 }
2521 } 2472 }
2522 2473
2523 pclose_printer (fd); 2474 pclose_printer (fd);
2524} 2475}
2525#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2526/*}}} */ 2477/*}}} */
2527 2478
2528/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2529enum { 2480enum {
2530 C1_40 = 0x40, 2481 C1_40 = 0x40,
… …
2580 process_dcs_seq (); 2531 process_dcs_seq ();
2581 break; 2532 break;
2582 case 0x9b: /* CSI */ 2533 case 0x9b: /* CSI */
2583 process_csi_seq (); 2534 process_csi_seq ();
2584 break; 2535 break;
2585 case 0x9d: /* CSI */ 2536 case 0x9d: /* OSC */
2586 process_osc_seq (); 2537 process_osc_seq ();
2587 break; 2538 break;
2588#endif 2539#endif
2589 } 2540 }
2590} 2541}
… …
2634 break; 2585 break;
2635 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2637 break; 2588 break;
2638 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2639 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2640 break; 2591 break;
2641 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2642 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2643 /* unimplemented */ 2594 /* unimplemented */
2644 break; 2595 break;
… …
2698 scr_forwardindex (); 2649 scr_forwardindex ();
2699 break; 2650 break;
2700#endif 2651#endif
2701 case '=': 2652 case '=':
2702 case '>': 2653 case '>':
2703 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2704 break; 2655 break;
2705 2656
2706 case C1_40: 2657 case C1_40:
2707 cmd_getc (); 2658 cmd_getc ();
2708 break; 2659 break;
… …
2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2748 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2750 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2751 2702
2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2753 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2754 process_csi_seq (); 2705 process_csi_seq ();
2755 break; 2706 break;
2756 2707
2757 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2758 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2759 process_osc_seq (); 2710 process_osc_seq ();
2760 break; 2711 break;
2761 2712
2762 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2763 case 'c': 2714 case 'c':
2764 mbstate.reset (); 2715 mbstate.reset ();
2765 scr_poweron (); 2716 scr_poweron ();
2766 scrollbar_show (1); 2717 scrollBar.show (1);
2767 break; 2718 break;
2768 2719
2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2770 case 'n': 2721 case 'n':
2771 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
2816rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
2817{ 2768{
2818 unicode_t ch, priv, i; 2769 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2770 unsigned int nargs, p;
2820 int n, ndef; 2771 int n, ndef;
2821 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
2822 2773
2823 for (nargs = ESC_ARGS; nargs > 0;) 2774 nargs = 0;
2824 arg[--nargs] = 0;
2825 2775
2826 priv = 0; 2776 priv = 0;
2827 ch = cmd_getc (); 2777 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
2829 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2830 priv = ch; 2781 priv = ch;
2831 ch = cmd_getc (); 2782 ch = cmd_getc ();
2832 } 2783 }
2833 2784
2834 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
2873 switch (priv) 2824 switch (priv)
2874 { 2825 {
2875 case '>': 2826 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2827 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2828 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2831 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2832 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2833 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2834 // versions.
2884 // 2835 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2837 }
2887 break; 2838 break;
2839
2888 case '?': 2840 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2891 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2892 } 2856 }
2857 break;
2858 }
2859
2893 return; 2860 return;
2894 } 2861 }
2895 2862
2896 switch (ch) 2863 switch (ch)
2897 { 2864 {
… …
3326 3293
3327/* 3294/*
3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3329 */ 3296 */
3330void 3297void
3331rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3332{ 3299{
3333 int color; 3300 int color;
3334 char *buf, *name; 3301 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3336 int saveop = op; 3303 int saveop = op;
… …
3377 3344
3378 XFree (value); 3345 XFree (value);
3379 } 3346 }
3380 else 3347 else
3381 { 3348 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3383 3350
3384 if (eq) 3351 if (eq)
3385 { 3352 {
3386 *eq = 0; 3353 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
… …
3408 *buf++ = '\0'; 3375 *buf++ = '\0';
3409 3376
3410 process_color_seq (op, color, name, resp); 3377 process_color_seq (op, color, name, resp);
3411 } 3378 }
3412 break; 3379 break;
3380 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3381 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3382 process_color_seq (op, Color_fg, str, resp);
3415 break; 3383 break;
3384 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3385 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3386 process_color_seq (op, Color_bg, str, resp);
3418 break; 3387 break;
3419#ifndef NO_CURSORCOLOR 3388#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3389 case XTerm_Color_cursor:
… …
3441 break; 3410 break;
3442 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3444 break; 3413 break;
3445#endif 3414#endif
3446#if TRANSPARENT && TINTING 3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3418#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3421 {
3422 bool changed = false;
3449 3423
3450 check_our_parents (); 3424 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3451 3428
3452 if (am_transparent) 3429 if (changed)
3453 want_full_refresh = want_refresh = 1; 3430 update_background ();
3431 }
3454 3432
3455 break; 3433 break;
3456#endif 3434#endif
3457 3435
3436#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3459 { 3438 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3439 {
3462#if XPM_BACKGROUND 3440 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3441
3464 set_bgPixmap (str); /* change pixmap */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3465 scr_touch (true); 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3446 }
3468 3447 else
3448 {
3469 int changed = 0; 3449 int changed = 0;
3470 3450
3471 while ((str = strchr (str, ';')) != NULL) 3451 if (*str != ';')
3472 { 3452 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */
3456 changed++;
3457 str = strchr (str, ';');
3458 if (str == NULL)
3459 bgPixmap.set_defaultGeometry ();
3460 }
3461
3462 while (str)
3463 {
3473 str++; 3464 str++;
3474#if XPM_BACKGROUND 3465 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3466 changed++;
3476#endif 3467 str = strchr (str, ';');
3477 } 3468 }
3478 3469
3479 if (changed) 3470 if (changed)
3480 { 3471 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3472 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3491 break; 3473 break;
3492 3474#endif
3493 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str);
3495 break;
3496 case Rxvt_restoreBG:
3497 set_window_color (Color_bg, str);
3498 break;
3499 3475
3500 case XTerm_logfile: 3476 case XTerm_logfile:
3501 // TODO, when secure mode? 3477 // TODO, when secure mode?
3502 break; 3478 break;
3503 3479
… …
3570 break; 3546 break;
3571#endif 3547#endif
3572 3548
3573#if ENABLE_PERL 3549#if ENABLE_PERL
3574 case URxvt_perl: 3550 case URxvt_perl:
3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3551 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3576 ; // no responses yet
3577 break; 3552 break;
3578#endif 3553#endif
3579 } 3554 }
3580} 3555}
3581/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
… …
3604 { 3579 {
3605 if (mode == 'r') 3580 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3582 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 PrivMode (state, bit); 3584 set_privmode (bit, state);
3610 } 3585 }
3611 3586
3612 return state; 3587 return state;
3613} 3588}
3614 3589
… …
3618{ 3593{
3619 unsigned int i, j; 3594 unsigned int i, j;
3620 int state; 3595 int state;
3621 3596
3622 static const struct 3597 static const struct
3623 { 3598 {
3624 const int argval; 3599 const int argval;
3625 const unsigned long bit; 3600 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3601 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3630 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3631 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3632 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3633 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3634 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3635 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3636 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3637 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3638 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region
3639 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3616#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3644 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3645 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3646 // 45 margin bell NYI 3621 // 45 margin bell NYI
3647 // 46 start logging 3622 // 46 start logging
3648 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3649 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3650#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3652#endif 3627#endif
3653 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3629 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3630 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3632 { 1011, PrivMode_Keypress }, // rxvt extension
3659 // 1035 enable modifiers for alt, numlock NYI 3633 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3634 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3635 // 1037 send DEL for keypad delete NYI
3662 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3663 // 1048 save and restore cursor 3637 // 1048 save and restore cursor
3664 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste },
3666 }; 3641 };
3667 3642
3668 if (nargs == 0) 3643 if (nargs == 0)
3669 return; 3644 return;
3670 3645
… …
3695 3670
3696 scr_touch (true); 3671 scr_touch (true);
3697 break; 3672 break;
3698#endif 3673#endif
3699 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3700 case 1049:
3701 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3702 if (mode == 0) 3676 if (mode == 0)
3703 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3704 else if (mode == 1) 3678 else if (mode == 1)
3705 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
… …
3714 case 2: /* VT52 mode */ 3688 case 2: /* VT52 mode */
3715 /* oddball mode. should be set regardless of set/reset 3689 /* oddball mode. should be set regardless of set/reset
3716 * parameter. Return from VT52 mode with an ESC < from 3690 * parameter. Return from VT52 mode with an ESC < from
3717 * within VT52 mode 3691 * within VT52 mode
3718 */ 3692 */
3719 PrivMode (1, PrivMode_vt52); 3693 set_privmode (PrivMode_vt52, 1);
3720 break; 3694 break;
3721 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3722 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3723 set_widthheight (((state ? 132 : 80) * fwidth), height); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3724 break; 3698 break;
3725 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3726 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3727 break; 3701 break;
3728 case 5: /* reverse video */ 3702 case 5: /* reverse video */
… …
3735 scr_autowrap (state); 3709 scr_autowrap (state);
3736 break; 3710 break;
3737 /* case 8: - auto repeat, can't do on a per window basis */ 3711 /* case 8: - auto repeat, can't do on a per window basis */
3738 case 9: /* X10 mouse reporting */ 3712 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3715 break;
3742#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3743 case scrollBar_esc: 3717 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3745 { 3719 {
3746 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3747 scr_touch (true); 3721 scr_touch (true);
3748 } 3722 }
3749 break; 3723 break;
… …
3758 break; 3732 break;
3759 /* case 66: - application key pad */ 3733 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3734 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3735 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3736 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3737 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3738 break;
3765#if 0
3766 case 1001: 3739 case 1002:
3767 break; /* X11 mouse highlighting */ 3740 case 1003:
3768#endif 3741 if (state)
3742 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3745 vt_emask_mouse = PointerMotionMask;
3746 }
3747 else
3748 vt_emask_mouse = NoEventMask;
3749
3750 vt_select_input ();
3751 break;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3754 break;
3772 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3774 break; 3757 break;
3775 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3776 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3760 if (!state)
3778 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3779 scr_change_screen (state); 3763 scr_change_screen (state);
3780 break; 3764 break;
3781 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
3766 if (option (Opt_secondaryScreen))
3767 if (state)
3768 scr_cursor (SAVE);
3769
3782 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3783 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3784 if (current_screen != PRIMARY) 3773 if (state)
3785 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3786 break; 3777 break;
3787 default: 3778 default:
3788 break; 3779 break;
3789 } 3780 }
3790 } 3781 }
… …
3950rxvt_term::process_graphics () 3941rxvt_term::process_graphics ()
3951{ 3942{
3952 unicode_t ch, cmd = cmd_getc (); 3943 unicode_t ch, cmd = cmd_getc ();
3953 3944
3954 if (cmd == 'Q') 3945 if (cmd == 'Q')
3946 {
3955 { /* query graphics */ 3947 /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */ 3948 tt_printf ("\033G0\012"); /* no graphics */
3957 return; 3949 return;
3958 } 3950 }
3959 /* swallow other graphics sequences until terminating ':' */ 3951 /* swallow other graphics sequences until terminating ':' */
3960 do 3952 do
… …
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4011 4003
4012 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 4005 v_buflen += len;
4014 4006
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 4007 pty_ev.set (ev::READ | ev::WRITE);
4016} 4008}
4017 4009
4018void rxvt_term::pty_write () 4010void rxvt_term::pty_write ()
4019{ 4011{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4025 4017
4026 if (v_buflen == 0) 4018 if (v_buflen == 0)
4027 { 4019 {
4028 free (v_buffer); 4020 free (v_buffer);
4029 v_buffer = 0; 4021 v_buffer = 0;
4030 v_buflen = 0;
4031 4022
4032 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4033 return; 4024 return;
4034 } 4025 }
4035 4026
4036 memmove (v_buffer, v_buffer + written, v_buflen); 4027 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 4028 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 4030 pty_ev.set (ev::READ);
4040} 4031}
4041 4032
4042/*----------------------- end-of-file (C source) -----------------------*/ 4033/*----------------------- end-of-file (C source) -----------------------*/
4043 4034

Diff Legend

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