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.386 by ayin, Fri Dec 28 11:02:31 2007 UTC vs.
Revision 1.467 by sf-exg, Tue Dec 21 10:37:42 2010 UTC

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-2007 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 + hex 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 {
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 (bgPixmap.flags & bgPixmap_t::hasChanged)
990 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
991// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
992 scr_touch (false); 984 scr_touch (false);
993 } 985 }
994#endif 986#endif
995 987
1032 } 1024 }
1033 while (row < end_row); 1025 while (row < end_row);
1034 } 1026 }
1035 1027
1036 scr_refresh (); 1028 scr_refresh ();
1037 scrollbar_show (1); 1029 scrollBar.show (1);
1038#ifdef USE_XIM 1030#ifdef USE_XIM
1039 IMSendSpot (); 1031 IMSendSpot ();
1040#endif 1032#endif
1041 } 1033 }
1042 1034
1043 display->flush (); 1035 display->flush ();
1044} 1036}
1045 1037
1046/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1047void 1039void
1048rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1049{ 1041{
1050 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1078{ 1070{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1072 {
1081 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1082 want_refresh = 1; 1074 want_refresh = 1;
1083 refresh_check (); 1075 refresh_check ();
1084 } 1076 }
1085 else 1077 else
1086 w.stop (); 1078 w.stop ();
1087} 1079}
1088#endif 1080#endif
1089 1081
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1083void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1085{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1088 {
1097 want_refresh = 1; 1089 want_refresh = 1;
1098 refresh_check (); 1090 refresh_check ();
1099 } 1091 }
1100 else 1092 else
1144 { 1136 {
1145 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1149 1144
1150 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1151 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1152 1147
1153 w.stop (); 1148 w.stop ();
1154 } 1149 }
1155 1150
1205{ 1200{
1206 make_current (); 1201 make_current ();
1207 1202
1208 if (revents & ev::READ) 1203 if (revents & ev::READ)
1209 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1210 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1211 if (cmd_parse ()) 1206 cmd_parse ();
1212 break;
1213 1207
1214 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1215 pty_write (); 1209 pty_write ();
1216 1210
1217 refresh_check (); 1211 refresh_check ();
1258{ 1252{
1259 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1260 int x, y; 1254 int x, y;
1261 int code = 32; 1255 int code = 32;
1262 1256
1263 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1264 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1265 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1266 { 1261 {
1267 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1268 return; 1263 return;
1264
1269 mouse_row = x; 1265 mouse_row = x;
1270 mouse_col = y; 1266 mouse_col = y;
1271 code += 32; 1267 code += 32;
1272 } 1268 }
1273 1269
1276 else 1272 else
1277 { 1273 {
1278 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1279 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1280 if (button_number >= 3) 1276 if (button_number >= 3)
1281 button_number += (64 - 3); 1277 button_number += 64 - 3;
1282 } 1278 }
1283 1279
1284 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1285 { 1281 {
1286 /* 1282 /*
1318 fputc ('A', stderr); 1314 fputc ('A', stderr);
1319 if (key_state & 32) 1315 if (key_state & 32)
1320 fputc ('2', stderr); 1316 fputc ('2', stderr);
1321 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1322 button_number, 1318 button_number,
1323 x + 1, 1319 x,
1324 y + 1); 1320 y);
1325#endif 1321#endif
1326 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1327 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1328 (code + button_number + key_state), 1337 code + button_number + key_state,
1329 (32 + x + 1), 1338 32 + x,
1330 (32 + y + 1)); 1339 32 + y);
1331} 1340}
1332 1341
1333/*{{{ process an X event */ 1342/*{{{ process an X event */
1334void 1343void
1335rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
1437 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1447 focus_out ();
1439 break; 1448 break;
1440 1449
1441 case ConfigureNotify: 1450 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1445 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1446 { 1452 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1449 1474
1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451 { 1476 {
1452 seen_resize = 1; 1477 seen_resize = 1;
1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454 } 1479 }
1455 else 1480 else
1456 { 1481 {
1457#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1484 {
1485 if (mapped)
1459 update_background (); 1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1460#endif 1490#endif
1461 } 1491 }
1462 1492
1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1494 }
1471 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1472 1502
1473 break; 1503 break;
1474 1504
1475 case SelectionClear: 1505 case SelectionClear:
1476 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1477 break; 1507 break;
1478 1508
1479 case SelectionNotify: 1509 case SelectionNotify:
1480 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 case SelectionRequest: 1514 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1486 break; 1516 break;
1487 1517
1488 case MapNotify: 1518 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1489 mapped = 1; 1535 mapped = 1;
1490#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1491 text_blink_ev.start (); 1537 text_blink_ev.start ();
1492#endif 1538#endif
1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1530 ; 1576 ;
1531 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1578 ;
1533 1579
1534 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1535 { 1581 {
1536 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1537 scrollbar_show (0); 1583 scrollBar.show (0);
1538 } 1584 }
1539 } 1585 }
1540 break; 1586 break;
1541 1587
1542 case MotionNotify: 1588 case MotionNotify:
1629#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1630 } 1676 }
1631#endif 1677#endif
1632 } 1678 }
1633 } 1679 }
1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1635 { 1681 {
1636 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1637 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1638 ; 1684 ;
1639 1685
1641 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1642 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1643 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1644 &unused_mask); 1690 &unused_mask);
1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1646 scrollbar_size ()); 1692 scrollBar.size ());
1647 want_refresh = 1; 1693 want_refresh = 1;
1648 scrollbar_show (1); 1694 scrollBar.show (1);
1649 } 1695 }
1650 break; 1696 break;
1651 } 1697 }
1652 1698
1653#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1678#endif 1724#endif
1679 1725
1680 refresh_check (); 1726 refresh_check ();
1681} 1727}
1682 1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1744
1683void 1745void
1684rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1685{ 1747{
1686 if (!focus) 1748 if (!focus)
1687 { 1749 {
1688 focus = 1; 1750 focus = 1;
1689 want_refresh = 1; 1751 want_refresh = 1;
1690
1691 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1692 1752
1693#if USE_XIM 1753#if USE_XIM
1694 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1695 { 1755 {
1696 IMSetPosition (); 1756 IMSetPosition ();
1708 scr_recolour (); 1768 scr_recolour ();
1709 } 1769 }
1710#endif 1770#endif
1711#if ENABLE_FRILLS 1771#if ENABLE_FRILLS
1712 if (option (Opt_urgentOnBell)) 1772 if (option (Opt_urgentOnBell))
1713 { 1773 set_urgency (0);
1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1715 {
1716 h->flags &= ~XUrgencyHint;
1717 XSetWMHints (dpy, parent[0], h);
1718 }
1719 }
1720#endif 1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1721 } 1777 }
1722} 1778}
1723 1779
1724void 1780void
1725rxvt_term::focus_out () 1781rxvt_term::focus_out ()
1727 if (focus) 1783 if (focus)
1728 { 1784 {
1729 focus = 0; 1785 focus = 0;
1730 want_refresh = 1; 1786 want_refresh = 1;
1731 1787
1732 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1733 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1734#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1735 if (iso14755buf) 1793 if (iso14755buf)
1736 { 1794 {
1737 iso14755buf = 0; 1795 iso14755buf = 0;
1738# if ISO_14755 1796# if ISO_14755
1755 { 1813 {
1756 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1757 scr_recolour (); 1815 scr_recolour ();
1758 } 1816 }
1759#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760 } 1820 }
1761} 1821}
1762 1822
1763void 1823void
1764rxvt_term::update_fade_color (unsigned int idx) 1824rxvt_term::update_fade_color (unsigned int idx)
1841 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1842 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1843#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1844 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1845 { 1905 {
1846 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1847 MEvent.clicks++; 1907 MEvent.clicks++;
1848 1908
1849 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1850 { 1910 {
1851 /* only report double clicks */ 1911 /* only report double clicks */
1923 } 1983 }
1924 1984
1925 /* 1985 /*
1926 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1927 */ 1987 */
1928 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1929 { 1989 {
1930 scrollBar.setIdle (); 1990 page_dirn direction = NO_DIR;
1991
1992 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */
1996
1997 scrollBar.state = STATE_IDLE;
1931 /* 1998 /*
1932 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1933 * move up if mouse is above slider 2000 * move up if mouse is above slider
1934 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1935 * 2002 *
1944 /* 2011 /*
1945 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1946 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1947 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1948 */ 2015 */
1949 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1950 && scrollbarnext_upButton (ev.y))
1951 || (scrollBar.style == R_SB_RXVT
1952 && scrollbarrxvt_upButton (ev.y)))
1953 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1954 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1955 && scrollbarnext_dnButton (ev.y))
1956 || (scrollBar.style == R_SB_RXVT
1957 && scrollbarrxvt_dnButton (ev.y)))
1958 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
1959 else 2020 else
1960 switch (ev.button) 2021 switch (ev.button)
1961 { 2022 {
1962 case Button2: 2023 case Button2:
1970 break; 2031 break;
1971 } 2032 }
1972 } 2033 }
1973 else 2034 else
1974#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
1975
1976 {
1977 char upordown = 0;
1978
1979 if (scrollBar.style == R_SB_NEXT)
1980 { 2036 {
1981 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
1982 upordown = -1; /* up */
1983 else if (scrollbarnext_dnButton (ev.y))
1984 upordown = 1; /* down */
1985 }
1986 else if (scrollBar.style == R_SB_RXVT)
1987 {
1988 if (scrollbarrxvt_upButton (ev.y))
1989 upordown = -1; /* up */
1990 else if (scrollbarrxvt_dnButton (ev.y))
1991 upordown = 1; /* down */
1992 }
1993
1994 if (upordown)
1995 { 2038 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ()) 2040 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2042#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
2001 { 2044 {
2002 if (upordown < 0) 2045 if (direction == UP)
2003 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
2004 else 2047 else
2005 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
2006 } 2049 }
2007 } 2050 }
2008 else 2051 else
2009 switch (ev.button) 2052 switch (ev.button)
2010 { 2053 {
2011 case Button2: 2054 case Button2:
2012 switch (scrollbar_align) 2055 switch (scrollBar.align)
2013 { 2056 {
2014 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2058 csrO = 0;
2016 break; 2059 break;
2017 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
2023 } 2066 }
2024 2067
2025 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2029 2072
2030 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2031 break; 2074 break;
2032 2075
2033 case Button1: 2076 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2037 2080
2038 case Button3: 2081 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
2049 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2050# else 2093# else
2051 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2052# endif 2095# endif
2053 else 2096 else
2054 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2055 } 2098 }
2056 else 2099 else
2057 { 2100 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2102 (nrow
2060 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2061 / scrollbar_size ())); 2104 / scrollBar.size ()));
2062 } 2105 }
2063 2106
2064 break; 2107 break;
2065 } 2108 }
2066 } 2109 }
2076 2119
2077 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2121 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2123
2081 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2125 {
2083 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2127 scrollBar.show (0);
2085 } 2128 }
2086 2129
2087#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2088 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2089#endif 2132#endif
2139 selection_make (ev.time); 2182 selection_make (ev.time);
2140 break; 2183 break;
2141 2184
2142 case Button2: 2185 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2188 break;
2146 2189
2147#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2148 case Button4: 2191 case Button4:
2149 case Button5: 2192 case Button5:
2169 2212
2170 if (!slip_wheel_ev.is_active ()) 2213 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172 } 2215 }
2173 else 2216 else
2217# endif
2174 { 2218 {
2175# endif
2176 scr_page (v, i); 2219 scr_page (v, i);
2177 scrollbar_show (1); 2220 scrollBar.show (1);
2178# ifdef MOUSE_SLIP_WHEELING
2179 } 2221 }
2180# endif
2181 } 2222 }
2182 break; 2223 break;
2183#endif 2224#endif
2184 } 2225 }
2185 } 2226 }
2186} 2227}
2187 2228
2188/*}}} */ 2229/*}}} */
2189 2230
2190bool 2231void
2191rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2192{ 2233{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2196 2236
2197 for (;;) 2237 for (;;)
2198 { 2238 {
2199 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2200 { 2240 {
2201 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2242 ch = next_char ();
2203 2243
2204 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2205 break; 2245 break;
2206 } 2246 }
2207 2247
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2249 {
2210 if (!seen_input) 2250 if (expect_false (!seen_input))
2211 { 2251 {
2212 seen_input = 1; 2252 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
2228 wchar_t *str = buf; 2268 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2270
2231 for (;;) 2271 for (;;)
2232 { 2272 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2274 break;
2235 2275
2236 *str++ = ch; 2276 *str++ = ch;
2237 2277
2238 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2279 {
2240 if (ch == C0_LF) 2280 if (ch == C0_LF)
2241 nlines++; 2281 nlines++;
2242 2282
2243 refresh_count++; 2283 refresh_count++;
2292 * What the heck we'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2294 */ 2334 */
2295 if (refreshnow) 2335 if (refreshnow)
2296 { 2336 {
2297 flag = true;
2298 scr_refresh (); 2337 scr_refresh ();
2299 want_refresh = 1; 2338 want_refresh = 1;
2300 } 2339 }
2301
2302 } 2340 }
2303 else 2341 else
2304 { 2342 {
2305 try 2343 try
2306 { 2344 {
2314 } 2352 }
2315 2353
2316 ch = NOCHAR; 2354 ch = NOCHAR;
2317 } 2355 }
2318 } 2356 }
2319
2320 return flag;
2321} 2357}
2322 2358
2323// read the next character 2359// read the next character
2324wchar_t 2360wchar_t
2325rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2326{ 2362{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2364 {
2329 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2332 2368
2333 wchar_t wc; 2369 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2371
2339 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2376 break;
2341 } 2377 }
2342 2378
2343 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2345 2384
2346 // assume wchar == unicode 2385 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2349 } 2388 }
2393/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2395FILE * 2434FILE *
2396rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2397{ 2436{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2438
2400 if (stream == NULL) 2439 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2441
2403 return stream; 2442 return stream;
2414 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2415 */ 2454 */
2416void 2455void
2417rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2418{ 2457{
2419 int done; 2458 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2459
2422 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2423 return; 2461 return;
2424 2462
2425 /* 2463 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2465 * is received.
2428 */ 2466 */
2429 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2430 { 2468 {
2431 unsigned char buf[8]; 2469 unsigned char buf[8];
2432 unicode_t ch; 2470 unicode_t ch;
2433 unsigned int i, len; 2471 unsigned int i, len;
2434 2472
2579 break; 2617 break;
2580 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2620 break;
2583 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
2585 break; 2623 break;
2586 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2588 /* unimplemented */ 2626 /* unimplemented */
2589 break; 2627 break;
2643 scr_forwardindex (); 2681 scr_forwardindex ();
2644 break; 2682 break;
2645#endif 2683#endif
2646 case '=': 2684 case '=':
2647 case '>': 2685 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2687 break;
2650 2688
2651 case C1_40: 2689 case C1_40:
2652 cmd_getc (); 2690 cmd_getc ();
2653 break; 2691 break;
2657 2695
2658 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2660 { 2698 {
2661 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2663 } 2701 }
2664 break; 2702 break;
2665 2703
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2696 2734
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2737 process_csi_seq ();
2700 break; 2738 break;
2701 2739
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2742 process_osc_seq ();
2705 break; 2743 break;
2706 2744
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2746 case 'c':
2709 mbstate.reset (); 2747 mbstate.reset ();
2710 scr_poweron (); 2748 scr_poweron ();
2711 scrollbar_show (1); 2749 scrollBar.show (1);
2712 break; 2750 break;
2713 2751
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2753 case 'n':
2716 scr_charset_choose (2); 2754 scr_charset_choose (2);
2736 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2737 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2738 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2739}; 2777};
2740 2778
2741#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2742 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2743 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2744#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2745 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2746 2784
2747const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2748 { 2786 {
2749 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2750 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2751 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2752 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2767 2805
2768 nargs = 0; 2806 nargs = 0;
2769 2807
2770 priv = 0; 2808 priv = 0;
2771 ch = cmd_getc (); 2809 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2811 {
2774 /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2813 priv = ch;
2776 ch = cmd_getc (); 2814 ch = cmd_getc ();
2777 } 2815 }
2778 2816
2779 /* read any numerical arguments */ 2817 /* read any numerical arguments */
2828 // versions. 2866 // versions.
2829 // 2867 //
2830 tt_printf ("\033[>%d;95;0c", 'U'); 2868 tt_printf ("\033[>%d;95;0c", 'U');
2831 } 2869 }
2832 break; 2870 break;
2871
2833 case '?': 2872 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2837 } 2888 }
2889 break;
2890 }
2891
2838 return; 2892 return;
2839 } 2893 }
2840 2894
2841 switch (ch) 2895 switch (ch)
2842 { 2896 {
3209 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3210 */ 3264 */
3211void 3265void
3212rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3213{ 3267{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3268 /*
3218 * Not handled yet 3269 * Not handled yet
3219 */ 3270 */
3271
3272 unicode_t eh;
3220 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3221 if (s) 3274 if (s)
3222 free (s); 3275 free (s);
3223 3276
3224 return; 3277 return;
3225} 3278}
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3283 */
3231void 3284void
3232rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3233{ 3286{
3234 unicode_t ch, eh;
3235 int arg; 3287 int arg;
3236 3288
3237 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3240 3292
3241 if (ch == ';') 3293 if (ch == ';')
3242 { 3294 {
3295 unicode_t eh;
3243 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3244 3297
3245 if (s) 3298 if (s)
3246 { 3299 {
3247 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
3322 3375
3323 XFree (value); 3376 XFree (value);
3324 } 3377 }
3325 else 3378 else
3326 { 3379 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3328 3381
3329 if (eq) 3382 if (eq)
3330 { 3383 {
3331 *eq = 0; 3384 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3353 *buf++ = '\0'; 3406 *buf++ = '\0';
3354 3407
3355 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3356 } 3409 }
3357 break; 3410 break;
3411 case Rxvt_restoreFG:
3358 case XTerm_Color00: 3412 case XTerm_Color00:
3359 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3360 break; 3414 break;
3415 case Rxvt_restoreBG:
3361 case XTerm_Color01: 3416 case XTerm_Color01:
3362 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3363 break; 3418 break;
3364#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3365 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3370 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3371 break; 3426 break;
3372 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3373 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3374 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3375#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3376 case XTerm_Color_RV:
3377 process_color_seq (op, Color_RV, str, resp);
3378 break;
3379 case Rxvt_Color_BD:
3380 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3381 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3382 break; 3441 break;
3383 case Rxvt_Color_UL:
3384 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3385 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3386 break; 3444 break;
3387 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3388 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3389 break; 3447 break;
3390#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3391#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3392 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3393 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3394 { 3455 {
3395 bool changed = false; 3456 bool changed = false;
3410 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3411 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3412 { 3473 {
3413 char str[256]; 3474 char str[256];
3414 3475
3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST); 3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3419 } 3480 }
3420 else 3481 else
3421 { 3482 {
3422 int changed = 0; 3483 int changed = 0;
3423 3484
3424 if (*str != ';') 3485 if (*str != ';')
3425 { 3486 {
3426 /* reset to default scaling :*/
3427 bgPixmap.unset_geometry ();
3428 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3429 changed++; 3489 changed++;
3430 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3431 if (str == NULL) 3491 if (str == NULL)
3432 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3433 } 3496 }
3434 3497 else
3435 while (str)
3436 { 3498 {
3437 str++; 3499 str++;
3438 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3439 changed++; 3501 changed++;
3440 str = strchr (str, ';');
3441 } 3502 }
3442 3503
3443 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3444 update_background (); 3512 update_background ();
3513 }
3445 } 3514 }
3446 break; 3515 break;
3447#endif 3516#endif
3448
3449 case Rxvt_restoreFG:
3450 set_window_color (Color_fg, str);
3451 break;
3452 case Rxvt_restoreBG:
3453 set_window_color (Color_bg, str);
3454 break;
3455 3517
3456 case XTerm_logfile: 3518 case XTerm_logfile:
3457 // TODO, when secure mode? 3519 // TODO, when secure mode?
3458 break; 3520 break;
3459 3521
3526 break; 3588 break;
3527#endif 3589#endif
3528 3590
3529#if ENABLE_PERL 3591#if ENABLE_PERL
3530 case URxvt_perl: 3592 case URxvt_perl:
3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 ; // no responses yet
3533 break; 3594 break;
3534#endif 3595#endif
3535 } 3596 }
3536} 3597}
3537/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3560 { 3621 {
3561 if (mode == 'r') 3622 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3624 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
3566 } 3628 }
3567 3629
3568 return state; 3630 return state;
3569} 3631}
3570 3632
3578 static const struct 3640 static const struct
3579 { 3641 {
3580 const int argval; 3642 const int argval;
3581 const unsigned long bit; 3643 const unsigned long bit;
3582 } argtopriv[] = { 3644 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3585 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3593 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3659#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3664 // 45 margin bell NYI
3601 // 46 start logging 3665 // 46 start logging
3602 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3604#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3670#endif
3607 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3611 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3612 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3613 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3614 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3689 { 2004, PrivMode_BracketPaste },
3619 }; 3690 };
3620 3691
3621 if (nargs == 0) 3692 if (nargs == 0)
3622 return; 3693 return;
3623 3694
3630 for (i = 0; i < nargs; i++) 3701 for (i = 0; i < nargs; i++)
3631 { 3702 {
3632 state = -1; 3703 state = -1;
3633 3704
3634 /* basic handling */ 3705 /* basic handling */
3635 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3636 if (argtopriv[j].argval == arg[i]) 3707 if (argtopriv[j].argval == arg[i])
3637 { 3708 {
3638 state = privcases (mode, argtopriv[j].bit); 3709 state = privcases (mode, argtopriv[j].bit);
3639 break; 3710 break;
3640 } 3711 }
3648 3719
3649 scr_touch (true); 3720 scr_touch (true);
3650 break; 3721 break;
3651#endif 3722#endif
3652 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3653 case 1049:
3654 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3655 if (mode == 0) 3725 if (mode == 0)
3656 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3657 else if (mode == 1) 3727 else if (mode == 1)
3658 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
3667 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
3668 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
3669 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
3670 * within VT52 mode 3740 * within VT52 mode
3671 */ 3741 */
3672 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
3673 break; 3743 break;
3674 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3675 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3676 set_widthheight (((state ? 132 : 80) * fwidth), height); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677 break; 3747 break;
3678 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3680 break; 3750 break;
3681 case 5: /* reverse video */ 3751 case 5: /* reverse video */
3692 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3764 break;
3695#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
3696 case scrollBar_esc: 3766 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
3698 { 3768 {
3699 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3770 scr_touch (true);
3701 } 3771 }
3702 break; 3772 break;
3719 case 1003: 3789 case 1003:
3720 if (state) 3790 if (state)
3721 { 3791 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3724 vt_emask_mouse = PointerMotionMask; 3795 vt_emask_mouse = PointerMotionMask;
3725 } 3796 }
3726 else 3797 else
3727 vt_emask_mouse = NoEventMask; 3798 vt_emask_mouse = NoEventMask;
3799
3728 vt_select_input (); 3800 vt_select_input ();
3729 break; 3801 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3803 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3804 break;
3733 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3806 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3807 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3810 if (!state)
3739 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
3740 scr_change_screen (state); 3813 scr_change_screen (state);
3741 break; 3814 break;
3742 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
3743 scr_change_screen (state); 3820 scr_change_screen (state);
3821
3744 if (option (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3823 if (state)
3746 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
3747 break; 3827 break;
3748 default: 3828 default:
3749 break; 3829 break;
3750 } 3830 }
3751 } 3831 }
3945 4025
3946/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
3947/* Write data to the pty as typed by the user, pasted with the mouse, 4027/* Write data to the pty as typed by the user, pasted with the mouse,
3948 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
3949 */ 4029 */
3950const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3951 4031
3952void 4032void
3953rxvt_term::tt_write (const char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
3954{ 4034{
3955 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines