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.397 by root, Sat Jan 26 11:40:47 2008 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 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-2007 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
552 { 658 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 660 case XK_BackSpace:
555#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 662 {
557 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 665 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 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;
572 692
573 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:
574 { 773 {
575 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
577 } 779 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 780 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
795 785
796 /* 786 /*
797 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
798 */ 788 */
799#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
899 commit_iso14755 (); 889 commit_iso14755 ();
900 890
901 return; 891 return;
902 } 892 }
903 893
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 895 if (i[0] == keysym)
906 { 896 {
907 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 898 commit_iso14755 ();
909 899
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
948#endif 938#endif
949} 939}
950 940
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 941void
985rxvt_term::flush () 942rxvt_term::flush ()
986{ 943{
987 flush_ev.stop (); 944 flush_ev.stop ();
988 945
989#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
991 { 948 {
992// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 950 scr_touch (false);
994 } 951 }
995#endif 952#endif
996 953
997 if (want_refresh) 954 if (want_refresh)
… …
1033 } 990 }
1034 while (row < end_row); 991 while (row < end_row);
1035 } 992 }
1036 993
1037 scr_refresh (); 994 scr_refresh ();
1038 scrollbar_show (1); 995 scrollBar.show (1);
1039#ifdef USE_XIM 996#ifdef USE_XIM
1040 IMSendSpot (); 997 IMSendSpot ();
1041#endif 998#endif
1042 } 999 }
1043 1000
1044 display->flush (); 1001 display->flush ();
1045} 1002}
1046 1003
1047/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1048void 1005void
1049rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1050{ 1007{
1051 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1090 1047
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1049void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1051{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1054 {
1098 want_refresh = 1; 1055 want_refresh = 1;
1099 refresh_check (); 1056 refresh_check ();
1100 } 1057 }
1101 else 1058 else
… …
1145 { 1102 {
1146 // this should really be sched_yield(), but the linux guys thought 1103 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1104 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is 1105 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1106 // allowed by the sus... as is returning ENOSYS.
1107 // since the linux guys additionally thought that breaking the only
1108 // known workaround against their unusable sched_yield hack is cool,
1109 // we just nanosleep a bit and hope for the best.
1150 1110
1151 struct timespec ts = { 0, 0 }; 1111 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1153 1113
1154 w.stop (); 1114 w.stop ();
1155 } 1115 }
1156 1116
… …
1159 { 1119 {
1160 } 1120 }
1161} event_handler; 1121} event_handler;
1162#endif 1122#endif
1163 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1164bool 1157bool
1165rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1166{ 1159{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1168 1161
1169 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1163
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1172 n = 0;
1173 } 1165 {
1174 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1178 1171
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1173
1181 if (r > 0) 1174 if (r > 0)
1182 { 1175 {
1183 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1184 return true; 1177 return true;
… …
1206{ 1199{
1207 make_current (); 1200 make_current ();
1208 1201
1209 if (revents & ev::READ) 1202 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1205 cmd_parse ();
1213 break;
1214 1206
1215 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1216 pty_write (); 1208 pty_write ();
1217 1209
1218 refresh_check (); 1210 refresh_check ();
… …
1259{ 1251{
1260 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1261 int x, y; 1253 int x, y;
1262 int code = 32; 1254 int code = 32;
1263 1255
1264 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1266 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1267 { 1260 {
1268 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1269 return; 1262 return;
1263
1270 mouse_row = x; 1264 mouse_row = x;
1271 mouse_col = y; 1265 mouse_col = y;
1272 code += 32; 1266 code += 32;
1273 } 1267 }
1274 1268
… …
1277 else 1271 else
1278 { 1272 {
1279 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1275 if (button_number >= 3)
1282 button_number += (64 - 3); 1276 button_number += 64 - 3;
1283 } 1277 }
1284 1278
1285 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1286 { 1280 {
1287 /* 1281 /*
… …
1319 fputc ('A', stderr); 1313 fputc ('A', stderr);
1320 if (key_state & 32) 1314 if (key_state & 32)
1321 fputc ('2', stderr); 1315 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1317 button_number,
1324 x + 1, 1318 x,
1325 y + 1); 1319 y);
1326#endif 1320#endif
1327 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1328 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1336 code + button_number + key_state,
1330 (32 + x + 1), 1337 32 + x,
1331 (32 + y + 1)); 1338 32 + y);
1332} 1339}
1333 1340
1334/*{{{ process an X event */ 1341/*{{{ process an X event */
1335void 1342void
1336rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1438 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1446 focus_out ();
1440 break; 1447 break;
1441 1448
1442 case ConfigureNotify: 1449 case ConfigureNotify:
1443 fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height);
1446 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1447 { 1451 {
1448 //while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1450 1473
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1475 {
1453 seen_resize = 1; 1476 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1478 }
1456 else 1479 else
1457 { 1480 {
1458#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1460 { 1483 {
1461 if (mapped) 1484 if (mapped)
1462 update_background (); 1485 update_background ();
1463 else 1486 else
1464 bgPixmap.invalidate (); 1487 bg_invalidate ();
1465 } 1488 }
1466#endif 1489#endif
1467 } 1490 }
1468 1491
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1493 }
1471 break; 1494 break;
1472 1495
1473 case PropertyNotify: 1496 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1498 break;
1480 1499
1481 case SelectionClear: 1500 case SelectionClear:
1482 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1502 break;
1489 1503
1490 case SelectionRequest: 1504 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1492 break; 1506 break;
1493 1507
1494 case MapNotify: 1508 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1510 /* This is needed specifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1514 * reparenting.
1501 * We should not render background immidiately, as there could be several 1515 * We should not render background immediately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1507 */ 1521 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1509 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1510#endif 1524#endif
1511 mapped = 1; 1525 mapped = 1;
1512#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1528 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1529 { 1543 {
1530 do 1544 do
1531 { 1545 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1548 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1550
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1552
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1554 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1557 }
1544 1558
1545 want_refresh = 1; 1559 want_refresh = 1;
1546 } 1560 }
1547 else 1561 else
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1568 ;
1555 1569
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1571 {
1558 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1573 scrollBar.show (0);
1560 } 1574 }
1561 } 1575 }
1562 break; 1576 break;
1563 1577
1564 case MotionNotify: 1578 case MotionNotify:
… …
1651#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1652 } 1666 }
1653#endif 1667#endif
1654 } 1668 }
1655 } 1669 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1671 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1660 ; 1674 ;
1661 1675
… …
1663 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1680 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1682 scrollBar.size ());
1669 want_refresh = 1; 1683 want_refresh = 1;
1670 scrollbar_show (1); 1684 scrollBar.show (1);
1671 } 1685 }
1672 break; 1686 break;
1673 } 1687 }
1674 1688
1675#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
… …
1700#endif 1714#endif
1701 1715
1702 refresh_check (); 1716 refresh_check ();
1703} 1717}
1704 1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1734
1705void 1735void
1706rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1707{ 1737{
1708 if (!focus) 1738 if (!focus)
1709 { 1739 {
1710 focus = 1; 1740 focus = 1;
1711 want_refresh = 1; 1741 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1742
1715#if USE_XIM 1743#if USE_XIM
1716 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1717 { 1745 {
1718 IMSetPosition (); 1746 IMSetPosition ();
… …
1730 scr_recolour (); 1758 scr_recolour ();
1731 } 1759 }
1732#endif 1760#endif
1733#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1735 { 1763 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1767 }
1744} 1768}
1745 1769
1746void 1770void
1747rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1749 if (focus) 1773 if (focus)
1750 { 1774 {
1751 focus = 0; 1775 focus = 0;
1752 want_refresh = 1; 1776 want_refresh = 1;
1753 1777
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1755 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1756#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1783 if (iso14755buf)
1758 { 1784 {
1759 iso14755buf = 0; 1785 iso14755buf = 0;
1760# if ISO_14755 1786# if ISO_14755
… …
1777 { 1803 {
1778 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1805 scr_recolour ();
1780 } 1806 }
1781#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1810 }
1783} 1811}
1784 1812
1785void 1813void
1786rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1814 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1815 */ 1843 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1846 {
1819 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1820 update_background (); 1848 update_background ();
1821 } 1849 }
1822 1850
1823 break; 1851 break;
1824 } 1852 }
… …
1863 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1867 { 1895 {
1868 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1869 MEvent.clicks++; 1897 MEvent.clicks++;
1870 1898
1871 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1872 { 1900 {
1873 /* only report double clicks */ 1901 /* only report double clicks */
… …
1947 /* 1975 /*
1948 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1949 */ 1977 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1979 {
1952 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1953 /* 1988 /*
1954 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1990 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1957 * 1992 *
… …
1966 /* 2001 /*
1967 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1970 */ 2005 */
1971 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
1981 else 2010 else
1982 switch (ev.button) 2011 switch (ev.button)
1983 { 2012 {
1984 case Button2: 2013 case Button2:
… …
1992 break; 2021 break;
1993 } 2022 }
1994 } 2023 }
1995 else 2024 else
1996#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 2026 {
2003 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015
2016 if (upordown)
2017 { 2028 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2030 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2032#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
2023 { 2034 {
2024 if (upordown < 0) 2035 if (direction == UP)
2025 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
2026 else 2037 else
2027 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
2028 } 2039 }
2029 } 2040 }
2030 else 2041 else
2031 switch (ev.button) 2042 switch (ev.button)
2032 { 2043 {
… …
2045 } 2056 }
2046 2057
2047 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051 2062
2052 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2053 break; 2064 break;
2054 2065
2055 case Button1: 2066 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
… …
2071 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2072# else 2083# else
2073 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2074# endif 2085# endif
2075 else 2086 else
2076 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2077 } 2088 }
2078 else 2089 else
2079 { 2090 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2092 (nrow
2082 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2083 / scrollbar_size ())); 2094 / scrollBar.size ()));
2084 } 2095 }
2085 2096
2086 break; 2097 break;
2087 } 2098 }
2088 } 2099 }
… …
2098 2109
2099 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2111 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2113
2103 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2115 {
2105 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2117 scrollBar.show (0);
2107 } 2118 }
2108 2119
2109#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2111#endif 2122#endif
… …
2161 selection_make (ev.time); 2172 selection_make (ev.time);
2162 break; 2173 break;
2163 2174
2164 case Button2: 2175 case Button2:
2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2167 break; 2178 break;
2168 2179
2169#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2170 case Button4: 2181 case Button4:
2171 case Button5: 2182 case Button5:
… …
2194 } 2205 }
2195 else 2206 else
2196# endif 2207# endif
2197 { 2208 {
2198 scr_page (v, i); 2209 scr_page (v, i);
2199 scrollbar_show (1); 2210 scrollBar.show (1);
2200 } 2211 }
2201 } 2212 }
2202 break; 2213 break;
2203#endif 2214#endif
2204 } 2215 }
2205 } 2216 }
2206} 2217}
2207 2218
2208/*}}} */ 2219/*}}} */
2209 2220
2210bool 2221void
2211rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2212{ 2223{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2216 2226
2217 for (;;) 2227 for (;;)
2218 { 2228 {
2219 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2220 { 2230 {
2221 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2232 ch = next_char ();
2223 2233
2224 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2225 break; 2235 break;
2226 } 2236 }
2227 2237
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2239 {
2230 if (!seen_input) 2240 if (expect_false (!seen_input))
2231 { 2241 {
2232 seen_input = 1; 2242 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2258 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2260
2251 for (;;) 2261 for (;;)
2252 { 2262 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2264 break;
2255 2265
2256 *str++ = ch; 2266 *str++ = ch;
2257 2267
2258 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2269 {
2260 if (ch == C0_LF) 2270 if (ch == C0_LF)
2261 nlines++; 2271 nlines++;
2262 2272
2263 refresh_count++; 2273 refresh_count++;
… …
2312 * What the heck we'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2314 */ 2324 */
2315 if (refreshnow) 2325 if (refreshnow)
2316 { 2326 {
2317 flag = true;
2318 scr_refresh (); 2327 scr_refresh ();
2319 want_refresh = 1; 2328 want_refresh = 1;
2320 } 2329 }
2321
2322 } 2330 }
2323 else 2331 else
2324 { 2332 {
2325 try 2333 try
2326 { 2334 {
… …
2334 } 2342 }
2335 2343
2336 ch = NOCHAR; 2344 ch = NOCHAR;
2337 } 2345 }
2338 } 2346 }
2339
2340 return flag;
2341} 2347}
2342 2348
2343// read the next character 2349// read the next character
2344wchar_t 2350wchar_t
2345rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2346{ 2352{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2354 {
2349 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2352 2358
2353 wchar_t wc; 2359 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2361
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2366 break;
2361 } 2367 }
2362 2368
2363 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2365 2374
2366 // assume wchar == unicode 2375 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2369 } 2378 }
… …
2380 : NOCHAR; 2389 : NOCHAR;
2381} 2390}
2382 2391
2383static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2384 2393
2385/* rxvt_cmd_getc () - Return next input character */
2386/*
2387 * Return the next input character after first passing any keyboard input
2388 * to the command.
2389 */
2390wchar_t 2394wchar_t
2391rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2392{ 2396{
2393 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2394 2398
… …
2413/*----------------------------------------------------------------------*/ 2417/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2418#ifdef PRINTPIPE
2415FILE * 2419FILE *
2416rxvt_term::popen_printer () 2420rxvt_term::popen_printer ()
2417{ 2421{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2423
2420 if (stream == NULL) 2424 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2425 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2426
2423 return stream; 2427 return stream;
… …
2434 * simulate attached vt100 printer 2438 * simulate attached vt100 printer
2435 */ 2439 */
2436void 2440void
2437rxvt_term::process_print_pipe () 2441rxvt_term::process_print_pipe ()
2438{ 2442{
2439 int done; 2443 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2444
2442 if ((fd = popen_printer ()) == NULL) 2445 if (!fd)
2443 return; 2446 return;
2444 2447
2445 /* 2448 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2449 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2450 * is received.
2448 */ 2451 */
2449 for (done = 0; !done;) 2452 for (int done = 0; !done; )
2450 { 2453 {
2451 unsigned char buf[8]; 2454 unsigned char buf[8];
2452 unicode_t ch; 2455 unicode_t ch;
2453 unsigned int i, len; 2456 unsigned int i, len;
2454 2457
… …
2599 break; 2602 break;
2600 case 'Z': /* identify the terminal type */ 2603 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2605 break;
2603 case '<': /* turn off VT52 mode */ 2606 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2607 set_privmode (PrivMode_vt52, 0);
2605 break; 2608 break;
2606 case 'F': /* use special graphics character set */ 2609 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2610 case 'G': /* use regular character set */
2608 /* unimplemented */ 2611 /* unimplemented */
2609 break; 2612 break;
… …
2663 scr_forwardindex (); 2666 scr_forwardindex ();
2664 break; 2667 break;
2665#endif 2668#endif
2666 case '=': 2669 case '=':
2667 case '>': 2670 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2671 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2672 break;
2670 2673
2671 case C1_40: 2674 case C1_40:
2672 cmd_getc (); 2675 cmd_getc ();
2673 break; 2676 break;
… …
2677 2680
2678 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
2680 { 2683 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2683 } 2686 }
2684 break; 2687 break;
2685 2688
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
2688 process_graphics (); 2691 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q')
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2689 break; 2694 break;
2690 2695
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2696 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2697 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2698 scr_set_tab (1);
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2716 2721
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2724 process_csi_seq ();
2720 break; 2725 break;
2721 2726
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2729 process_osc_seq ();
2725 break; 2730 break;
2726 2731
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2733 case 'c':
2729 mbstate.reset (); 2734 mbstate.reset ();
2730 scr_poweron (); 2735 scr_poweron ();
2731 scrollbar_show (1); 2736 scrollBar.show (1);
2732 break; 2737 break;
2733 2738
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2740 case 'n':
2736 scr_charset_choose (2); 2741 scr_charset_choose (2);
… …
2756 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,
2757 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 ,
2758 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
2759}; 2764};
2760 2765
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2771
2767const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2768 { 2773 {
2769 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, */
2770 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, */
2771 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, */
2772 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, [, \, ], ^, _, */
… …
2787 2792
2788 nargs = 0; 2793 nargs = 0;
2789 2794
2790 priv = 0; 2795 priv = 0;
2791 ch = cmd_getc (); 2796 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2793 { 2798 {
2794 /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2795 priv = ch; 2800 priv = ch;
2796 ch = cmd_getc (); 2801 ch = cmd_getc ();
2797 } 2802 }
2798 2803
2799 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
2853 2858
2854 case '?': 2859 case '?':
2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2856 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2857 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);
2858 } 2875 }
2876 break;
2877 }
2878
2859 return; 2879 return;
2860 } 2880 }
2861 2881
2862 switch (ch) 2882 switch (ch)
2863 { 2883 {
… …
3097 { 3117 {
3098 /* 3118 /*
3099 * commands 3119 * commands
3100 */ 3120 */
3101 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3102 XMapWindow (dpy, parent[0]); 3122 XMapWindow (dpy, parent);
3103 break; 3123 break;
3104 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3105 XIconifyWindow (dpy, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3106 break; 3126 break;
3107 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3108 XMoveWindow (dpy, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3109 break; 3129 break;
3110 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3111 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3112 break; 3132 break;
3113 case 5: /* raise window */ 3133 case 5: /* raise window */
3114 XRaiseWindow (dpy, parent[0]); 3134 XRaiseWindow (dpy, parent);
3115 break; 3135 break;
3116 case 6: /* lower window */ 3136 case 6: /* lower window */
3117 XLowerWindow (dpy, parent[0]); 3137 XLowerWindow (dpy, parent);
3118 break; 3138 break;
3119 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3120 scr_touch (true); 3140 scr_touch (true);
3121 break; 3141 break;
3122 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3133 3153
3134 /* 3154 /*
3135 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3136 */ 3156 */
3137 case 11: /* report window state */ 3157 case 11: /* report window state */
3138 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3139 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3140 break; 3160 break;
3141 case 13: /* report window position */ 3161 case 13: /* report window position */
3142 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3143 XTranslateCoordinates (dpy, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3144 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3145 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3146 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3147 break; 3167 break;
3148 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3149 XGetWindowAttributes (dpy, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3150 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3151 break; 3171 break;
3152 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3153 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3154 break; 3174 break;
… …
3156 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3157 break; 3177 break;
3158 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3159 { 3179 {
3160 char *s; 3180 char *s;
3161 XGetIconName (dpy, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3162 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3163 XFree (s); 3183 XFree (s);
3164 } 3184 }
3165 break; 3185 break;
3166 case 21: /* report window title */ 3186 case 21: /* report window title */
3167 { 3187 {
3168 char *s; 3188 char *s;
3169 XFetchName (dpy, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3170 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3171 XFree (s); 3191 XFree (s);
3172 } 3192 }
3173 break; 3193 break;
3174 } 3194 }
… …
3230 * 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)'
3231 */ 3251 */
3232void 3252void
3233rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3234{ 3254{
3235 char *s;
3236 unicode_t eh;
3237
3238 /* 3255 /*
3239 * Not handled yet 3256 * Not handled yet
3240 */ 3257 */
3258
3259 unicode_t eh;
3241 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3242 if (s) 3261 if (s)
3243 free (s); 3262 free (s);
3244 3263
3245 return; 3264 return;
3246} 3265}
… …
3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3251 */ 3270 */
3252void 3271void
3253rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3254{ 3273{
3255 unicode_t ch, eh;
3256 int arg; 3274 int arg;
3257 3275
3258 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3259 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3260 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3261 3279
3262 if (ch == ';') 3280 if (ch == ';')
3263 { 3281 {
3282 unicode_t eh;
3264 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3265 3284
3266 if (s) 3285 if (s)
3267 { 3286 {
3268 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3292 3311
3293/* 3312/*
3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3295 */ 3314 */
3296void 3315void
3297rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3298{ 3317{
3299 int color; 3318 int color;
3300 char *buf, *name; 3319 char *buf, *name;
3301 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3302 int saveop = op; 3321 int saveop = op;
… …
3329 unsigned long bytes_after; 3348 unsigned long bytes_after;
3330 unsigned char *value = 0; 3349 unsigned char *value = 0;
3331 const char *str = ""; 3350 const char *str = "";
3332 3351
3333 if (prop 3352 if (prop
3334 && XGetWindowProperty (dpy, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3335 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3336 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3337 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3338 && actual_type != None 3357 && actual_type != None
3339 && actual_format == 8) 3358 && actual_format == 8)
… …
3343 3362
3344 XFree (value); 3363 XFree (value);
3345 } 3364 }
3346 else 3365 else
3347 { 3366 {
3348 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3349 3368
3350 if (eq) 3369 if (eq)
3351 { 3370 {
3352 *eq = 0; 3371 *eq = 0;
3353 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3354 } 3373 }
3355 else 3374 else
3356 XDeleteProperty (dpy, parent[0], 3375 XDeleteProperty (dpy, parent,
3357 display->atom (str)); 3376 display->atom (str));
3358 } 3377 }
3359 break; 3378 break;
3360 3379
3361 case XTerm_Color: 3380 case XTerm_Color:
… …
3393 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3394 break; 3413 break;
3395 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3396 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3397 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
3398#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3399 case XTerm_Color_RV:
3400 process_color_seq (op, Color_RV, str, resp);
3401 break;
3402 case Rxvt_Color_BD:
3403 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3404 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3405 break; 3428 break;
3406 case Rxvt_Color_UL:
3407 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3408 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3409 break; 3431 break;
3410 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3411 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3412 break; 3434 break;
3413#endif 3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3414#if ENABLE_TRANSPARENCY 3439#if ENABLE_TRANSPARENCY
3415 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3416 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3417 { 3442 {
3418 bool changed = false; 3443 bool changed = false;
3419 3444
3420 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3421 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3422 else
3423 changed = bgPixmap.unset_tint ();
3424 3447
3425 if (changed) 3448 if (changed)
3426 update_background (); 3449 update_background ();
3427 } 3450 }
3428 3451
… …
3433 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3434 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3435 { 3458 {
3436 char str[256]; 3459 char str[256];
3437 3460
3438 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3439 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3440 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3441 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3442 } 3465 }
3443 else 3466 else
3444 { 3467 {
3445 int changed = 0; 3468 int changed = 0;
3446 3469
3447 if (*str != ';') 3470 if (*str != ';')
3448 { 3471 {
3449 /* reset to default scaling :*/
3450 bgPixmap.unset_geometry ();
3451 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3452 changed++; 3474 changed++;
3453 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3454 if (str == NULL) 3476 if (str == NULL)
3455 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3456 } 3481 }
3457 3482 else
3458 while (str)
3459 { 3483 {
3460 str++; 3484 str++;
3461 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3462 changed++; 3486 changed++;
3463 str = strchr (str, ';');
3464 } 3487 }
3465 3488
3466 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 }
3467 update_background (); 3497 update_background ();
3498 }
3468 } 3499 }
3469 break; 3500 break;
3470#endif 3501#endif
3471 3502
3472 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3542 break; 3573 break;
3543#endif 3574#endif
3544 3575
3545#if ENABLE_PERL 3576#if ENABLE_PERL
3546 case URxvt_perl: 3577 case URxvt_perl:
3547 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));
3548 ; // no responses yet
3549 break; 3579 break;
3550#endif 3580#endif
3551 } 3581 }
3552} 3582}
3553/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3576 { 3606 {
3577 if (mode == 'r') 3607 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3609 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3582 } 3613 }
3583 3614
3584 return state; 3615 return state;
3585} 3616}
3586 3617
… …
3594 static const struct 3625 static const struct
3595 { 3626 {
3596 const int argval; 3627 const int argval;
3597 const unsigned long bit; 3628 const unsigned long bit;
3598 } argtopriv[] = { 3629 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3600 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3601 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3602 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3603 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3604 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3608 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3609 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3610#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3644#endif
3613 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3614 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3615 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3616 // 45 margin bell NYI 3649 // 45 margin bell NYI
3617 // 46 start logging 3650 // 46 start logging
3618 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3619 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3620#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3621 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3622#endif 3655#endif
3623 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3624 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3625 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 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
3628 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3633 { 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 */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3636 }; 3675 };
3637 3676
… …
3647 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3648 { 3687 {
3649 state = -1; 3688 state = -1;
3650 3689
3651 /* basic handling */ 3690 /* basic handling */
3652 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3653 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3654 { 3693 {
3655 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3656 break; 3695 break;
3657 } 3696 }
… …
3665 3704
3666 scr_touch (true); 3705 scr_touch (true);
3667 break; 3706 break;
3668#endif 3707#endif
3669 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3670 case 1049:
3671 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3672 if (mode == 0) 3710 if (mode == 0)
3673 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3674 else if (mode == 1) 3712 else if (mode == 1)
3675 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
… …
3684 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
3685 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
3686 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
3687 * within VT52 mode 3725 * within VT52 mode
3688 */ 3726 */
3689 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
3690 break; 3728 break;
3691 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3692 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3696 }
3697 break; 3732 break;
3698 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3699 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3700 break; 3735 break;
3701 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
3712 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3714 break; 3749 break;
3715#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
3716 case scrollBar_esc: 3751 case scrollBar_esc:
3717 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
3718 { 3753 {
3719 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
3720 scr_touch (true); 3755 scr_touch (true);
3721 } 3756 }
3722 break; 3757 break;
… …
3739 case 1003: 3774 case 1003:
3740 if (state) 3775 if (state)
3741 { 3776 {
3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3743 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;
3744 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3745 } 3781 }
3746 else 3782 else
3747 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3784
3748 vt_select_input (); 3785 vt_select_input ();
3749 break; 3786 break;
3750 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3751 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3752 break; 3789 break;
3753 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3754 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3755 break; 3792 break;
3756 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3757 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 3795 if (!state)
3759 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3760 scr_change_screen (state); 3798 scr_change_screen (state);
3761 break; 3799 break;
3762 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
3763 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3764 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 3808 if (state)
3766 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3767 break; 3812 break;
3768 default: 3813 default:
3769 break; 3814 break;
3770 } 3815 }
3771 } 3816 }
… …
3924 } 3969 }
3925 } 3970 }
3926} 3971}
3927/*}}} */ 3972/*}}} */
3928 3973
3929/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3930void
3931rxvt_term::process_graphics ()
3932{
3933 unicode_t ch, cmd = cmd_getc ();
3934
3935 if (cmd == 'Q')
3936 {
3937 /* query graphics */
3938 tt_printf ("\033G0\012"); /* no graphics */
3939 return;
3940 }
3941 /* swallow other graphics sequences until terminating ':' */
3942 do
3943 ch = cmd_getc ();
3944 while (ch != ':');
3945}
3946/*}}} */
3947
3948/* ------------------------------------------------------------------------- */ 3974/* ------------------------------------------------------------------------- */
3949 3975
3950/* 3976/*
3951 * Send printf () formatted output to the command. 3977 * Send printf () formatted output to the command.
3952 * Only use for small amounts of data. 3978 * Only use for small amounts of data.
… …
3965 3991
3966/* ---------------------------------------------------------------------- */ 3992/* ---------------------------------------------------------------------- */
3967/* Write data to the pty as typed by the user, pasted with the mouse, 3993/* Write data to the pty as typed by the user, pasted with the mouse,
3968 * or generated by us in response to a query ESC sequence. 3994 * or generated by us in response to a query ESC sequence.
3969 */ 3995 */
3970const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3971 3997
3972void 3998void
3973rxvt_term::tt_write (const char *data, unsigned int len) 3999rxvt_term::tt_write (const char *data, unsigned int len)
3974{ 4000{
3975 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3980 4006
3981 if (v_buflen == 0) 4007 if (v_buflen == 0)
3982 { 4008 {
3983 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3984 4010
4011 max_it (written, 0);
4012
3985 if ((unsigned int)written == len) 4013 if (written == len)
3986 return; 4014 return;
3987 4015
3988 data += written; 4016 data += written;
3989 len -= written; 4017 len -= written;
3990 } 4018 }
3991 4019
3992 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3993 4021
3994 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
3995 v_buflen += len; 4023 v_buflen += len;
3996 4024
3997 pty_ev.set (ev::READ | ev::WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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