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.335 by ayin, Tue Jun 26 15:17:24 2007 UTC vs.
Revision 1.451 by root, Sun May 23 00:37:19 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 ENABLE_TRANSPARENCY 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 ()
1101{ 1040{
1102 make_current (); 1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1043
1104 display->flush (); 1044 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1045}
1109 1046
1110void 1047void
1111rxvt_term::flush_cb (time_watcher &w) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1049{
1113 make_current (); 1050 make_current ();
1114 1051
1115 refresh_count = 0; 1052 refresh_count = 0;
1116 flush (); 1053 flush ();
1117} 1054}
1118 1055
1119#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1120void 1057void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1059{
1123 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1061 want_refresh = 1;
1125 1062 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1063}
1128#endif 1064#endif
1129 1065
1130#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1131void 1067void
1132rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1069{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1071 {
1136 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1137 want_refresh = 1; 1073 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1139 } 1075 }
1076 else
1077 w.stop ();
1140} 1078}
1141#endif 1079#endif
1142 1080
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1082void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1084{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1087 {
1150 want_refresh = 1; 1088 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1152 } 1090 }
1091 else
1092 w.stop ();
1153} 1093}
1154#endif 1094#endif
1155 1095
1156#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1157void 1097void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1099{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1101 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1103 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1165 } 1105 }
1106 else
1107 w.stop ();
1166} 1108}
1167#endif 1109#endif
1168 1110
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1112void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1114{
1173 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1116 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1117 want_refresh = 1;
1181 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 ();
1182 } 1125 }
1183} 1126}
1184#endif 1127#endif
1185 1128
1186#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1187static struct event_handler 1130static struct event_handler
1188{ 1131{
1189 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1190 1133
1191 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1192 { 1135 {
1193 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // 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.
1197 1143
1198 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1200 1146
1201 w.stop (); 1147 w.stop ();
1202 } 1148 }
1203 1149
… …
1247 1193
1248 return false; 1194 return false;
1249} 1195}
1250 1196
1251void 1197void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1199{
1254 make_current (); 1200 make_current ();
1255 1201
1256 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1205 cmd_parse ();
1260 break;
1261 1206
1262 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1263 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1264} 1211}
1265 1212
1266void 1213void
1267rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1268{ 1215{
… …
1271 1218
1272#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1220 hidden_pointer = 0;
1274 1221
1275 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1277#endif 1224#endif
1278} 1225}
1279 1226
1280#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1281void 1228void
… …
1289 1236
1290 hidden_pointer = 1; 1237 hidden_pointer = 1;
1291} 1238}
1292 1239
1293void 1240void
1294rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1242{
1296 make_current (); 1243 make_current ();
1297 1244
1298 pointer_blank (); 1245 pointer_blank ();
1299} 1246}
… …
1302void 1249void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1251{
1305 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1306 int x, y; 1253 int x, y;
1254 int code = 32;
1307 1255
1308 x = ev.x; 1256 x = Pixel2Col (ev.x);
1309 y = ev.y; 1257 y = Pixel2Row (ev.y);
1310 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 }
1311 1266
1312 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1313 button_number = 3; 1268 button_number = 3;
1314 else 1269 else
1315 { 1270 {
… …
1361 x + 1, 1316 x + 1,
1362 y + 1); 1317 y + 1);
1363#endif 1318#endif
1364 1319
1365 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1367 (32 + x + 1), 1322 (32 + x + 1),
1368 (32 + y + 1)); 1323 (32 + y + 1));
1369} 1324}
1370 1325
1371/*{{{ process an X event */ 1326/*{{{ process an X event */
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1389 focus_out ();
1435 } 1390 }
1436#endif 1391#endif
1437 } 1392 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1393 break;
1443 1394
1444 /* 1395 /*
1445 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1479 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1431 focus_out ();
1481 break; 1432 break;
1482 1433
1483 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);*/
1484 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1485 { 1439 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1441 ;
1488 1442
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1444 {
1491 seen_resize = 1; 1445 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1447 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1495 { 1452 {
1453 if (mapped)
1454 update_background ();
1496 resize_pixmap (); 1455 else
1497 scr_touch (true); 1456 bgPixmap.invalidate ();
1498 } 1457 }
1499#endif 1458#endif
1500 } 1459 }
1501 1460
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1462 }
1509 break; 1463 break;
1510 1464
1511 case PropertyNotify: 1465 case PropertyNotify:
1512 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)))
… …
1515 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1516 1470
1517 break; 1471 break;
1518 1472
1519 case SelectionClear: 1473 case SelectionClear:
1520 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1521 break; 1475 break;
1522 1476
1523 case SelectionNotify: 1477 case SelectionNotify:
1524 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1528 case SelectionRequest: 1482 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1530 break; 1484 break;
1531 1485
1532 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
1533 mapped = 1; 1503 mapped = 1;
1534#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1505 text_blink_ev.start ();
1536#endif 1506#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1508 break;
1539 1509
1540 case UnmapNotify: 1510 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1544#endif 1514#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1516 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1517
1554 case GraphicsExpose: 1518 case GraphicsExpose:
1555 case Expose: 1519 case Expose:
1556 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1557 { 1521 {
1558 do 1522 do
1523 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1528
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1530
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1535 }
1568 1536
1569 want_refresh = 1; 1537 want_refresh = 1;
1570 } 1538 }
1571 else 1539 else
1572 { 1540 {
… …
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1544 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1546 ;
1579 1547
1580 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1549 {
1582 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1551 scrollBar.show (0);
1584 } 1552 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1553 }
1591 break; 1554 break;
1592 1555
1593 case MotionNotify: 1556 case MotionNotify:
1594#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1558 if (hidden_pointer)
1596 pointer_unblank (); 1559 pointer_unblank ();
1597#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);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1565 break;
1600 1566
1601 if (ev.xany.window == vt) 1567 if (ev.xany.window == vt)
1602 { 1568 {
… …
1636 int dist; 1602 int dist;
1637 1603
1638 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1640 */ 1606 */
1641 if (!sel_scroll_ev.active) 1607 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1609
1644 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1646 */ 1612 */
1647 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
… …
1669 else 1635 else
1670 { 1636 {
1671 /* we are within the text window, so we 1637 /* we are within the text window, so we
1672 * shouldn't be scrolling 1638 * shouldn't be scrolling
1673 */ 1639 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1676 } 1641 }
1677#endif 1642#endif
1678#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1679 } 1644 }
1680#endif 1645#endif
1681 } 1646 }
1682 } 1647 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1649 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1687 ; 1652 ;
1688 1653
… …
1690 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1658 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1660 scrollBar.size ());
1696 want_refresh = 1; 1661 want_refresh = 1;
1697 scrollbar_show (1); 1662 scrollBar.show (1);
1698 } 1663 }
1699 break; 1664 break;
1700 } 1665 }
1701 1666
1702#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
… …
1706 { 1671 {
1707 hidden_cursor = 0; 1672 hidden_cursor = 0;
1708 want_refresh = 1; 1673 want_refresh = 1;
1709 } 1674 }
1710 1675
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1676 cursor_blink_ev.again ();
1712 } 1677 }
1713#endif 1678#endif
1714 1679
1715#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1723 1688
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1689 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1690 pointer_blank ();
1726 } 1691 }
1727#endif 1692#endif
1693
1694 refresh_check ();
1728} 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
1729 1712
1730void 1713void
1731rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1732{ 1715{
1733 if (!focus) 1716 if (!focus)
1734 { 1717 {
1735 focus = 1; 1718 focus = 1;
1736 want_refresh = 1; 1719 want_refresh = 1;
1737 1720
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1721#if USE_XIM
1741 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1742 { 1723 {
1743 IMSetPosition (); 1724 IMSetPosition ();
1744 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1745 } 1726 }
1746#endif 1727#endif
1747#if CURSOR_BLINK 1728#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1729 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1730 cursor_blink_ev.again ();
1750#endif 1731#endif
1751#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1753 { 1734 {
1754 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1736 scr_recolour ();
1756 } 1737 }
1757#endif 1738#endif
1758#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1760 { 1741 set_urgency (0);
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 } 1745 }
1772} 1746}
1773 1747
1774void 1748void
1775rxvt_term::focus_out () 1749rxvt_term::focus_out ()
… …
1777 if (focus) 1751 if (focus)
1778 { 1752 {
1779 focus = 0; 1753 focus = 0;
1780 want_refresh = 1; 1754 want_refresh = 1;
1781 1755
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1783 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1784#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1761 if (iso14755buf)
1786 { 1762 {
1787 iso14755buf = 0; 1763 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1764# if ISO_14755
1789 scr_overlay_off (); 1765 scr_overlay_off ();
1790# endif 1766# endif
1791 } 1767 }
1792#endif 1768#endif
1793#if USE_XIM 1769#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1796#endif 1772#endif
1797#if CURSOR_BLINK 1773#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1800 hidden_cursor = 0; 1777 hidden_cursor = 0;
1801#endif 1778#endif
1802#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1804 { 1781 {
1805 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1783 scr_recolour ();
1807 } 1784 }
1808#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1788 }
1810} 1789}
1811 1790
1812void 1791void
1813rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
… …
1838 case PropertyNotify: 1817 case PropertyNotify:
1839 /* 1818 /*
1840 * 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,
1841 * 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.
1842 */ 1821 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1824 {
1825 bgPixmap.set_root_pixmap ();
1826 update_background ();
1827 }
1846 1828
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1829 break;
1852 } 1830 }
1853# endif 1831# endif
1832
1833 refresh_check ();
1854} 1834}
1855#endif 1835#endif
1856 1836
1857void 1837void
1858rxvt_term::button_press (XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
… …
1913 mouse_report (ev); 1893 mouse_report (ev);
1914 } 1894 }
1915#else 1895#else
1916 MEvent.button = ev.button; 1896 MEvent.button = ev.button;
1917 mouse_report (ev); 1897 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1899
1920 } 1900 }
1921 else 1901 else
1922 { 1902 {
1923 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
… …
1971 } 1951 }
1972 1952
1973 /* 1953 /*
1974 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1975 */ 1955 */
1976 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1957 {
1978 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;
1979 /* 1966 /*
1980 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1968 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1983 * 1970 *
… …
1992 /* 1979 /*
1993 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1996 */ 1983 */
1997 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
2003 && scrollbarnext_dnButton (ev.y))
2004 || (scrollBar.style == R_SB_RXVT
2005 && scrollbarrxvt_dnButton (ev.y)))
2006 tt_printf ("\033[B"); 1987 tt_printf ("\033[B");
2007 else 1988 else
2008 switch (ev.button) 1989 switch (ev.button)
2009 { 1990 {
2010 case Button2: 1991 case Button2:
… …
2017 tt_printf ("\033[5~"); 1998 tt_printf ("\033[5~");
2018 break; 1999 break;
2019 } 2000 }
2020 } 2001 }
2021 else 2002 else
2022#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 2004 {
2029 if (scrollbarnext_upButton (ev.y)) 2005 if (direction != NO_DIR)
2030 upordown = -1; /* up */
2031 else if (scrollbarnext_dnButton (ev.y))
2032 upordown = 1; /* down */
2033 }
2034 else if (scrollBar.style == R_SB_RXVT)
2035 {
2036 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */
2040 }
2041 if (upordown)
2042 { 2006 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2010#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
2047 { 2012 {
2048 if (upordown < 0) 2013 if (direction == UP)
2049 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
2050 else 2015 else
2051 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2052 } 2017 }
2053 } 2018 }
2054 else 2019 else
2055 switch (ev.button) 2020 switch (ev.button)
2056 { 2021 {
2057 case Button2: 2022 case Button2:
2058 switch (scrollbar_align) 2023 switch (scrollBar.align)
2059 { 2024 {
2060 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2026 csrO = 0;
2062 break; 2027 break;
2063 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
2069 } 2034 }
2070 2035
2071 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2075 2040
2076 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2077 break; 2042 break;
2078 2043
2079 case Button1: 2044 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2083 2048
2084 case Button3: 2049 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
… …
2095 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2096# else 2061# else
2097 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2098# endif 2063# endif
2099 else 2064 else
2100 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2101 } 2066 }
2102 else 2067 else
2103 { 2068 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2070 (nrow
2106 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2107 / scrollbar_size ())); 2072 / scrollBar.size ()));
2108 } 2073 }
2109 2074
2110 break; 2075 break;
2111 } 2076 }
2112 } 2077 }
… …
2122 2087
2123 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2089 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2091
2127 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2093 {
2129 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2095 scrollBar.show (0);
2131 } 2096 }
2132 2097
2133#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2136#endif 2100#endif
2137 2101
2138 if (ev.window == vt) 2102 if (ev.window == vt)
2139 { 2103 {
2140 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)))
… …
2164 mouse_report (ev); 2128 mouse_report (ev);
2165 } 2129 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2130#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2131 MEvent.button = AnyButton;
2168 mouse_report (ev); 2132 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2134 return;
2171 } 2135 }
2172 2136
2173 /* 2137 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
… …
2186 selection_make (ev.time); 2150 selection_make (ev.time);
2187 break; 2151 break;
2188 2152
2189 case Button2: 2153 case Button2:
2190 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?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2156 break;
2193 2157
2194#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2195 case Button4: 2159 case Button4:
2196 case Button5: 2160 case Button5:
… …
2212 { 2176 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2177 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2180
2217 if (slip_wheel_ev.at < NOW) 2181 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2183 }
2222 else 2184 else
2185# endif
2223 { 2186 {
2224# endif
2225 scr_page (v, i); 2187 scr_page (v, i);
2226 scrollbar_show (1); 2188 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2189 }
2229# endif
2230 } 2190 }
2231 break; 2191 break;
2232#endif 2192#endif
2233 } 2193 }
2234 } 2194 }
2235} 2195}
2236 2196
2237/*}}} */ 2197/*}}} */
2238 2198
2239bool 2199void
2240rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2241{ 2201{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2245 2204
2246 for (;;) 2205 for (;;)
2247 { 2206 {
2248 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2249 { 2208 {
2250 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2210 ch = next_char ();
2252 2211
2253 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2254 break; 2213 break;
2255 } 2214 }
2256 2215
2257 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))
2258 { 2217 {
2259 if (!seen_input) 2218 if (expect_false (!seen_input))
2260 { 2219 {
2261 seen_input = 1; 2220 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
… …
2277 wchar_t *str = buf; 2236 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2238
2280 for (;;) 2239 for (;;)
2281 { 2240 {
2282 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)))
2283 break; 2242 break;
2284 2243
2285 *str++ = ch; 2244 *str++ = ch;
2286 2245
2287 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2288 { 2247 {
2289 if (ch == C0_LF) 2248 if (ch == C0_LF)
2290 nlines++; 2249 nlines++;
2291 2250
2292 refresh_count++; 2251 refresh_count++;
2293 2252
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2254 {
2296 refresh_count = 0; 2255 refresh_count = 0;
2297 2256
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2258 {
2300 refreshnow = true; 2259 refreshnow = true;
2301 ch = NOCHAR; 2260 ch = NOCHAR;
2302 break; 2261 break;
2303 } 2262 }
… …
2341 * What the heck we'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.
2342 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2343 */ 2302 */
2344 if (refreshnow) 2303 if (refreshnow)
2345 { 2304 {
2346 flag = true;
2347 scr_refresh (); 2305 scr_refresh ();
2348 want_refresh = 1; 2306 want_refresh = 1;
2349 } 2307 }
2350
2351 } 2308 }
2352 else 2309 else
2353 { 2310 {
2354 try 2311 try
2355 { 2312 {
… …
2363 } 2320 }
2364 2321
2365 ch = NOCHAR; 2322 ch = NOCHAR;
2366 } 2323 }
2367 } 2324 }
2368
2369 return flag;
2370} 2325}
2371 2326
2372// read the next character 2327// read the next character
2373wchar_t 2328wchar_t
2374rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2375{ 2330{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2332 {
2378 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2380 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2381 2336
2382 wchar_t wc; 2337 wchar_t wc;
2383 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);
2384 2339
… …
2388 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2344 break;
2390 } 2345 }
2391 2346
2392 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2393 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 }
2394 2352
2395 // assume wchar == unicode 2353 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2398 } 2356 }
… …
2442/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2444FILE * 2402FILE *
2445rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2446{ 2404{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2406
2449 if (stream == NULL) 2407 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2409
2452 return stream; 2410 return stream;
… …
2463 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2464 */ 2422 */
2465void 2423void
2466rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2467{ 2425{
2468 int done; 2426 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2427
2471 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2472 return; 2429 return;
2473 2430
2474 /* 2431 /*
2475 * 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
2476 * is received. 2433 * is received.
2477 */ 2434 */
2478 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2479 { 2436 {
2480 unsigned char buf[8]; 2437 unsigned char buf[8];
2481 unicode_t ch; 2438 unicode_t ch;
2482 unsigned int i, len; 2439 unsigned int i, len;
2483 2440
… …
2514 } 2471 }
2515 } 2472 }
2516 2473
2517 pclose_printer (fd); 2474 pclose_printer (fd);
2518} 2475}
2519#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2520/*}}} */ 2477/*}}} */
2521 2478
2522/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2523enum { 2480enum {
2524 C1_40 = 0x40, 2481 C1_40 = 0x40,
… …
2628 break; 2585 break;
2629 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2588 break;
2632 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2634 break; 2591 break;
2635 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2637 /* unimplemented */ 2594 /* unimplemented */
2638 break; 2595 break;
… …
2692 scr_forwardindex (); 2649 scr_forwardindex ();
2693 break; 2650 break;
2694#endif 2651#endif
2695 case '=': 2652 case '=':
2696 case '>': 2653 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2698 break; 2655 break;
2699 2656
2700 case C1_40: 2657 case C1_40:
2701 cmd_getc (); 2658 cmd_getc ();
2702 break; 2659 break;
… …
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2745 2702
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2705 process_csi_seq ();
2749 break; 2706 break;
2750 2707
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2710 process_osc_seq ();
2754 break; 2711 break;
2755 2712
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2714 case 'c':
2758 mbstate.reset (); 2715 mbstate.reset ();
2759 scr_poweron (); 2716 scr_poweron ();
2760 scrollbar_show (1); 2717 scrollBar.show (1);
2761 break; 2718 break;
2762 2719
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2721 case 'n':
2765 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
2810rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
2811{ 2768{
2812 unicode_t ch, priv, i; 2769 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2770 unsigned int nargs, p;
2814 int n, ndef; 2771 int n, ndef;
2815 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
2816 2773
2817 memset (arg, 0, sizeof (arg));
2818 nargs = 0; 2774 nargs = 0;
2819 2775
2820 priv = 0; 2776 priv = 0;
2821 ch = cmd_getc (); 2777 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
2823 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2781 priv = ch;
2825 ch = cmd_getc (); 2782 ch = cmd_getc ();
2826 } 2783 }
2827 2784
2828 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
2871 { 2828 {
2872 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2831 //
2875 // 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
2876 // 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
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2834 // versions.
2878 // 2835 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2837 }
2881 break; 2838 break;
2839
2882 case '?': 2840 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2885 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);
2886 } 2856 }
2857 break;
2858 }
2859
2887 return; 2860 return;
2888 } 2861 }
2889 2862
2890 switch (ch) 2863 switch (ch)
2891 { 2864 {
… …
3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3259 */ 3232 */
3260void 3233void
3261rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
3262{ 3235{
3263 char *s;
3264 unicode_t eh;
3265
3266 /* 3236 /*
3267 * Not handled yet 3237 * Not handled yet
3268 */ 3238 */
3239
3240 unicode_t eh;
3269 s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3270 if (s) 3242 if (s)
3271 free (s); 3243 free (s);
3272 3244
3273 return; 3245 return;
3274} 3246}
… …
3278 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3279 */ 3251 */
3280void 3252void
3281rxvt_term::process_osc_seq () 3253rxvt_term::process_osc_seq ()
3282{ 3254{
3283 unicode_t ch, eh;
3284 int arg; 3255 int arg;
3285 3256
3286 ch = cmd_getc (); 3257 unicode_t ch = cmd_getc ();
3287 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3288 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3289 3260
3290 if (ch == ';') 3261 if (ch == ';')
3291 { 3262 {
3263 unicode_t eh;
3292 char *s = get_to_st (eh); 3264 char *s = get_to_st (eh);
3293 3265
3294 if (s) 3266 if (s)
3295 { 3267 {
3296 process_xterm_seq (arg, s, eh); 3268 process_xterm_seq (arg, s, eh);
… …
3320 3292
3321/* 3293/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3295 */
3324void 3296void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3297rxvt_term::process_xterm_seq (int op, char *str, char resp)
3326{ 3298{
3327 int color; 3299 int color;
3328 char *buf, *name; 3300 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3302 int saveop = op;
… …
3371 3343
3372 XFree (value); 3344 XFree (value);
3373 } 3345 }
3374 else 3346 else
3375 { 3347 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3348 char *eq = strchr (str, '=');
3377 3349
3378 if (eq) 3350 if (eq)
3379 { 3351 {
3380 *eq = 0; 3352 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
… …
3402 *buf++ = '\0'; 3374 *buf++ = '\0';
3403 3375
3404 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3405 } 3377 }
3406 break; 3378 break;
3379 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3380 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3409 break; 3382 break;
3383 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3384 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3412 break; 3386 break;
3413#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3419 process_color_seq (op, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3420 break; 3394 break;
3421 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3422 process_color_seq (op, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3423 break; 3397 break;
3398#ifdef OPTION_HC
3399 case XTerm_Color_HC:
3400 process_color_seq (op, Color_HC, str, resp);
3401 break;
3402 case XTerm_Color_HTC:
3403 process_color_seq (op, Color_HTC, str, resp);
3404 break;
3405#endif
3424#ifndef NO_BOLD_UNDERLINE_REVERSE 3406#ifndef NO_BOLD_UNDERLINE_REVERSE
3425 case XTerm_Color_RV:
3426 process_color_seq (op, Color_RV, str, resp);
3427 break;
3428 case Rxvt_Color_BD:
3429 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3431 break; 3409 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3435 break; 3412 break;
3436 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3438 break; 3415 break;
3439#endif 3416#endif
3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3440#if ENABLE_TRANSPARENCY && TINTING 3420#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3423 {
3424 bool changed = false;
3443 3425
3444 check_our_parents (); 3426 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3445 3430
3446 if (am_transparent) 3431 if (changed)
3447 want_full_refresh = want_refresh = 1; 3432 update_background ();
3433 }
3448 3434
3449 break; 3435 break;
3450#endif 3436#endif
3451 3437
3438#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3453 { 3440 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3441 {
3456#if XPM_BACKGROUND 3442 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3443
3458 set_bgPixmap (str); /* change pixmap */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3459 scr_touch (true); 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460#endif 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3448 }
3462 3449 else
3450 {
3463 int changed = 0; 3451 int changed = 0;
3464 3452
3465 while ((str = strchr (str, ';')) != NULL) 3453 if (*str != ';')
3466 { 3454 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */
3458 changed++;
3459 str = strchr (str, ';');
3460 if (str == NULL)
3461 bgPixmap.set_defaultGeometry ();
3462 }
3463
3464 while (str)
3465 {
3467 str++; 3466 str++;
3468#if XPM_BACKGROUND 3467 if (bgPixmap.set_geometry (str))
3469 changed += scale_pixmap (str); 3468 changed++;
3470#endif 3469 str = strchr (str, ';');
3471 } 3470 }
3472 3471
3473 if (changed) 3472 if (changed)
3474 { 3473 update_background ();
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 } 3474 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3475 break;
3486 3476#endif
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3477
3494 case XTerm_logfile: 3478 case XTerm_logfile:
3495 // TODO, when secure mode? 3479 // TODO, when secure mode?
3496 break; 3480 break;
3497 3481
… …
3564 break; 3548 break;
3565#endif 3549#endif
3566 3550
3567#if ENABLE_PERL 3551#if ENABLE_PERL
3568 case URxvt_perl: 3552 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3553 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3554 break;
3572#endif 3555#endif
3573 } 3556 }
3574} 3557}
3575/*----------------------------------------------------------------------*/ 3558/*----------------------------------------------------------------------*/
… …
3598 { 3581 {
3599 if (mode == 'r') 3582 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3584 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3586
3587 set_privmode (bit, state);
3604 } 3588 }
3605 3589
3606 return state; 3590 return state;
3607} 3591}
3608 3592
… …
3612{ 3596{
3613 unsigned int i, j; 3597 unsigned int i, j;
3614 int state; 3598 int state;
3615 3599
3616 static const struct 3600 static const struct
3617 { 3601 {
3618 const int argval; 3602 const int argval;
3619 const unsigned long bit; 3603 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3604 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
3633 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3619#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3624 // 45 margin bell NYI
3641 // 46 start logging 3625 // 46 start logging
3642 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3644#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3630#endif
3647 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3632 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3633 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3635 { 1011, PrivMode_Keypress }, // rxvt extension
3653 // 1035 enable modifiers for alt, numlock NYI 3636 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3637 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3638 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3639 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3640 // 1048 save and restore cursor
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste },
3660 }; 3644 };
3661 3645
3662 if (nargs == 0) 3646 if (nargs == 0)
3663 return; 3647 return;
3664 3648
… …
3689 3673
3690 scr_touch (true); 3674 scr_touch (true);
3691 break; 3675 break;
3692#endif 3676#endif
3693 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3679 if (mode == 0)
3697 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3698 else if (mode == 1) 3681 else if (mode == 1)
3699 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
… …
3708 case 2: /* VT52 mode */ 3691 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3692 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3693 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3694 * within VT52 mode
3712 */ 3695 */
3713 PrivMode (1, PrivMode_vt52); 3696 set_privmode (PrivMode_vt52, 1);
3714 break; 3697 break;
3715 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3701 break;
3719 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
3721 break; 3704 break;
3722 case 5: /* reverse video */ 3705 case 5: /* reverse video */
… …
3729 scr_autowrap (state); 3712 scr_autowrap (state);
3730 break; 3713 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3718 break;
3736#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
3737 case scrollBar_esc: 3720 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3721 if (scrollBar.map (state))
3739 { 3722 {
3740 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3724 scr_touch (true);
3742 } 3725 }
3743 break; 3726 break;
… …
3752 break; 3735 break;
3753 /* case 66: - application key pad */ 3736 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3737 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3738 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3741 break;
3759#if 0
3760 case 1001: 3742 case 1002:
3761 break; /* X11 mouse highlighting */ 3743 case 1003:
3762#endif 3744 if (state)
3745 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3748 vt_emask_mouse = PointerMotionMask;
3749 }
3750 else
3751 vt_emask_mouse = NoEventMask;
3752
3753 vt_select_input ();
3754 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3757 break;
3766 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3760 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3763 if (!state)
3772 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
3773 scr_change_screen (state); 3766 scr_change_screen (state);
3774 break; 3767 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
3776 scr_change_screen (state); 3773 scr_change_screen (state);
3774
3777 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3776 if (state)
3779 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
3780 break; 3780 break;
3781 default: 3781 default:
3782 break; 3782 break;
3783 } 3783 }
3784 } 3784 }
… …
3944rxvt_term::process_graphics () 3944rxvt_term::process_graphics ()
3945{ 3945{
3946 unicode_t ch, cmd = cmd_getc (); 3946 unicode_t ch, cmd = cmd_getc ();
3947 3947
3948 if (cmd == 'Q') 3948 if (cmd == 'Q')
3949 {
3949 { /* query graphics */ 3950 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3951 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3952 return;
3952 } 3953 }
3953 /* swallow other graphics sequences until terminating ':' */ 3954 /* swallow other graphics sequences until terminating ':' */
3954 do 3955 do
… …
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005 4006
4006 memcpy (v_buffer + v_buflen, data, len); 4007 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4008 v_buflen += len;
4008 4009
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4010 pty_ev.set (ev::READ | ev::WRITE);
4010} 4011}
4011 4012
4012void rxvt_term::pty_write () 4013void rxvt_term::pty_write ()
4013{ 4014{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4015 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 4020
4020 if (v_buflen == 0) 4021 if (v_buflen == 0)
4021 { 4022 {
4022 free (v_buffer); 4023 free (v_buffer);
4023 v_buffer = 0; 4024 v_buffer = 0;
4024 v_buflen = 0;
4025 4025
4026 pty_ev.set (EVENT_READ); 4026 pty_ev.set (ev::READ);
4027 return; 4027 return;
4028 } 4028 }
4029 4029
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4030 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4031 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4033 pty_ev.set (ev::READ);
4034} 4034}
4035 4035
4036/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
4037 4037

Diff Legend

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