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.372 by root, Tue Dec 11 03:30:47 2007 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 2011 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
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
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
551 { 658 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 660 case XK_BackSpace:
554#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 662 {
556 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 665 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
689 newlen = 0;
690 }
691 break;
571 692
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 773 {
574 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
576 } 779 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 780 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
794 785
795 /* 786 /*
796 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
797 */ 788 */
798#ifdef META8_OPTION 789#ifdef META8_OPTION
898 commit_iso14755 (); 889 commit_iso14755 ();
899 890
900 return; 891 return;
901 } 892 }
902 893
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 895 if (i[0] == keysym)
905 { 896 {
906 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 898 commit_iso14755 ();
908 899
984rxvt_term::flush () 975rxvt_term::flush ()
985{ 976{
986 flush_ev.stop (); 977 flush_ev.stop ();
987 978
988#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
990 { 981 {
991// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 983 scr_touch (false);
993 } 984 }
994#endif 985#endif
995 986
996 if (want_refresh) 987 if (want_refresh)
1032 } 1023 }
1033 while (row < end_row); 1024 while (row < end_row);
1034 } 1025 }
1035 1026
1036 scr_refresh (); 1027 scr_refresh ();
1037 scrollbar_show (1); 1028 scrollBar.show (1);
1038#ifdef USE_XIM 1029#ifdef USE_XIM
1039 IMSendSpot (); 1030 IMSendSpot ();
1040#endif 1031#endif
1041 } 1032 }
1042 1033
1043 display->flush (); 1034 display->flush ();
1044} 1035}
1045 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1046void 1038void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1039rxvt_term::refresh_check ()
1048{ 1040{
1049 make_current (); 1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1043
1051 display->flush (); 1044 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1045}
1056 1046
1057void 1047void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1049{
1067void 1057void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1059{
1070 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1061 want_refresh = 1;
1062 refresh_check ();
1072} 1063}
1073#endif 1064#endif
1074 1065
1075#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1076void 1067void
1078{ 1069{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1071 {
1081 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1082 want_refresh = 1; 1073 want_refresh = 1;
1074 refresh_check ();
1083 } 1075 }
1084}
1085#endif
1086
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1093 want_refresh = 1;
1094 else 1076 else
1095 w.stop (); 1077 w.stop ();
1096} 1078}
1097#endif 1079#endif
1098 1080
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1087 {
1088 want_refresh = 1;
1089 refresh_check ();
1090 }
1091 else
1092 w.stop ();
1093}
1094#endif
1095
1099#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1100void 1097void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{ 1099{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1101 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1103 want_refresh = 1;
1104 refresh_check ();
1107 } 1105 }
1108 else 1106 else
1109 w.stop (); 1107 w.stop ();
1110} 1108}
1111#endif 1109#endif
1112 1110
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1112void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1114{
1117 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1116 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1117 want_refresh = 1;
1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1122 {
1126 else 1123 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1124 w.stop ();
1125 }
1128} 1126}
1129#endif 1127#endif
1130 1128
1131#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1132static struct event_handler 1130static struct event_handler
1137 { 1135 {
1138 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1140 // 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
1141 // 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.
1142 1143
1143 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1145 1146
1146 w.stop (); 1147 w.stop ();
1147 } 1148 }
1148 1149
1157rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1158{ 1159{
1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1160 1161
1161 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1162 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1164 n = 0;
1165 }
1166 1164
1167 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1168 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1169 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1170 1168
1198{ 1196{
1199 make_current (); 1197 make_current ();
1200 1198
1201 if (revents & ev::READ) 1199 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1202 cmd_parse ();
1205 break;
1206 1203
1207 if (revents & ev::WRITE) 1204 if (revents & ev::WRITE)
1208 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1209} 1208}
1210 1209
1211void 1210void
1212rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1213{ 1212{
1249{ 1248{
1250 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1251 int x, y; 1250 int x, y;
1252 int code = 32; 1251 int code = 32;
1253 1252
1254 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1255 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1256 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1257 { 1257 {
1258 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1259 return; 1259 return;
1260
1260 mouse_row = x; 1261 mouse_row = x;
1261 mouse_col = y; 1262 mouse_col = y;
1262 code += 32; 1263 code += 32;
1263 } 1264 }
1264 1265
1267 else 1268 else
1268 { 1269 {
1269 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1270 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1271 if (button_number >= 3) 1272 if (button_number >= 3)
1272 button_number += (64 - 3); 1273 button_number += 64 - 3;
1273 } 1274 }
1274 1275
1275 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1276 { 1277 {
1277 /* 1278 /*
1309 fputc ('A', stderr); 1310 fputc ('A', stderr);
1310 if (key_state & 32) 1311 if (key_state & 32)
1311 fputc ('2', stderr); 1312 fputc ('2', stderr);
1312 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1313 button_number, 1314 button_number,
1314 x + 1, 1315 x,
1315 y + 1); 1316 y);
1316#endif 1317#endif
1317 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1318 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1319 (code + button_number + key_state), 1333 code + button_number + key_state,
1320 (32 + x + 1), 1334 32 + x,
1321 (32 + y + 1)); 1335 32 + y);
1322} 1336}
1323 1337
1324/*{{{ process an X event */ 1338/*{{{ process an X event */
1325void 1339void
1326rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1428 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1443 focus_out ();
1430 break; 1444 break;
1431 1445
1432 case ConfigureNotify: 1446 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1437 { 1448 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1440 1470
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1472 {
1443 seen_resize = 1; 1473 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1475 }
1446 else 1476 else
1447 { 1477 {
1448#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1480 {
1481 if (mapped)
1450 update_background (); 1482 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1451#endif 1486#endif
1452 } 1487 }
1488
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1490 }
1455 break; 1491 break;
1456 1492
1457 case PropertyNotify: 1493 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1495 break;
1464 1496
1465 case SelectionClear: 1497 case SelectionClear:
1466 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1499 break;
1473 1500
1474 case SelectionRequest: 1501 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1476 break; 1503 break;
1477 1504
1478 case MapNotify: 1505 case MapNotify:
1506#ifdef HAVE_BG_PIXMAP
1507 /* This is needed specifically to fix the case of no window manager or a
1508 * non-reparenting window manager. In those cases we never get first
1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1511 * reparenting.
1512 * We should not render background immediately, as there could be several
1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1514 * by scheduling background redraw as soon as we can, but giving a short
1515 * bit of time for ConfigureNotifies to arrive.
1516 * We should render background PRIOR to drawing any text, but AFTER all
1517 * of ConfigureNotifys for the best results.
1518 */
1519 if (!(bg_flags & BG_IS_VALID))
1520 update_background_ev.start (0.025);
1521#endif
1479 mapped = 1; 1522 mapped = 1;
1480#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1524 text_blink_ev.start ();
1482#endif 1525#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1526 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1527 break;
1485 1528
1486 case UnmapNotify: 1529 case UnmapNotify:
1496 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1497 { 1540 {
1498 do 1541 do
1499 { 1542 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1502 } 1545 }
1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504 1547
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1549
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1551 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1554 }
1555
1512 want_refresh = 1; 1556 want_refresh = 1;
1513 } 1557 }
1514 else 1558 else
1515 { 1559 {
1516 XEvent unused_event; 1560 XEvent unused_event;
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1563 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1565 ;
1522 1566
1523 if (isScrollbarWindow (ev.xany.window)) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1568 {
1525 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1570 scrollBar.show (0);
1527 } 1571 }
1528 } 1572 }
1529 break; 1573 break;
1530 1574
1531 case MotionNotify: 1575 case MotionNotify:
1577 int dist; 1621 int dist;
1578 1622
1579 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1581 */ 1625 */
1582 if (!ev_is_active (&sel_scroll_ev)) 1626 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1627 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1628
1585 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1587 */ 1631 */
1610 else 1654 else
1611 { 1655 {
1612 /* we are within the text window, so we 1656 /* we are within the text window, so we
1613 * shouldn't be scrolling 1657 * shouldn't be scrolling
1614 */ 1658 */
1615 if (ev_is_active (&sel_scroll_ev))
1616 sel_scroll_ev.stop(); 1659 sel_scroll_ev.stop();
1617 } 1660 }
1618#endif 1661#endif
1619#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1620 } 1663 }
1621#endif 1664#endif
1622 } 1665 }
1623 } 1666 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1668 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1628 ; 1671 ;
1629 1672
1631 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1634 &unused_mask); 1677 &unused_mask);
1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1636 scrollbar_size ()); 1679 scrollBar.size ());
1637 want_refresh = 1; 1680 want_refresh = 1;
1638 scrollbar_show (1); 1681 scrollBar.show (1);
1639 } 1682 }
1640 break; 1683 break;
1641 } 1684 }
1642 1685
1643#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
1664 1707
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1708 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1709 pointer_blank ();
1667 } 1710 }
1668#endif 1711#endif
1712
1713 refresh_check ();
1669} 1714}
1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1670 1731
1671void 1732void
1672rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1673{ 1734{
1674 if (!focus) 1735 if (!focus)
1675 { 1736 {
1676 focus = 1; 1737 focus = 1;
1677 want_refresh = 1; 1738 want_refresh = 1;
1678 1739
1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681#if USE_XIM 1740#if USE_XIM
1682 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1683 { 1742 {
1684 IMSetPosition (); 1743 IMSetPosition ();
1685 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1686 } 1745 }
1687#endif 1746#endif
1688#if CURSOR_BLINK 1747#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.again ();
1691#endif 1750#endif
1692#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1694 { 1753 {
1695 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1696 scr_recolour (); 1755 scr_recolour ();
1697 } 1756 }
1698#endif 1757#endif
1699#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell)) 1759 if (option (Opt_urgentOnBell))
1701 { 1760 set_urgency (0);
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif 1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1709 } 1764 }
1710} 1765}
1711 1766
1712void 1767void
1713rxvt_term::focus_out () 1768rxvt_term::focus_out ()
1715 if (focus) 1770 if (focus)
1716 { 1771 {
1717 focus = 0; 1772 focus = 0;
1718 want_refresh = 1; 1773 want_refresh = 1;
1719 1774
1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1721 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1722#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1723 if (iso14755buf) 1780 if (iso14755buf)
1724 { 1781 {
1725 iso14755buf = 0; 1782 iso14755buf = 0;
1726# if ISO_14755 1783# if ISO_14755
1743 { 1800 {
1744 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1745 scr_recolour (); 1802 scr_recolour ();
1746 } 1803 }
1747#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748 } 1807 }
1749} 1808}
1750 1809
1751void 1810void
1752rxvt_term::update_fade_color (unsigned int idx) 1811rxvt_term::update_fade_color (unsigned int idx)
1780 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1781 */ 1840 */
1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1843 {
1785 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1786 update_background (); 1845 update_background ();
1787 } 1846 }
1847
1788 break; 1848 break;
1789 } 1849 }
1790# endif 1850# endif
1851
1852 refresh_check ();
1791} 1853}
1792#endif 1854#endif
1793 1855
1794void 1856void
1795rxvt_term::button_press (XButtonEvent &ev) 1857rxvt_term::button_press (XButtonEvent &ev)
1826 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1827 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1828#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1829 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1830 { 1892 {
1831 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1832 MEvent.clicks++; 1894 MEvent.clicks++;
1833 1895
1834 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1835 { 1897 {
1836 /* only report double clicks */ 1898 /* only report double clicks */
1908 } 1970 }
1909 1971
1910 /* 1972 /*
1911 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1912 */ 1974 */
1913 if (isScrollbarWindow (ev.window)) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1976 {
1915 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1916 /* 1985 /*
1917 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1987 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1920 * 1989 *
1929 /* 1998 /*
1930 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1933 */ 2002 */
1934 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 2005 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 2006 tt_printf ("\033[B");
1944 else 2007 else
1945 switch (ev.button) 2008 switch (ev.button)
1946 { 2009 {
1947 case Button2: 2010 case Button2:
1955 break; 2018 break;
1956 } 2019 }
1957 } 2020 }
1958 else 2021 else
1959#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 2023 {
1966 if (scrollbarnext_upButton (ev.y)) 2024 if (direction != NO_DIR)
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown)
1979 { 2025 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2029#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
1984 { 2031 {
1985 if (upordown < 0) 2032 if (direction == UP)
1986 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
1987 else 2034 else
1988 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
1989 } 2036 }
1990 } 2037 }
1991 else 2038 else
1992 switch (ev.button) 2039 switch (ev.button)
1993 { 2040 {
1994 case Button2: 2041 case Button2:
1995 switch (scrollbar_align) 2042 switch (scrollBar.align)
1996 { 2043 {
1997 case R_SB_ALIGN_TOP: 2044 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2045 csrO = 0;
1999 break; 2046 break;
2000 case R_SB_ALIGN_CENTRE: 2047 case R_SB_ALIGN_CENTRE:
2006 } 2053 }
2007 2054
2008 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2012 2059
2013 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2014 break; 2061 break;
2015 2062
2016 case Button1: 2063 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2066 /* FALLTHROUGH */
2020 2067
2021 case Button3: 2068 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
2032 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2033# else 2080# else
2034 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2035# endif 2082# endif
2036 else 2083 else
2037 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2038 } 2085 }
2039 else 2086 else
2040 { 2087 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2089 (nrow
2043 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2044 / scrollbar_size ())); 2091 / scrollBar.size ()));
2045 } 2092 }
2046 2093
2047 break; 2094 break;
2048 } 2095 }
2049 } 2096 }
2059 2106
2060 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2108 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2110
2064 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2112 {
2066 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2114 scrollBar.show (0);
2068 } 2115 }
2069 2116
2070#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2071 if (ev_is_active (&sel_scroll_ev))
2072 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2073#endif 2119#endif
2074 2120
2075 if (ev.window == vt) 2121 if (ev.window == vt)
2076 { 2122 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2123 selection_make (ev.time); 2169 selection_make (ev.time);
2124 break; 2170 break;
2125 2171
2126 case Button2: 2172 case Button2:
2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2175 break;
2130 2176
2131#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2132 case Button4: 2178 case Button4:
2133 case Button5: 2179 case Button5:
2149 { 2195 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2196 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2199
2200 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2201 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2202 }
2156 else 2203 else
2204# endif
2157 { 2205 {
2158# endif
2159 scr_page (v, i); 2206 scr_page (v, i);
2160 scrollbar_show (1); 2207 scrollBar.show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2208 }
2163# endif
2164 } 2209 }
2165 break; 2210 break;
2166#endif 2211#endif
2167 } 2212 }
2168 } 2213 }
2169} 2214}
2170 2215
2171/*}}} */ 2216/*}}} */
2172 2217
2173bool 2218void
2174rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2175{ 2220{
2176 bool flag = false;
2177 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2178 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2179 2223
2180 for (;;) 2224 for (;;)
2181 { 2225 {
2182 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2183 { 2227 {
2184 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2185 ch = next_char (); 2229 ch = next_char ();
2186 2230
2187 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2188 break; 2232 break;
2189 } 2233 }
2190 2234
2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2192 { 2236 {
2193 if (!seen_input) 2237 if (expect_false (!seen_input))
2194 { 2238 {
2195 seen_input = 1; 2239 seen_input = 1;
2196 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2197 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2198 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
2211 wchar_t *str = buf; 2255 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2213 2257
2214 for (;;) 2258 for (;;)
2215 { 2259 {
2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2217 break; 2261 break;
2218 2262
2219 *str++ = ch; 2263 *str++ = ch;
2220 2264
2221 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2222 { 2266 {
2223 if (ch == C0_LF) 2267 if (ch == C0_LF)
2224 nlines++; 2268 nlines++;
2225 2269
2226 refresh_count++; 2270 refresh_count++;
2275 * What the heck we'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2276 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2277 */ 2321 */
2278 if (refreshnow) 2322 if (refreshnow)
2279 { 2323 {
2280 flag = true;
2281 scr_refresh (); 2324 scr_refresh ();
2282 want_refresh = 1; 2325 want_refresh = 1;
2283 } 2326 }
2284
2285 } 2327 }
2286 else 2328 else
2287 { 2329 {
2288 try 2330 try
2289 { 2331 {
2297 } 2339 }
2298 2340
2299 ch = NOCHAR; 2341 ch = NOCHAR;
2300 } 2342 }
2301 } 2343 }
2302
2303 return flag;
2304} 2344}
2305 2345
2306// read the next character 2346// read the next character
2307wchar_t 2347wchar_t
2308rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2309{ 2349{
2310 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2311 { 2351 {
2312 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2314 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2315 2355
2316 wchar_t wc; 2356 wchar_t wc;
2317 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2318 2358
2322 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2323 break; 2363 break;
2324 } 2364 }
2325 2365
2326 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2328 2371
2329 // assume wchar == unicode 2372 // assume wchar == unicode
2330 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2331 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2332 } 2375 }
2376/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2377#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2378FILE * 2421FILE *
2379rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2380{ 2423{
2381 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2382 2425
2383 if (stream == NULL) 2426 if (stream == NULL)
2384 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2385 2428
2386 return stream; 2429 return stream;
2397 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2398 */ 2441 */
2399void 2442void
2400rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2401{ 2444{
2402 int done; 2445 FILE *fd = popen_printer ();
2403 FILE *fd;
2404 2446
2405 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2406 return; 2448 return;
2407 2449
2408 /* 2450 /*
2409 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2410 * is received. 2452 * is received.
2411 */ 2453 */
2412 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2413 { 2455 {
2414 unsigned char buf[8]; 2456 unsigned char buf[8];
2415 unicode_t ch; 2457 unicode_t ch;
2416 unsigned int i, len; 2458 unsigned int i, len;
2417 2459
2562 break; 2604 break;
2563 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2564 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2565 break; 2607 break;
2566 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2567 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2568 break; 2610 break;
2569 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2570 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2571 /* unimplemented */ 2613 /* unimplemented */
2572 break; 2614 break;
2626 scr_forwardindex (); 2668 scr_forwardindex ();
2627 break; 2669 break;
2628#endif 2670#endif
2629 case '=': 2671 case '=':
2630 case '>': 2672 case '>':
2631 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2632 break; 2674 break;
2633 2675
2634 case C1_40: 2676 case C1_40:
2635 cmd_getc (); 2677 cmd_getc ();
2636 break; 2678 break;
2640 2682
2641 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2642 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2643 { 2685 {
2644 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2646 } 2688 }
2647 break; 2689 break;
2648 2690
2649 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2650 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2676 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2678 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2679 2721
2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2681 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2682 process_csi_seq (); 2724 process_csi_seq ();
2683 break; 2725 break;
2684 2726
2685 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2686 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2687 process_osc_seq (); 2729 process_osc_seq ();
2688 break; 2730 break;
2689 2731
2690 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2691 case 'c': 2733 case 'c':
2692 mbstate.reset (); 2734 mbstate.reset ();
2693 scr_poweron (); 2735 scr_poweron ();
2694 scrollbar_show (1); 2736 scrollBar.show (1);
2695 break; 2737 break;
2696 2738
2697 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2698 case 'n': 2740 case 'n':
2699 scr_charset_choose (2); 2741 scr_charset_choose (2);
2719 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2720 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2721 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2722}; 2764};
2723 2765
2724#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2725 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2726 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2727#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2728 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2729 2771
2730const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2731 { 2773 {
2732 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2733 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2734 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2735 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2750 2792
2751 nargs = 0; 2793 nargs = 0;
2752 2794
2753 priv = 0; 2795 priv = 0;
2754 ch = cmd_getc (); 2796 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2756 { 2798 {
2757 /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2758 priv = ch; 2800 priv = ch;
2759 ch = cmd_getc (); 2801 ch = cmd_getc ();
2760 } 2802 }
2761 2803
2762 /* read any numerical arguments */ 2804 /* read any numerical arguments */
2811 // versions. 2853 // versions.
2812 // 2854 //
2813 tt_printf ("\033[>%d;95;0c", 'U'); 2855 tt_printf ("\033[>%d;95;0c", 'U');
2814 } 2856 }
2815 break; 2857 break;
2858
2816 case '?': 2859 case '?':
2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2818 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2819 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2820 } 2875 }
2876 break;
2877 }
2878
2821 return; 2879 return;
2822 } 2880 }
2823 2881
2824 switch (ch) 2882 switch (ch)
2825 { 2883 {
3192 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3193 */ 3251 */
3194void 3252void
3195rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3196{ 3254{
3197 char *s;
3198 unicode_t eh;
3199
3200 /* 3255 /*
3201 * Not handled yet 3256 * Not handled yet
3202 */ 3257 */
3258
3259 unicode_t eh;
3203 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3204 if (s) 3261 if (s)
3205 free (s); 3262 free (s);
3206 3263
3207 return; 3264 return;
3208} 3265}
3212 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3213 */ 3270 */
3214void 3271void
3215rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3216{ 3273{
3217 unicode_t ch, eh;
3218 int arg; 3274 int arg;
3219 3275
3220 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3221 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3222 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3223 3279
3224 if (ch == ';') 3280 if (ch == ';')
3225 { 3281 {
3282 unicode_t eh;
3226 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3227 3284
3228 if (s) 3285 if (s)
3229 { 3286 {
3230 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
3254 3311
3255/* 3312/*
3256 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3257 */ 3314 */
3258void 3315void
3259rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3260{ 3317{
3261 int color; 3318 int color;
3262 char *buf, *name; 3319 char *buf, *name;
3263 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3264 int saveop = op; 3321 int saveop = op;
3305 3362
3306 XFree (value); 3363 XFree (value);
3307 } 3364 }
3308 else 3365 else
3309 { 3366 {
3310 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3311 3368
3312 if (eq) 3369 if (eq)
3313 { 3370 {
3314 *eq = 0; 3371 *eq = 0;
3315 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3336 *buf++ = '\0'; 3393 *buf++ = '\0';
3337 3394
3338 process_color_seq (op, color, name, resp); 3395 process_color_seq (op, color, name, resp);
3339 } 3396 }
3340 break; 3397 break;
3398 case Rxvt_restoreFG:
3341 case XTerm_Color00: 3399 case XTerm_Color00:
3342 process_color_seq (op, Color_fg, str, resp); 3400 process_color_seq (op, Color_fg, str, resp);
3343 break; 3401 break;
3402 case Rxvt_restoreBG:
3344 case XTerm_Color01: 3403 case XTerm_Color01:
3345 process_color_seq (op, Color_bg, str, resp); 3404 process_color_seq (op, Color_bg, str, resp);
3346 break; 3405 break;
3347#ifndef NO_CURSORCOLOR 3406#ifndef NO_CURSORCOLOR
3348 case XTerm_Color_cursor: 3407 case XTerm_Color_cursor:
3353 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3354 break; 3413 break;
3355 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3356 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3357 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3358#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3359 case XTerm_Color_RV:
3360 process_color_seq (op, Color_RV, str, resp);
3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3365 break; 3428 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3369 break; 3431 break;
3370 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3372 break; 3434 break;
3373#endif 3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3374#if ENABLE_TRANSPARENCY 3439#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3377 { 3442 {
3378 bool changed = false; 3443 bool changed = false;
3444
3379 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3381 else 3447
3382 changed = bgPixmap.unset_tint ();
3383 if (changed) 3448 if (changed)
3384 update_background (); 3449 update_background ();
3385 } 3450 }
3386 3451
3387 break; 3452 break;
3391 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3392 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3393 { 3458 {
3394 char str[256]; 3459 char str[256];
3395 3460
3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3400 } 3465 }
3401 else 3466 else
3402 { 3467 {
3403 int changed = 0; 3468 int changed = 0;
3404 3469
3405 if (*str != ';') 3470 if (*str != ';')
3406 { 3471 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3410 changed++; 3474 changed++;
3411 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3412 if (str == NULL) 3476 if (str == NULL)
3413 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3414 } 3481 }
3415 while (str) 3482 else
3416 { 3483 {
3417 str++; 3484 str++;
3418 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3419 changed++; 3486 changed++;
3420 str = strchr (str, ';');
3421 } 3487 }
3488
3422 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3423 update_background (); 3497 update_background ();
3498 }
3424 } 3499 }
3425 break; 3500 break;
3426#endif 3501#endif
3427
3428 case Rxvt_restoreFG:
3429 set_window_color (Color_fg, str);
3430 break;
3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434 3502
3435 case XTerm_logfile: 3503 case XTerm_logfile:
3436 // TODO, when secure mode? 3504 // TODO, when secure mode?
3437 break; 3505 break;
3438 3506
3505 break; 3573 break;
3506#endif 3574#endif
3507 3575
3508#if ENABLE_PERL 3576#if ENABLE_PERL
3509 case URxvt_perl: 3577 case URxvt_perl:
3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3511 ; // no responses yet
3512 break; 3579 break;
3513#endif 3580#endif
3514 } 3581 }
3515} 3582}
3516/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
3539 { 3606 {
3540 if (mode == 'r') 3607 if (mode == 'r')
3541 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3542 else 3609 else
3543 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3544 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3545 } 3613 }
3546 3614
3547 return state; 3615 return state;
3548} 3616}
3549 3617
3557 static const struct 3625 static const struct
3558 { 3626 {
3559 const int argval; 3627 const int argval;
3560 const unsigned long bit; 3628 const unsigned long bit;
3561 } argtopriv[] = { 3629 } argtopriv[] = {
3562 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3563 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3564 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3565 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3566 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3567 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3568 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3569 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3570 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3571 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3572 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3573#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3574 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3575#endif 3644#endif
3576 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3577 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3578 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3579 // 45 margin bell NYI 3649 // 45 margin bell NYI
3580 // 46 start logging 3650 // 46 start logging
3581 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3582 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3583#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3584 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3585#endif 3655#endif
3586 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3587 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3591 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3592 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3593 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3674 { 2004, PrivMode_BracketPaste },
3598 }; 3675 };
3599 3676
3600 if (nargs == 0) 3677 if (nargs == 0)
3601 return; 3678 return;
3602 3679
3609 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3610 { 3687 {
3611 state = -1; 3688 state = -1;
3612 3689
3613 /* basic handling */ 3690 /* basic handling */
3614 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3615 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3616 { 3693 {
3617 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3618 break; 3695 break;
3619 } 3696 }
3627 3704
3628 scr_touch (true); 3705 scr_touch (true);
3629 break; 3706 break;
3630#endif 3707#endif
3631 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3632 case 1049:
3633 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3634 if (mode == 0) 3710 if (mode == 0)
3635 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3636 else if (mode == 1) 3712 else if (mode == 1)
3637 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
3646 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
3647 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
3648 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
3649 * within VT52 mode 3725 * within VT52 mode
3650 */ 3726 */
3651 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
3652 break; 3728 break;
3653 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3656 break; 3732 break;
3657 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3659 break; 3735 break;
3660 case 5: /* reverse video */ 3736 case 5: /* reverse video */
3671 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3673 break; 3749 break;
3674#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
3675 case scrollBar_esc: 3751 case scrollBar_esc:
3676 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
3677 { 3753 {
3678 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
3679 scr_touch (true); 3755 scr_touch (true);
3680 } 3756 }
3681 break; 3757 break;
3698 case 1003: 3774 case 1003:
3699 if (state) 3775 if (state)
3700 { 3776 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3703 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3704 } 3781 }
3705 else 3782 else
3706 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3784
3707 vt_select_input (); 3785 vt_select_input ();
3708 break; 3786 break;
3709 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3710 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3711 break; 3789 break;
3712 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3713 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3714 break; 3792 break;
3715 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3716 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3717 if (current_screen != PRIMARY) 3795 if (!state)
3718 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3719 scr_change_screen (state); 3798 scr_change_screen (state);
3720 break; 3799 break;
3721 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
3722 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3723 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3808 if (state)
3725 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3726 break; 3812 break;
3727 default: 3813 default:
3728 break; 3814 break;
3729 } 3815 }
3730 } 3816 }
3924 4010
3925/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
3926/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* Write data to the pty as typed by the user, pasted with the mouse,
3927 * or generated by us in response to a query ESC sequence. 4013 * or generated by us in response to a query ESC sequence.
3928 */ 4014 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930 4016
3931void 4017void
3932rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
3933{ 4019{
3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3946 4032
3947 data += written; 4033 data += written;
3948 len -= written; 4034 len -= written;
3949 } 4035 }
3950 4036
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3952 4038
3953 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len; 4040 v_buflen += len;
3955 4041
3956 pty_ev.set (ev::READ | ev::WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines