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.356 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 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.
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 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
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 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 switch (translate_keypad (keysym, kp))
551 { 655 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 656#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace)
659 {
660 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
661 ^ !!ctrl) ? '\b' : '\177';
662 kbuf[1] = '\0';
663 }
664 else
665 strcpy (kbuf, rs[Rs_backspace_key]);
666 break;
667#endif
668#ifndef NO_DELETE_KEY
669 case XK_Delete:
670 strcpy (kbuf, rs[Rs_delete_key]);
671 break;
672#endif
673 case XK_Tab:
674 if (shft)
675 strcpy (kbuf, "\033[Z");
676 else
677 {
678#ifdef CTRL_TAB_MAKES_META
679 if (ctrl)
680 meta = 1;
681#endif
682#ifdef MOD4_TAB_MAKES_META
683 if (ev.state & Mod4Mask)
684 meta = 1;
685#endif
553 newlen = 1; 686 newlen = 0;
554 switch (keysym) 687 }
688 break;
689
690 case XK_Up: /* "\033[A" */
691 case XK_Down: /* "\033[B" */
692 case XK_Right: /* "\033[C" */
693 case XK_Left: /* "\033[D" */
694 strcpy (kbuf, "\033[Z");
695 kbuf[2] = "DACB"[keysym - XK_Left];
696 /* do Shift first */
697 if (shft)
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 else if (ctrl)
700 {
701 kbuf[1] = 'O';
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 }
704 else if (priv_modes & PrivMode_aplCUR)
705 kbuf[1] = 'O';
706 break;
707
708 case XK_KP_Enter:
709 /* allow shift to override */
710 if (kp)
711 {
712 strcpy (kbuf, "\033OM");
713 break;
714 }
715
716 /* FALLTHROUGH */
717
718 case XK_Return:
719 if (priv_modes & PrivMode_LFNL)
720 {
721 kbuf[0] = '\015';
722 kbuf[1] = '\012';
723 kbuf[2] = '\0';
724 }
725 else
726 {
727 kbuf[0] = '\015';
728 kbuf[1] = '\0';
729 }
730 break;
731
732 case XK_KP_F1: /* "\033OP" */
733 case XK_KP_F2: /* "\033OQ" */
734 case XK_KP_F3: /* "\033OR" */
735 case XK_KP_F4: /* "\033OS" */
736 strcpy (kbuf, "\033OP");
737 kbuf[2] += (keysym - XK_KP_F1);
738 break;
739
740 case XK_KP_Multiply: /* "\033Oj" : "*" */
741 case XK_KP_Add: /* "\033Ok" : "+" */
742 case XK_KP_Separator: /* "\033Ol" : "," */
743 case XK_KP_Subtract: /* "\033Om" : "-" */
744 case XK_KP_Decimal: /* "\033On" : "." */
745 case XK_KP_Divide: /* "\033Oo" : "/" */
746 case XK_KP_0: /* "\033Op" : "0" */
747 case XK_KP_1: /* "\033Oq" : "1" */
748 case XK_KP_2: /* "\033Or" : "2" */
749 case XK_KP_3: /* "\033Os" : "3" */
750 case XK_KP_4: /* "\033Ot" : "4" */
751 case XK_KP_5: /* "\033Ou" : "5" */
752 case XK_KP_6: /* "\033Ov" : "6" */
753 case XK_KP_7: /* "\033Ow" : "7" */
754 case XK_KP_8: /* "\033Ox" : "8" */
755 case XK_KP_9: /* "\033Oy" : "9" */
756 /* allow shift to override */
757 if (kp)
758 {
759 strcpy (kbuf, "\033Oj");
760 kbuf[2] += (keysym - XK_KP_Multiply);
761 }
762 else
763 {
764 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
765 kbuf[1] = '\0';
766 }
767 break;
768
769 default:
555 { 770 {
556#ifndef NO_BACKSPACE_KEY 771 int param = map_function_key (keysym);
557 case XK_BackSpace: 772 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 773 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 774 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
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 (kp)
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 (kp)
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; 775 newlen = 0;
840 break;
841 } 776 }
842 777 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 778 }
779
780 if (newlen)
781 len = strlen (kbuf);
846 782
847 /* 783 /*
848 * Pass meta for all function keys, if 'meta' option set 784 * Pass meta for all function keys, if 'meta' option set
849 */ 785 */
850#ifdef META8_OPTION 786#ifdef META8_OPTION
1035void 971void
1036rxvt_term::flush () 972rxvt_term::flush ()
1037{ 973{
1038 flush_ev.stop (); 974 flush_ev.stop ();
1039 975
976#ifdef HAVE_BG_PIXMAP
977 if (bgPixmap.check_clearChanged ())
978 {
979// scr_clear (true); This needs to be researched further!
980 scr_touch (false);
981 }
982#endif
983
1040 if (want_refresh) 984 if (want_refresh)
1041 { 985 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 986 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 987 {
1044 int row = view_start; 988 int row = view_start;
1076 } 1020 }
1077 while (row < end_row); 1021 while (row < end_row);
1078 } 1022 }
1079 1023
1080 scr_refresh (); 1024 scr_refresh ();
1081 scrollbar_show (1); 1025 scrollBar.show (1);
1082#ifdef USE_XIM 1026#ifdef USE_XIM
1083 IMSendSpot (); 1027 IMSendSpot ();
1084#endif 1028#endif
1085 } 1029 }
1086 1030
1087 display->flush (); 1031 display->flush ();
1088} 1032}
1089 1033
1034/* checks whether a refresh is requested and starts the refresh timer */
1090void 1035void
1091rxvt_term::check_cb (check_watcher &w) 1036rxvt_term::refresh_check ()
1092{ 1037{
1093 make_current (); 1038 if (want_refresh && !flush_ev.is_active ())
1039 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1040
1095 display->flush (); 1041 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1042}
1100 1043
1101void 1044void
1102rxvt_term::flush_cb (time_watcher &w) 1045rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1046{
1104 make_current (); 1047 make_current ();
1105 1048
1106 refresh_count = 0; 1049 refresh_count = 0;
1107 flush (); 1050 flush ();
1108} 1051}
1109 1052
1110#ifdef CURSOR_BLINK 1053#ifdef CURSOR_BLINK
1111void 1054void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1056{
1114 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1058 want_refresh = 1;
1116 1059 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1060}
1119#endif 1061#endif
1120 1062
1121#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1122void 1064void
1123rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1066{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1068 {
1127 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1128 want_refresh = 1; 1070 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1130 } 1072 }
1073 else
1074 w.stop ();
1131} 1075}
1132#endif 1076#endif
1133 1077
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1079void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1081{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1140 { 1084 {
1141 want_refresh = 1; 1085 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1143 } 1087 }
1088 else
1089 w.stop ();
1144} 1090}
1145#endif 1091#endif
1146 1092
1147#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1148void 1094void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1096{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1098 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1100 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1156 } 1102 }
1103 else
1104 w.stop ();
1157} 1105}
1158#endif 1106#endif
1159 1107
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1109void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1111{
1164 if (mouse_slip_wheel_speed == 0 1112 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1113 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1114 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1173 } 1122 }
1174} 1123}
1175#endif 1124#endif
1176 1125
1177#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1178static struct event_handler 1127static struct event_handler
1179{ 1128{
1180 check_watcher yield_ev; 1129 ev::prepare yield_ev;
1181 1130
1182 void yield_cb (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1183 { 1132 {
1184 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1188 1140
1189 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1191 1143
1192 w.stop (); 1144 w.stop ();
1193 } 1145 }
1194 1146
1238 1190
1239 return false; 1191 return false;
1240} 1192}
1241 1193
1242void 1194void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1196{
1245 make_current (); 1197 make_current ();
1246 1198
1247 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1202 cmd_parse ();
1251 break;
1252 1203
1253 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1254 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1255} 1208}
1256 1209
1257void 1210void
1258rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1259{ 1212{
1262 1215
1263#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1217 hidden_pointer = 0;
1265 1218
1266 if (option (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1268#endif 1221#endif
1269} 1222}
1270 1223
1271#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1272void 1225void
1280 1233
1281 hidden_pointer = 1; 1234 hidden_pointer = 1;
1282} 1235}
1283 1236
1284void 1237void
1285rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1239{
1287 make_current (); 1240 make_current ();
1288 1241
1289 pointer_blank (); 1242 pointer_blank ();
1290} 1243}
1293void 1246void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1248{
1296 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1297 int x, y; 1250 int x, y;
1251 int code = 32;
1298 1252
1299 x = ev.x; 1253 x = Pixel2Col (ev.x);
1300 y = ev.y; 1254 y = Pixel2Row (ev.y);
1301 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1302 1263
1303 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1304 button_number = 3; 1265 button_number = 3;
1305 else 1266 else
1306 { 1267 {
1352 x + 1, 1313 x + 1,
1353 y + 1); 1314 y + 1);
1354#endif 1315#endif
1355 1316
1356 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1358 (32 + x + 1), 1319 (32 + x + 1),
1359 (32 + y + 1)); 1320 (32 + y + 1));
1360} 1321}
1361 1322
1362/*{{{ process an X event */ 1323/*{{{ process an X event */
1466 && ev.xfocus.mode != NotifyGrab) 1427 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1428 focus_out ();
1468 break; 1429 break;
1469 1430
1470 case ConfigureNotify: 1431 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/ 1434 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1475 { 1436 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 } 1444 }
1484 else 1445 else
1485 { 1446 {
1486#ifdef HAVE_BG_PIXMAP 1447#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped)
1488 update_background (); 1451 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1489#endif 1455#endif
1490 } 1456 }
1457
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1459 }
1493 break; 1460 break;
1494 1461
1495 case PropertyNotify: 1462 case PropertyNotify:
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1467
1501 break; 1468 break;
1502 1469
1503 case SelectionClear: 1470 case SelectionClear:
1504 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break; 1472 break;
1506 1473
1507 case SelectionNotify: 1474 case SelectionNotify:
1508 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 case SelectionRequest: 1479 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1514 break; 1481 break;
1515 1482
1516 case MapNotify: 1483 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does
1489 * reparenting.
1490 * We should not render background immidiately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025);
1499#endif
1517 mapped = 1; 1500 mapped = 1;
1518#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start ();
1520#endif 1503#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1505 break;
1523 1506
1524 case UnmapNotify: 1507 case UnmapNotify:
1532 case GraphicsExpose: 1515 case GraphicsExpose:
1533 case Expose: 1516 case Expose:
1534 if (ev.xany.window == vt) 1517 if (ev.xany.window == vt)
1535 { 1518 {
1536 do 1519 do
1520 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1523 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1525
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1527
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1532 }
1546 1533
1547 want_refresh = 1; 1534 want_refresh = 1;
1548 } 1535 }
1549 else 1536 else
1550 { 1537 {
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1541 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1543 ;
1557 1544
1558 if (isScrollbarWindow (ev.xany.window)) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1546 {
1560 scrollBar.setIdle (); 1547 scrollBar.state = STATE_IDLE;
1561 scrollbar_show (0); 1548 scrollBar.show (0);
1562 } 1549 }
1563 } 1550 }
1564 break; 1551 break;
1565 1552
1566 case MotionNotify: 1553 case MotionNotify:
1567#ifdef POINTER_BLANK 1554#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1555 if (hidden_pointer)
1569 pointer_unblank (); 1556 pointer_unblank ();
1570#endif 1557#endif
1558 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1559 || priv_modes & PrivMode_MouseAnyEvent)
1560 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1562 break;
1573 1563
1574 if (ev.xany.window == vt) 1564 if (ev.xany.window == vt)
1575 { 1565 {
1609 int dist; 1599 int dist;
1610 1600
1611 /* don't clobber the current delay if we are 1601 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1602 * already in the middle of scrolling.
1613 */ 1603 */
1614 if (!sel_scroll_ev.active) 1604 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1605 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1606
1617 /* save the event params so we can highlight 1607 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1608 * the selection in the pending-scroll loop
1619 */ 1609 */
1620 selection_save_x = ev.xbutton.x; 1610 selection_save_x = ev.xbutton.x;
1642 else 1632 else
1643 { 1633 {
1644 /* we are within the text window, so we 1634 /* we are within the text window, so we
1645 * shouldn't be scrolling 1635 * shouldn't be scrolling
1646 */ 1636 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1637 sel_scroll_ev.stop();
1649 } 1638 }
1650#endif 1639#endif
1651#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1652 } 1641 }
1653#endif 1642#endif
1654 } 1643 }
1655 } 1644 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1646 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1660 ; 1649 ;
1661 1650
1663 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1655 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1657 scrollBar.size ());
1669 want_refresh = 1; 1658 want_refresh = 1;
1670 scrollbar_show (1); 1659 scrollBar.show (1);
1671 } 1660 }
1672 break; 1661 break;
1673 } 1662 }
1674 1663
1675#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
1679 { 1668 {
1680 hidden_cursor = 0; 1669 hidden_cursor = 0;
1681 want_refresh = 1; 1670 want_refresh = 1;
1682 } 1671 }
1683 1672
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1673 cursor_blink_ev.again ();
1685 } 1674 }
1686#endif 1675#endif
1687 1676
1688#if defined(POINTER_BLANK) 1677#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1696 1685
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1686 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1687 pointer_blank ();
1699 } 1688 }
1700#endif 1689#endif
1690
1691 refresh_check ();
1701} 1692}
1693
1694#if ENABLE_FRILLS
1695void
1696rxvt_term::set_urgency (bool enable)
1697{
1698 if (enable == urgency_hint)
1699 return;
1700
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1702 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h);
1705 urgency_hint = enable;
1706 }
1707}
1708#endif
1702 1709
1703void 1710void
1704rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1705{ 1712{
1706 if (!focus) 1713 if (!focus)
1707 { 1714 {
1708 focus = 1; 1715 focus = 1;
1709 want_refresh = 1; 1716 want_refresh = 1;
1710 1717
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1718#if USE_XIM
1714 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1715 { 1720 {
1716 IMSetPosition (); 1721 IMSetPosition ();
1717 XSetICFocus (Input_Context); 1722 XSetICFocus (Input_Context);
1718 } 1723 }
1719#endif 1724#endif
1720#if CURSOR_BLINK 1725#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1726 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1727 cursor_blink_ev.again ();
1723#endif 1728#endif
1724#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1726 { 1731 {
1727 pix_colors = pix_colors_focused; 1732 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1733 scr_recolour ();
1729 } 1734 }
1730#endif 1735#endif
1731#if ENABLE_FRILLS 1736#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1737 if (option (Opt_urgentOnBell))
1733 { 1738 set_urgency (0);
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif 1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741 } 1742 }
1742} 1743}
1743 1744
1744void 1745void
1745rxvt_term::focus_out () 1746rxvt_term::focus_out ()
1747 if (focus) 1748 if (focus)
1748 { 1749 {
1749 focus = 0; 1750 focus = 0;
1750 want_refresh = 1; 1751 want_refresh = 1;
1751 1752
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1753 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1754#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1758 if (iso14755buf)
1756 { 1759 {
1757 iso14755buf = 0; 1760 iso14755buf = 0;
1758# if ISO_14755 1761# if ISO_14755
1765 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1766#endif 1769#endif
1767#if CURSOR_BLINK 1770#if CURSOR_BLINK
1768 if (option (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1773
1770 hidden_cursor = 0; 1774 hidden_cursor = 0;
1771#endif 1775#endif
1772#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
1774 { 1778 {
1775 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1780 scr_recolour ();
1777 } 1781 }
1778#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1785 }
1780} 1786}
1781 1787
1782void 1788void
1783rxvt_term::update_fade_color (unsigned int idx) 1789rxvt_term::update_fade_color (unsigned int idx)
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1821 {
1816 bgPixmap.set_root_pixmap (); 1822 bgPixmap.set_root_pixmap ();
1817 update_background (); 1823 update_background ();
1818 } 1824 }
1825
1819 break; 1826 break;
1820 } 1827 }
1821# endif 1828# endif
1829
1830 refresh_check ();
1822} 1831}
1823#endif 1832#endif
1824 1833
1825void 1834void
1826rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1881 mouse_report (ev); 1890 mouse_report (ev);
1882 } 1891 }
1883#else 1892#else
1884 MEvent.button = ev.button; 1893 MEvent.button = ev.button;
1885 mouse_report (ev); 1894 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1895#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1896
1888 } 1897 }
1889 else 1898 else
1890 { 1899 {
1891 if (ev.button != MEvent.button) 1900 if (ev.button != MEvent.button)
1939 } 1948 }
1940 1949
1941 /* 1950 /*
1942 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1943 */ 1952 */
1944 if (isScrollbarWindow (ev.window)) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1954 {
1946 scrollBar.setIdle (); 1955 page_dirn direction = NO_DIR;
1956
1957 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */
1961
1962 scrollBar.state = STATE_IDLE;
1947 /* 1963 /*
1948 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1965 * move up if mouse is above slider
1950 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1951 * 1967 *
1960 /* 1976 /*
1961 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1964 */ 1980 */
1965 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 1983 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 1984 tt_printf ("\033[B");
1975 else 1985 else
1976 switch (ev.button) 1986 switch (ev.button)
1977 { 1987 {
1978 case Button2: 1988 case Button2:
1985 tt_printf ("\033[5~"); 1995 tt_printf ("\033[5~");
1986 break; 1996 break;
1987 } 1997 }
1988 } 1998 }
1989 else 1999 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2001 {
1997 if (scrollbarnext_upButton (ev.y)) 2002 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2003 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2005 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2007#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
2015 { 2009 {
2016 if (upordown < 0) 2010 if (direction == UP)
2017 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2018 else 2012 else
2019 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2020 } 2014 }
2021 } 2015 }
2022 else 2016 else
2023 switch (ev.button) 2017 switch (ev.button)
2024 { 2018 {
2025 case Button2: 2019 case Button2:
2026 switch (scrollbar_align) 2020 switch (scrollBar.align)
2027 { 2021 {
2028 case R_SB_ALIGN_TOP: 2022 case R_SB_ALIGN_TOP:
2029 csrO = 0; 2023 csrO = 0;
2030 break; 2024 break;
2031 case R_SB_ALIGN_CENTRE: 2025 case R_SB_ALIGN_CENTRE:
2037 } 2031 }
2038 2032
2039 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2040 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2043 2037
2044 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2045 break; 2039 break;
2046 2040
2047 case Button1: 2041 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2044 /* FALLTHROUGH */
2051 2045
2052 case Button3: 2046 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2047 if (scrollBar.style != R_SB_XTERM)
2063 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2064# else 2058# else
2065 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2066# endif 2060# endif
2067 else 2061 else
2068 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2069 } 2063 }
2070 else 2064 else
2071 { 2065 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2067 (nrow
2074 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2075 / scrollbar_size ())); 2069 / scrollBar.size ()));
2076 } 2070 }
2077 2071
2078 break; 2072 break;
2079 } 2073 }
2080 } 2074 }
2090 2084
2091 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2086 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2088
2095 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2096 { 2090 {
2097 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2098 scrollbar_show (0); 2092 scrollBar.show (0);
2099 } 2093 }
2100 2094
2101#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2104#endif 2097#endif
2105 2098
2106 if (ev.window == vt) 2099 if (ev.window == vt)
2107 { 2100 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2101 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 mouse_report (ev); 2125 mouse_report (ev);
2133 } 2126 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2127#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2128 MEvent.button = AnyButton;
2136 mouse_report (ev); 2129 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2130#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2131 return;
2139 } 2132 }
2140 2133
2141 /* 2134 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2135 * dumb hack to compensate for the failure of click-and-drag
2180 { 2173 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2174 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2177
2185 if (slip_wheel_ev.at < NOW) 2178 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2180 }
2190 else 2181 else
2182# endif
2191 { 2183 {
2192# endif
2193 scr_page (v, i); 2184 scr_page (v, i);
2194 scrollbar_show (1); 2185 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2186 }
2197# endif
2198 } 2187 }
2199 break; 2188 break;
2200#endif 2189#endif
2201 } 2190 }
2202 } 2191 }
2203} 2192}
2204 2193
2205/*}}} */ 2194/*}}} */
2206 2195
2207bool 2196void
2208rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2209{ 2198{
2210 bool flag = false;
2211 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2212 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2213 2201
2214 for (;;) 2202 for (;;)
2215 { 2203 {
2216 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2217 { 2205 {
2218 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2219 ch = next_char (); 2207 ch = next_char ();
2220 2208
2221 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2222 break; 2210 break;
2223 } 2211 }
2224 2212
2225 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2226 { 2214 {
2227 if (!seen_input) 2215 if (expect_false (!seen_input))
2228 { 2216 {
2229 seen_input = 1; 2217 seen_input = 1;
2230 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2231 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2232 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
2245 wchar_t *str = buf; 2233 wchar_t *str = buf;
2246 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2247 2235
2248 for (;;) 2236 for (;;)
2249 { 2237 {
2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2251 break; 2239 break;
2252 2240
2253 *str++ = ch; 2241 *str++ = ch;
2254 2242
2255 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2256 { 2244 {
2257 if (ch == C0_LF) 2245 if (ch == C0_LF)
2258 nlines++; 2246 nlines++;
2259 2247
2260 refresh_count++; 2248 refresh_count++;
2261 2249
2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2250 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2263 { 2251 {
2264 refresh_count = 0; 2252 refresh_count = 0;
2265 2253
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2254 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2267 { 2255 {
2268 refreshnow = true; 2256 refreshnow = true;
2269 ch = NOCHAR; 2257 ch = NOCHAR;
2270 break; 2258 break;
2271 } 2259 }
2309 * What the heck we'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2310 * if skipScroll is enabled. 2298 * if skipScroll is enabled.
2311 */ 2299 */
2312 if (refreshnow) 2300 if (refreshnow)
2313 { 2301 {
2314 flag = true;
2315 scr_refresh (); 2302 scr_refresh ();
2316 want_refresh = 1; 2303 want_refresh = 1;
2317 } 2304 }
2318
2319 } 2305 }
2320 else 2306 else
2321 { 2307 {
2322 try 2308 try
2323 { 2309 {
2331 } 2317 }
2332 2318
2333 ch = NOCHAR; 2319 ch = NOCHAR;
2334 } 2320 }
2335 } 2321 }
2336
2337 return flag;
2338} 2322}
2339 2323
2340// read the next character 2324// read the next character
2341wchar_t 2325wchar_t
2342rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2343{ 2327{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2329 {
2346 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2348 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2349 2333
2350 wchar_t wc; 2334 wchar_t wc;
2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2352 2336
2356 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2357 break; 2341 break;
2358 } 2342 }
2359 2343
2360 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 }
2362 2349
2363 // assume wchar == unicode 2350 // assume wchar == unicode
2364 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2365 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2366 } 2353 }
2410/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2411#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2412FILE * 2399FILE *
2413rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2414{ 2401{
2415 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2416 2403
2417 if (stream == NULL) 2404 if (stream == NULL)
2418 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2419 2406
2420 return stream; 2407 return stream;
2431 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2432 */ 2419 */
2433void 2420void
2434rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2435{ 2422{
2436 int done; 2423 FILE *fd = popen_printer ();
2437 FILE *fd;
2438 2424
2439 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2440 return; 2426 return;
2441 2427
2442 /* 2428 /*
2443 * Send all input to the printer until either ESC[4i or ESC[?4i 2429 * Send all input to the printer until either ESC[4i or ESC[?4i
2444 * is received. 2430 * is received.
2445 */ 2431 */
2446 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2447 { 2433 {
2448 unsigned char buf[8]; 2434 unsigned char buf[8];
2449 unicode_t ch; 2435 unicode_t ch;
2450 unsigned int i, len; 2436 unsigned int i, len;
2451 2437
2482 } 2468 }
2483 } 2469 }
2484 2470
2485 pclose_printer (fd); 2471 pclose_printer (fd);
2486} 2472}
2487#endif /* PRINTPIPE */ 2473#endif /* PRINTPIPE */
2488/*}}} */ 2474/*}}} */
2489 2475
2490/* *INDENT-OFF* */ 2476/* *INDENT-OFF* */
2491enum { 2477enum {
2492 C1_40 = 0x40, 2478 C1_40 = 0x40,
2596 break; 2582 break;
2597 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
2598 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2599 break; 2585 break;
2600 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
2601 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
2602 break; 2588 break;
2603 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
2604 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
2605 /* unimplemented */ 2591 /* unimplemented */
2606 break; 2592 break;
2660 scr_forwardindex (); 2646 scr_forwardindex ();
2661 break; 2647 break;
2662#endif 2648#endif
2663 case '=': 2649 case '=':
2664 case '>': 2650 case '>':
2665 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
2666 break; 2652 break;
2667 2653
2668 case C1_40: 2654 case C1_40:
2669 cmd_getc (); 2655 cmd_getc ();
2670 break; 2656 break;
2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2710 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2712 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
2713 2699
2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2715 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
2716 process_csi_seq (); 2702 process_csi_seq ();
2717 break; 2703 break;
2718 2704
2719 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2720 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
2721 process_osc_seq (); 2707 process_osc_seq ();
2722 break; 2708 break;
2723 2709
2724 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2725 case 'c': 2711 case 'c':
2726 mbstate.reset (); 2712 mbstate.reset ();
2727 scr_poweron (); 2713 scr_poweron ();
2728 scrollbar_show (1); 2714 scrollBar.show (1);
2729 break; 2715 break;
2730 2716
2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2732 case 'n': 2718 case 'n':
2733 scr_charset_choose (2); 2719 scr_charset_choose (2);
2784 2770
2785 nargs = 0; 2771 nargs = 0;
2786 2772
2787 priv = 0; 2773 priv = 0;
2788 ch = cmd_getc (); 2774 ch = cmd_getc ();
2789 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2776 {
2790 { /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
2791 priv = ch; 2778 priv = ch;
2792 ch = cmd_getc (); 2779 ch = cmd_getc ();
2793 } 2780 }
2794 2781
2795 /* read any numerical arguments */ 2782 /* read any numerical arguments */
2838 { 2825 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2826 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2827 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 // 2828 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2829 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2830 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844 // that we do not support xterm mouse reporting (should be 95 when we do). 2831 // versions.
2845 // 2832 //
2846 tt_printf ("\033[>%d;94;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
2847 } 2834 }
2848 break; 2835 break;
2836
2849 case '?': 2837 case '?':
2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2851 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2852 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2853 } 2853 }
2854 break;
2855 }
2856
2854 return; 2857 return;
2855 } 2858 }
2856 2859
2857 switch (ch) 2860 switch (ch)
2858 { 2861 {
3287 3290
3288/* 3291/*
3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3290 */ 3293 */
3291void 3294void
3292rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3293{ 3296{
3294 int color; 3297 int color;
3295 char *buf, *name; 3298 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3297 int saveop = op; 3300 int saveop = op;
3338 3341
3339 XFree (value); 3342 XFree (value);
3340 } 3343 }
3341 else 3344 else
3342 { 3345 {
3343 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3344 3347
3345 if (eq) 3348 if (eq)
3346 { 3349 {
3347 *eq = 0; 3350 *eq = 0;
3348 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3369 *buf++ = '\0'; 3372 *buf++ = '\0';
3370 3373
3371 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3372 } 3375 }
3373 break; 3376 break;
3377 case Rxvt_restoreFG:
3374 case XTerm_Color00: 3378 case XTerm_Color00:
3375 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3376 break; 3380 break;
3381 case Rxvt_restoreBG:
3377 case XTerm_Color01: 3382 case XTerm_Color01:
3378 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3379 break; 3384 break;
3380#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3381 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
3402 break; 3407 break;
3403 case URxvt_Color_IT: 3408 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3409 process_color_seq (op, Color_IT, str, resp);
3405 break; 3410 break;
3406#endif 3411#endif
3412 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp);
3414 break;
3407#if ENABLE_TRANSPARENCY 3415#if ENABLE_TRANSPARENCY
3408 case URxvt_Color_tint: 3416 case URxvt_Color_tint:
3409 process_color_seq (op, Color_tint, str, resp); 3417 process_color_seq (op, Color_tint, str, resp);
3410 { 3418 {
3411 bool changed = false; 3419 bool changed = false;
3420
3412 if (ISSET_PIXCOLOR (Color_tint)) 3421 if (ISSET_PIXCOLOR (Color_tint))
3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3414 else 3423 else
3415 changed = bgPixmap.unset_tint (); 3424 changed = bgPixmap.unset_tint ();
3425
3416 if (changed) 3426 if (changed)
3417 update_background (); 3427 update_background ();
3418 } 3428 }
3419 3429
3420 break; 3430 break;
3424 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3435 if (!strcmp (str, "?"))
3426 { 3436 {
3427 char str[256]; 3437 char str[256];
3428 3438
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3439 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3443 }
3434 else 3444 else
3443 changed++; 3453 changed++;
3444 str = strchr (str, ';'); 3454 str = strchr (str, ';');
3445 if (str == NULL) 3455 if (str == NULL)
3446 bgPixmap.set_defaultGeometry (); 3456 bgPixmap.set_defaultGeometry ();
3447 } 3457 }
3458
3448 while (str) 3459 while (str)
3449 { 3460 {
3450 str++; 3461 str++;
3451 if (bgPixmap.set_geometry (str)) 3462 if (bgPixmap.set_geometry (str))
3452 changed++; 3463 changed++;
3453 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3454 } 3465 }
3466
3455 if (changed) 3467 if (changed)
3456 update_background (); 3468 update_background ();
3457 } 3469 }
3458 break; 3470 break;
3459#endif 3471#endif
3460
3461 case Rxvt_restoreFG:
3462 set_window_color (Color_fg, str);
3463 break;
3464 case Rxvt_restoreBG:
3465 set_window_color (Color_bg, str);
3466 break;
3467 3472
3468 case XTerm_logfile: 3473 case XTerm_logfile:
3469 // TODO, when secure mode? 3474 // TODO, when secure mode?
3470 break; 3475 break;
3471 3476
3538 break; 3543 break;
3539#endif 3544#endif
3540 3545
3541#if ENABLE_PERL 3546#if ENABLE_PERL
3542 case URxvt_perl: 3547 case URxvt_perl:
3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3548 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3544 ; // no responses yet
3545 break; 3549 break;
3546#endif 3550#endif
3547 } 3551 }
3548} 3552}
3549/*----------------------------------------------------------------------*/ 3553/*----------------------------------------------------------------------*/
3572 { 3576 {
3573 if (mode == 'r') 3577 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3579 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3580 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577 PrivMode (state, bit); 3581 set_privmode (bit, state);
3578 } 3582 }
3579 3583
3580 return state; 3584 return state;
3581} 3585}
3582 3586
3590 static const struct 3594 static const struct
3591 { 3595 {
3592 const int argval; 3596 const int argval;
3593 const unsigned long bit; 3597 const unsigned long bit;
3594 } argtopriv[] = { 3598 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3597 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, 3604 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, 3605 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, bi-directional support mode 3606 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
3604 // 18, 19 printing-related 3608 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region
3605 { 25, PrivMode_VisibleCursor }, 3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3613#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3614 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK
3610 { 40, PrivMode_132OK }, 3616 { 40, PrivMode_132OK },
3611 // 41 xterm more fixes NYI 3617 // 41 xterm more fixes NYI
3612 // 45 margin bell NYI 3618 // 45 margin bell NYI
3613 // 46 start logging 3619 // 46 start logging
3614 { 47, PrivMode_Screen }, 3620 { 47, PrivMode_Screen },
3615 { 66, PrivMode_aplKP }, 3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3616#ifndef NO_BACKSPACE_KEY 3622#ifndef NO_BACKSPACE_KEY
3617 { 67, PrivMode_BackSpace }, 3623 { 67, PrivMode_BackSpace }, // DECBKM
3618#endif 3624#endif
3619 { 1000, PrivMode_MouseX11 }, 3625 { 1000, PrivMode_MouseX11 },
3620 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3626 { 1002, PrivMode_MouseBtnEvent },
3621 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3627 { 1003, PrivMode_MouseAnyEvent },
3622 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3629 { 1011, PrivMode_Keypress }, // rxvt extension
3625 // 1035 enable modifiers for alt, numlock NYI 3630 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3631 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3632 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3633 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3634 // 1048 save and restore cursor
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste },
3632 }; 3638 };
3633 3639
3634 if (nargs == 0) 3640 if (nargs == 0)
3635 return; 3641 return;
3636 3642
3661 3667
3662 scr_touch (true); 3668 scr_touch (true);
3663 break; 3669 break;
3664#endif 3670#endif
3665 case 1048: /* alternative cursor save */ 3671 case 1048: /* alternative cursor save */
3666 case 1049:
3667 if (option (Opt_secondaryScreen)) 3672 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 3673 if (mode == 0)
3669 scr_cursor (RESTORE); 3674 scr_cursor (RESTORE);
3670 else if (mode == 1) 3675 else if (mode == 1)
3671 scr_cursor (SAVE); 3676 scr_cursor (SAVE);
3680 case 2: /* VT52 mode */ 3685 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3686 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3687 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3688 * within VT52 mode
3684 */ 3689 */
3685 PrivMode (1, PrivMode_vt52); 3690 set_privmode (PrivMode_vt52, 1);
3686 break; 3691 break;
3687 case 3: /* 80/132 */ 3692 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3693 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * fwidth), height); 3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3695 break;
3691 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
3692 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
3693 break; 3698 break;
3694 case 5: /* reverse video */ 3699 case 5: /* reverse video */
3701 scr_autowrap (state); 3706 scr_autowrap (state);
3702 break; 3707 break;
3703 /* case 8: - auto repeat, can't do on a per window basis */ 3708 /* case 8: - auto repeat, can't do on a per window basis */
3704 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
3705 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
3706 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3712 break;
3708#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
3709 case scrollBar_esc: 3714 case scrollBar_esc:
3710 if (scrollbar_mapping (state)) 3715 if (scrollBar.map (state))
3711 { 3716 {
3712 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3718 scr_touch (true);
3714 } 3719 }
3715 break; 3720 break;
3724 break; 3729 break;
3725 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
3726 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
3727 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
3728 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
3729 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3730 break; 3735 break;
3731#if 0
3732 case 1001: 3736 case 1002:
3733 break; /* X11 mouse highlighting */ 3737 case 1003:
3734#endif 3738 if (state)
3739 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask;
3743 }
3744 else
3745 vt_emask_mouse = NoEventMask;
3746
3747 vt_select_input ();
3748 break;
3735 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
3736 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
3737 break; 3751 break;
3738 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
3739 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
3740 break; 3754 break;
3741 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
3742 if (option (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3757 if (!state)
3744 scr_erase_screen (2); 3758 scr_erase_screen (2);
3759
3745 scr_change_screen (state); 3760 scr_change_screen (state);
3746 break; 3761 break;
3747 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
3763 if (option (Opt_secondaryScreen))
3764 if (state)
3765 scr_cursor (SAVE);
3766
3748 scr_change_screen (state); 3767 scr_change_screen (state);
3768
3749 if (option (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 3770 if (state)
3751 scr_erase_screen (2); 3771 scr_erase_screen (2);
3772 else
3773 scr_cursor (RESTORE);
3752 break; 3774 break;
3753 default: 3775 default:
3754 break; 3776 break;
3755 } 3777 }
3756 } 3778 }
3916rxvt_term::process_graphics () 3938rxvt_term::process_graphics ()
3917{ 3939{
3918 unicode_t ch, cmd = cmd_getc (); 3940 unicode_t ch, cmd = cmd_getc ();
3919 3941
3920 if (cmd == 'Q') 3942 if (cmd == 'Q')
3943 {
3921 { /* query graphics */ 3944 /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */ 3945 tt_printf ("\033G0\012"); /* no graphics */
3923 return; 3946 return;
3924 } 3947 }
3925 /* swallow other graphics sequences until terminating ':' */ 3948 /* swallow other graphics sequences until terminating ':' */
3926 do 3949 do
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3977 4000
3978 memcpy (v_buffer + v_buflen, data, len); 4001 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4002 v_buflen += len;
3980 4003
3981 pty_ev.set (EVENT_READ | EVENT_WRITE); 4004 pty_ev.set (ev::READ | ev::WRITE);
3982} 4005}
3983 4006
3984void rxvt_term::pty_write () 4007void rxvt_term::pty_write ()
3985{ 4008{
3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4009 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3992 if (v_buflen == 0) 4015 if (v_buflen == 0)
3993 { 4016 {
3994 free (v_buffer); 4017 free (v_buffer);
3995 v_buffer = 0; 4018 v_buffer = 0;
3996 4019
3997 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
3998 return; 4021 return;
3999 } 4022 }
4000 4023
4001 memmove (v_buffer, v_buffer + written, v_buflen); 4024 memmove (v_buffer, v_buffer + written, v_buflen);
4002 } 4025 }
4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4026 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4004 pty_ev.set (EVENT_READ); 4027 pty_ev.set (ev::READ);
4005} 4028}
4006 4029
4007/*----------------------- end-of-file (C source) -----------------------*/ 4030/*----------------------- end-of-file (C source) -----------------------*/
4008 4031

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines