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.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.498 by sf-exg, Fri Sep 30 13:31:21 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
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
282} 285}
283 286
284static int 287static int
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
334# endif 337# endif
335#endif 338#endif
336 return keysym; 339 return keysym;
337} 340}
338 341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
339void 401void
340rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
341{ 403{
342 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
343 KeySym keysym; 405 KeySym keysym;
… …
356 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
357 */ 419 */
358 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
359 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
360 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
361
362 if (numlock_state || (ev.state & ModNumLockMask))
363 {
364 numlock_state = (ev.state & ModNumLockMask);
365 PrivMode ((!numlock_state), PrivMode_aplKP);
366 }
367 423
368 kbuf[0] = 0; 424 kbuf[0] = 0;
369 425
370#ifdef USE_XIM 426#ifdef USE_XIM
371 if (Input_Context) 427 if (Input_Context)
… …
446#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
447 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
448#else 504#else
449 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
450#endif 506#endif
507 max_it (lnsppg, 1);
508
451 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
452 { 510 {
453 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
454 return; 512 return;
455 } 513 }
… …
508 selection_request (ev.time); 566 selection_request (ev.time);
509 return; 567 return;
510#if TODO 568#if TODO
511 /* rxvt extras */ 569 /* rxvt extras */
512 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
513 change_font (FONT_UP);
514 return; 571 return;
515 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
516 change_font (FONT_DN);
517 return; 573 return;
518#endif 574#endif
519 } 575 }
520 } 576 }
521 } 577 }
522 578
523#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
524 // ISO 14755 support 580 // ISO 14755 support
525 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
526 { 582 {
527 int hv; 583 int hv;
528 584
529 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
530 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
560 scr_overlay_off (); 616 scr_overlay_off ();
561# endif 617# endif
562 iso14755buf = 0; 618 iso14755buf = 0;
563 } 619 }
564 } 620 }
621 else if (option (Opt_iso14755) &&
565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
567 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
568 { 625 {
569 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
570# if ISO_14755 627# if ISO_14755
571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
582 } 639 }
583#endif 640#endif
584 641
585 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586 { 643 {
587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588 unsigned int newlen = 1; 645 unsigned int newlen = 1;
589 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
590 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
591 { 768 {
592#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
593 case XK_BackSpace: 770 if (param > 0)
594 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
595 {
596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597 ^ !!ctrl) ? '\b' : '\177';
598 kbuf[1] = '\0';
599 }
600 else 772 else
601 strcpy (kbuf, rs[Rs_backspace_key]);
602 break;
603#endif
604#ifndef NO_DELETE_KEY
605 case XK_Delete:
606 strcpy (kbuf, rs[Rs_delete_key]);
607 break;
608#endif
609 case XK_Tab:
610 if (shft)
611 strcpy (kbuf, "\033[Z");
612 else
613 {
614#ifdef CTRL_TAB_MAKES_META
615 if (ctrl)
616 meta = 1;
617#endif
618#ifdef MOD4_TAB_MAKES_META
619 if (ev.state & Mod4Mask)
620 meta = 1;
621#endif
622 newlen = 0;
623 }
624 break;
625
626 case XK_Up: /* "\033[A" */
627 case XK_Down: /* "\033[B" */
628 case XK_Right: /* "\033[C" */
629 case XK_Left: /* "\033[D" */
630 strcpy (kbuf, "\033[Z");
631 kbuf[2] = "DACB"[keysym - XK_Left];
632 /* do Shift first */
633 if (shft)
634 kbuf[2] = "dacb"[keysym - XK_Left];
635 else if (ctrl)
636 {
637 kbuf[1] = 'O';
638 kbuf[2] = "dacb"[keysym - XK_Left];
639 }
640 else if (priv_modes & PrivMode_aplCUR)
641 kbuf[1] = 'O';
642 break;
643
644#ifndef UNSHIFTED_SCROLLKEYS
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648 case XK_Next:
649 strcpy (kbuf, "\033[6~");
650 break;
651#endif
652 case XK_KP_Enter:
653 /* allow shift to override */
654 if (kp)
655 {
656 strcpy (kbuf, "\033OM");
657 break;
658 }
659
660 /* FALLTHROUGH */
661
662 case XK_Return:
663 if (priv_modes & PrivMode_LFNL)
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\012';
667 kbuf[2] = '\0';
668 }
669 else
670 {
671 kbuf[0] = '\015';
672 kbuf[1] = '\0';
673 }
674 break;
675
676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP");
681 kbuf[2] += (keysym - XK_KP_F1);
682 break;
683
684 case XK_KP_Multiply: /* "\033Oj" : "*" */
685 case XK_KP_Add: /* "\033Ok" : "+" */
686 case XK_KP_Separator: /* "\033Ol" : "," */
687 case XK_KP_Subtract: /* "\033Om" : "-" */
688 case XK_KP_Decimal: /* "\033On" : "." */
689 case XK_KP_Divide: /* "\033Oo" : "/" */
690 case XK_KP_0: /* "\033Op" : "0" */
691 case XK_KP_1: /* "\033Oq" : "1" */
692 case XK_KP_2: /* "\033Or" : "2" */
693 case XK_KP_3: /* "\033Os" : "3" */
694 case XK_KP_4: /* "\033Ot" : "4" */
695 case XK_KP_5: /* "\033Ou" : "5" */
696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */
701 if (kp)
702 {
703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply);
705 }
706 else
707 {
708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709 kbuf[1] = '\0';
710 }
711 break;
712
713 case XK_Find:
714 strcpy (kbuf, "\033[1~");
715 break;
716
717 case XK_Insert:
718 strcpy (kbuf, "\033[2~");
719 break;
720#ifdef DXK_Remove /* support for DEC remove like key */
721 case DXK_Remove:
722 /* FALLTHROUGH */
723#endif
724 case XK_Execute:
725 strcpy (kbuf, "\033[3~");
726 break;
727 case XK_Select:
728 strcpy (kbuf, "\033[4~");
729 break;
730 case XK_End:
731 strcpy (kbuf, KS_END);
732 break;
733 case XK_Home:
734 strcpy (kbuf, KS_HOME);
735 break;
736
737#define FKEY(n, fkey) \
738 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740 case XK_F1: /* "\033[11~" */
741 case XK_F2: /* "\033[12~" */
742 case XK_F3: /* "\033[13~" */
743 case XK_F4: /* "\033[14~" */
744 case XK_F5: /* "\033[15~" */
745 FKEY (11, XK_F1);
746 break;
747 case XK_F6: /* "\033[17~" */
748 case XK_F7: /* "\033[18~" */
749 case XK_F8: /* "\033[19~" */
750 case XK_F9: /* "\033[20~" */
751 case XK_F10: /* "\033[21~" */
752 FKEY (17, XK_F6);
753 break;
754 case XK_F11: /* "\033[23~" */
755 case XK_F12: /* "\033[24~" */
756 case XK_F13: /* "\033[25~" */
757 case XK_F14: /* "\033[26~" */
758 FKEY (23, XK_F11);
759 break;
760 case XK_F15: /* "\033[28~" */
761 case XK_F16: /* "\033[29~" */
762 FKEY (28, XK_F15);
763 break;
764 case XK_Help: /* "\033[28~" */
765 FKEY (28, XK_Help);
766 break;
767 case XK_Menu: /* "\033[29~" */
768 FKEY (29, XK_Menu);
769 break;
770 case XK_F17: /* "\033[31~" */
771 case XK_F18: /* "\033[32~" */
772 case XK_F19: /* "\033[33~" */
773 case XK_F20: /* "\033[34~" */
774 case XK_F21: /* "\033[35~" */
775 case XK_F22: /* "\033[36~" */
776 case XK_F23: /* "\033[37~" */
777 case XK_F24: /* "\033[38~" */
778 case XK_F25: /* "\033[39~" */
779 case XK_F26: /* "\033[40~" */
780 case XK_F27: /* "\033[41~" */
781 case XK_F28: /* "\033[42~" */
782 case XK_F29: /* "\033[43~" */
783 case XK_F30: /* "\033[44~" */
784 case XK_F31: /* "\033[45~" */
785 case XK_F32: /* "\033[46~" */
786 case XK_F33: /* "\033[47~" */
787 case XK_F34: /* "\033[48~" */
788 case XK_F35: /* "\033[49~" */
789 FKEY (31, XK_F17);
790 break;
791#undef FKEY
792 default:
793 newlen = 0; 773 newlen = 0;
794 break;
795 } 774 }
775 break;
776 }
796 777
797 if (newlen) 778 if (newlen)
798 len = strlen (kbuf); 779 len = strlen (kbuf);
799 780
800 /* 781 /*
801 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
802 */ 783 */
803#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
903 commit_iso14755 (); 884 commit_iso14755 ();
904 885
905 return; 886 return;
906 } 887 }
907 888
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym) 890 if (i[0] == keysym)
910 { 891 {
911 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 (); 893 commit_iso14755 ();
913 894
… …
950 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
952#endif 933#endif
953} 934}
954 935
955#if defined (KEYSYM_RESOURCE)
956unsigned int
957rxvt_term::cmd_write (const char *str, unsigned int count)
958{
959 unsigned int n, s;
960
961 n = cmdbuf_ptr - cmdbuf_base;
962 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
963
964 if (n > 0 && s < count)
965 {
966 memmove (cmdbuf_base, cmdbuf_ptr,
967 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
968 cmdbuf_ptr = cmdbuf_base;
969 cmdbuf_endp -= n;
970 s += n;
971 }
972
973 if (count > s)
974 {
975 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
976 count = s;
977 }
978
979 for (; count--;)
980 *cmdbuf_endp++ = *str++;
981
982 cmd_parse ();
983
984 return 0;
985}
986#endif
987
988void 936void
989rxvt_term::flush () 937rxvt_term::flush ()
990{ 938{
991 flush_ev.stop (); 939 flush_ev.stop ();
992 940
993#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
994 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
995 { 943 {
996// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
997 scr_touch (false); 945 scr_touch (false);
998 } 946 }
999#endif 947#endif
1000 948
1001 if (want_refresh) 949 if (want_refresh)
… …
1037 } 985 }
1038 while (row < end_row); 986 while (row < end_row);
1039 } 987 }
1040 988
1041 scr_refresh (); 989 scr_refresh ();
1042 scrollbar_show (1); 990 scrollBar.show (1);
1043#ifdef USE_XIM 991#ifdef USE_XIM
1044 IMSendSpot (); 992 im_send_spot ();
1045#endif 993#endif
1046 } 994 }
1047 995
1048 display->flush (); 996 display->flush ();
1049} 997}
1050 998
1051/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1052void 1000void
1053rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1054{ 1002{
1055 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1094 1042
1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1096void 1044void
1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1098{ 1046{
1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1101 { 1049 {
1102 want_refresh = 1; 1050 want_refresh = 1;
1103 refresh_check (); 1051 refresh_check ();
1104 } 1052 }
1105 else 1053 else
… …
1149 { 1097 {
1150 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1152 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1154 1105
1155 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1156 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1157 1108
1158 w.stop (); 1109 w.stop ();
1159 } 1110 }
1160 1111
… …
1163 { 1114 {
1164 } 1115 }
1165} event_handler; 1116} event_handler;
1166#endif 1117#endif
1167 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1168bool 1152bool
1169rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1170{ 1154{
1171 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1172 1156
1173 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1174 { 1158
1175 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1176 n = 0;
1177 } 1160 {
1178 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1179 memmove (cmdbuf_base, cmdbuf_ptr, n);
1180 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1181 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1182 1166
1183 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1184 1168
1185 if (r > 0) 1169 if (r > 0)
1186 { 1170 {
1187 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1188 return true; 1172 return true;
… …
1210{ 1194{
1211 make_current (); 1195 make_current ();
1212 1196
1213 if (revents & ev::READ) 1197 if (revents & ev::READ)
1214 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1215 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1216 if (cmd_parse ()) 1200 cmd_parse ();
1217 break;
1218 1201
1219 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1220 pty_write (); 1203 pty_write ();
1221 1204
1222 refresh_check (); 1205 refresh_check ();
… …
1263{ 1246{
1264 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1265 int x, y; 1248 int x, y;
1266 int code = 32; 1249 int code = 32;
1267 1250
1268 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1269 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1270 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1271 { 1255 {
1272 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1273 return; 1257 return;
1258
1274 mouse_row = x; 1259 mouse_row = x;
1275 mouse_col = y; 1260 mouse_col = y;
1276 code += 32; 1261 code += 32;
1277 } 1262 }
1278 1263
… …
1281 else 1266 else
1282 { 1267 {
1283 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1284 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1285 if (button_number >= 3) 1270 if (button_number >= 3)
1286 button_number += (64 - 3); 1271 button_number += 64 - 3;
1287 } 1272 }
1288 1273
1289 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1290 { 1275 {
1291 /* 1276 /*
… …
1323 fputc ('A', stderr); 1308 fputc ('A', stderr);
1324 if (key_state & 32) 1309 if (key_state & 32)
1325 fputc ('2', stderr); 1310 fputc ('2', stderr);
1326 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1327 button_number, 1312 button_number,
1328 x + 1, 1313 x,
1329 y + 1); 1314 y);
1330#endif 1315#endif
1331 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1332 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1333 (code + button_number + key_state), 1331 code + button_number + key_state,
1334 (32 + x + 1), 1332 32 + x,
1335 (32 + y + 1)); 1333 32 + y);
1336} 1334}
1337 1335
1338/*{{{ process an X event */ 1336/*{{{ process an X event */
1339void 1337void
1340rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1442 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1441 focus_out ();
1444 break; 1442 break;
1445 1443
1446 case ConfigureNotify: 1444 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1450 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1451 { 1446 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1454 1468
1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1456 { 1470 {
1457 seen_resize = 1; 1471 seen_resize = 1;
1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1459 } 1473 }
1460 else 1474 else
1461 { 1475 {
1462#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped) 1477 if (moved)
1466 update_background (); 1478 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif 1479#endif
1471 } 1480 }
1472 1481
1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474 } 1483 }
1475 break; 1484 break;
1476 1485
1477 case PropertyNotify: 1486 case PropertyNotify:
1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1483 break; 1488 break;
1484 1489
1485 case SelectionClear: 1490 case SelectionClear:
1486 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487 break;
1488
1489 case SelectionNotify:
1490 if (selection_wait == Sel_normal)
1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1492 break; 1492 break;
1493 1493
1494 case SelectionRequest: 1494 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1496 break; 1496 break;
1497 1497
1498 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a 1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first 1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting. 1504 * reparenting.
1505 * We should not render background immidiately, as there could be several 1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short 1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1511 */ 1511 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1514#endif 1514#endif
1515 mapped = 1; 1515 mapped = 1;
1516#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1532 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1533 { 1533 {
1534 do 1534 do
1535 { 1535 {
1536 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1537 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1538 } 1538 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 { 1544 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1547 }
1548 1548
1549 want_refresh = 1; 1549 want_refresh = 1;
1550 } 1550 }
1551 else 1551 else
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1558 ;
1559 1559
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1561 {
1562 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1563 scrollBar.show (0);
1564 } 1564 }
1565 } 1565 }
1566 break; 1566 break;
1567 1567
1568 case MotionNotify: 1568 case MotionNotify:
… …
1655#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1656 } 1656 }
1657#endif 1657#endif
1658 } 1658 }
1659 } 1659 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1661 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1664 ; 1664 ;
1665 1665
1666 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1667 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1670 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1672 scrollbar_size ()); 1672 scrollBar.size ());
1673 want_refresh = 1; 1673 want_refresh = 1;
1674 scrollbar_show (1); 1674 scrollBar.show (1);
1675 } 1675 }
1676 break; 1676 break;
1677 } 1677 }
1678 1678
1679#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1704#endif 1704#endif
1705 1705
1706 refresh_check (); 1706 refresh_check ();
1707} 1707}
1708 1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 XFree (h);
1722 }
1723}
1724#endif
1725
1709void 1726void
1710rxvt_term::focus_in () 1727rxvt_term::focus_in ()
1711{ 1728{
1712 if (!focus) 1729 if (!focus)
1713 { 1730 {
1714 focus = 1; 1731 focus = 1;
1715 want_refresh = 1; 1732 want_refresh = 1;
1716 1733
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718
1719#if USE_XIM 1734#if USE_XIM
1720 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1721 { 1736 {
1722 IMSetPosition (); 1737 im_set_position ();
1723 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1724 } 1739 }
1725#endif 1740#endif
1726#if CURSOR_BLINK 1741#if CURSOR_BLINK
1727 if (option (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
… …
1734 scr_recolour (); 1749 scr_recolour ();
1735 } 1750 }
1736#endif 1751#endif
1737#if ENABLE_FRILLS 1752#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1753 if (option (Opt_urgentOnBell))
1739 { 1754 set_urgency (0);
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif 1755#endif
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 } 1758 }
1748} 1759}
1749 1760
1750void 1761void
1751rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1753 if (focus) 1764 if (focus)
1754 { 1765 {
1755 focus = 0; 1766 focus = 0;
1756 want_refresh = 1; 1767 want_refresh = 1;
1757 1768
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1769#if ENABLE_FRILLS
1759 1770 if (option (Opt_urgentOnBell))
1771 set_urgency (0);
1772#endif
1760#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1774 if (iso14755buf)
1762 { 1775 {
1763 iso14755buf = 0; 1776 iso14755buf = 0;
1764# if ISO_14755 1777# if ISO_14755
… …
1781 { 1794 {
1782 pix_colors = pix_colors_unfocused; 1795 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1796 scr_recolour ();
1784 } 1797 }
1785#endif 1798#endif
1799
1800 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1801 }
1787} 1802}
1788 1803
1789void 1804void
1790rxvt_term::update_fade_color (unsigned int idx) 1805rxvt_term::update_fade_color (unsigned int idx)
… …
1818 * use the property to determine the pixmap. We use it later on. 1833 * use the property to determine the pixmap. We use it later on.
1819 */ 1834 */
1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 { 1837 {
1823 bgPixmap.set_root_pixmap (); 1838 bg_set_root_pixmap ();
1824 update_background (); 1839 update_background ();
1825 } 1840 }
1826 1841
1827 break; 1842 break;
1828 } 1843 }
… …
1867 /* save the xbutton state (for ButtonRelease) */ 1882 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1883 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1884#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1885 if (ev.button == MEvent.button && clickintime)
1871 { 1886 {
1872 /* same button, within alloted time */ 1887 /* same button, within allowed time */
1873 MEvent.clicks++; 1888 MEvent.clicks++;
1874 1889
1875 if (MEvent.clicks > 1) 1890 if (MEvent.clicks > 1)
1876 { 1891 {
1877 /* only report double clicks */ 1892 /* only report double clicks */
… …
1958 if (scrollBar.upButton (ev.y)) 1973 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */ 1974 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y)) 1975 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */ 1976 direction = DN; /* down */
1962 1977
1963 scrollBar.state = STATE_IDLE; 1978 scrollBar.state = SB_STATE_IDLE;
1964 /* 1979 /*
1965 * Rxvt-style scrollbar: 1980 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1981 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1982 * move dn if mouse is below slider
1968 * 1983 *
… …
2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2022 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2008#endif 2023#endif
2009 if (scr_page (direction, 1)) 2024 if (scr_page (direction, 1))
2010 { 2025 {
2011 if (direction == UP) 2026 if (direction == UP)
2012 scrollBar.state = STATE_UP; 2027 scrollBar.state = SB_STATE_UP;
2013 else 2028 else
2014 scrollBar.state = STATE_DOWN; 2029 scrollBar.state = SB_STATE_DOWN;
2015 } 2030 }
2016 } 2031 }
2017 else 2032 else
2018 switch (ev.button) 2033 switch (ev.button)
2019 { 2034 {
2020 case Button2: 2035 case Button2:
2021 switch (scrollBar.align) 2036 switch (scrollBar.align)
2022 { 2037 {
2023 case R_SB_ALIGN_TOP: 2038 case SB_ALIGN_TOP:
2024 csrO = 0; 2039 csrO = 0;
2025 break; 2040 break;
2026 case R_SB_ALIGN_CENTRE: 2041 case SB_ALIGN_CENTRE:
2027 csrO = (scrollBar.bot - scrollBar.top) / 2; 2042 csrO = (scrollBar.bot - scrollBar.top) / 2;
2028 break; 2043 break;
2029 case R_SB_ALIGN_BOTTOM: 2044 case SB_ALIGN_BOTTOM:
2030 csrO = scrollBar.bot - scrollBar.top; 2045 csrO = scrollBar.bot - scrollBar.top;
2031 break; 2046 break;
2032 } 2047 }
2033 2048
2034 if (scrollBar.style == R_SB_XTERM 2049 if (scrollBar.style == SB_STYLE_XTERM
2035 || scrollbar_above_slider (ev.y) 2050 || scrollBar.above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2051 || scrollBar.below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2052 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038 2053
2039 scrollBar.state = STATE_MOTION; 2054 scrollBar.state = SB_STATE_MOTION;
2040 break; 2055 break;
2041 2056
2042 case Button1: 2057 case Button1:
2043 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2058 if (scrollBar.align == SB_ALIGN_CENTRE)
2044 csrO = ev.y - scrollBar.top; 2059 csrO = ev.y - scrollBar.top;
2045 /* FALLTHROUGH */ 2060 /* FALLTHROUGH */
2046 2061
2047 case Button3: 2062 case Button3:
2048 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != SB_STYLE_XTERM)
2049 { 2064 {
2050 if (scrollbar_above_slider (ev.y)) 2065 if (scrollBar.above_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
2052 scr_page (UP, nrow - 1); 2067 scr_page (UP, nrow - 1);
2053# else 2068# else
2054 scr_page (UP, nrow / 4); 2069 scr_page (UP, nrow / 4);
2055# endif 2070# endif
2056 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollBar.below_slider (ev.y))
2057# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
2058 scr_page (DN, nrow - 1); 2073 scr_page (DN, nrow - 1);
2059# else 2074# else
2060 scr_page (DN, nrow / 4); 2075 scr_page (DN, nrow / 4);
2061# endif 2076# endif
2062 else 2077 else
2063 scrollBar.state = STATE_MOTION; 2078 scrollBar.state = SB_STATE_MOTION;
2064 } 2079 }
2065 else 2080 else
2066 { 2081 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2083 (nrow
2069 * scrollbar_position (ev.y) 2084 * scrollBar.position (ev.y)
2070 / scrollbar_size ())); 2085 / scrollBar.size ()));
2071 } 2086 }
2072 2087
2073 break; 2088 break;
2074 } 2089 }
2075 } 2090 }
… …
2085 2100
2086 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
2087 if (!bypass_keystate) 2102 if (!bypass_keystate)
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2104
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2105 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2091 { 2106 {
2092 scrollBar.state = STATE_IDLE; 2107 scrollBar.state = SB_STATE_IDLE;
2093 scrollbar_show (0); 2108 scrollBar.show (0);
2094 } 2109 }
2095 2110
2096#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
2098#endif 2113#endif
… …
2148 selection_make (ev.time); 2163 selection_make (ev.time);
2149 break; 2164 break;
2150 2165
2151 case Button2: 2166 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2167 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2169 break;
2155 2170
2156#ifdef MOUSE_WHEEL 2171#ifdef MOUSE_WHEEL
2157 case Button4: 2172 case Button4:
2158 case Button5: 2173 case Button5:
… …
2181 } 2196 }
2182 else 2197 else
2183# endif 2198# endif
2184 { 2199 {
2185 scr_page (v, i); 2200 scr_page (v, i);
2186 scrollbar_show (1); 2201 scrollBar.show (1);
2187 } 2202 }
2188 } 2203 }
2189 break; 2204 break;
2190#endif 2205#endif
2191 } 2206 }
2192 } 2207 }
2193} 2208}
2194 2209
2195/*}}} */ 2210/*}}} */
2196 2211
2197bool 2212void
2198rxvt_term::cmd_parse () 2213rxvt_term::cmd_parse ()
2199{ 2214{
2200 bool flag = false;
2201 wchar_t ch = NOCHAR; 2215 wchar_t ch = NOCHAR;
2202 char *seq_begin; // remember start of esc-sequence here 2216 char *seq_begin; // remember start of esc-sequence here
2203 2217
2204 for (;;) 2218 for (;;)
2205 { 2219 {
2206 if (ch == NOCHAR) 2220 if (ecb_unlikely (ch == NOCHAR))
2207 { 2221 {
2208 seq_begin = cmdbuf_ptr; 2222 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2223 ch = next_char ();
2210 2224
2211 if (ch == NOCHAR) 2225 if (ch == NOCHAR)
2212 break; 2226 break;
2213 } 2227 }
2214 2228
2215 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2229 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2216 { 2230 {
2217 if (!seen_input) 2231 if (ecb_unlikely (!seen_input))
2218 { 2232 {
2219 seen_input = 1; 2233 seen_input = 1;
2220 // many badly-written programs (e.g. jed) contain a race condition: 2234 // many badly-written programs (e.g. jed) contain a race condition:
2221 // they first read the screensize and then install a SIGWINCH handler. 2235 // they first read the screensize and then install a SIGWINCH handler.
2222 // some window managers resize the window early, and these programs 2236 // some window managers resize the window early, and these programs
… …
2235 wchar_t *str = buf; 2249 wchar_t *str = buf;
2236 wchar_t *eol = str + min (ncol, UBUFSIZ); 2250 wchar_t *eol = str + min (ncol, UBUFSIZ);
2237 2251
2238 for (;;) 2252 for (;;)
2239 { 2253 {
2240 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2254 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2241 break; 2255 break;
2242 2256
2243 *str++ = ch; 2257 *str++ = ch;
2244 2258
2245 if (ch == C0_LF || str >= eol) 2259 if (ecb_unlikely (ch == C0_LF || str >= eol))
2246 { 2260 {
2247 if (ch == C0_LF) 2261 if (ch == C0_LF)
2248 nlines++; 2262 nlines++;
2249 2263
2250 refresh_count++; 2264 refresh_count++;
… …
2299 * What the heck we'll cheat and only refresh less than every page-full. 2313 * What the heck we'll cheat and only refresh less than every page-full.
2300 * if skipScroll is enabled. 2314 * if skipScroll is enabled.
2301 */ 2315 */
2302 if (refreshnow) 2316 if (refreshnow)
2303 { 2317 {
2304 flag = true;
2305 scr_refresh (); 2318 scr_refresh ();
2306 want_refresh = 1; 2319 want_refresh = 1;
2307 } 2320 }
2308
2309 } 2321 }
2310 else 2322 else
2311 { 2323 {
2312 try 2324 try
2313 { 2325 {
… …
2321 } 2333 }
2322 2334
2323 ch = NOCHAR; 2335 ch = NOCHAR;
2324 } 2336 }
2325 } 2337 }
2326
2327 return flag;
2328} 2338}
2329 2339
2330// read the next character 2340// read the next character
2331wchar_t 2341wchar_t
2332rxvt_term::next_char () NOTHROW 2342rxvt_term::next_char () NOTHROW
2333{ 2343{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2345 {
2336 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2347 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2339 2349
2340 wchar_t wc; 2350 wchar_t wc;
2341 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2342 2352
… …
2346 cmdbuf_ptr = cmdbuf_endp; 2356 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2357 break;
2348 } 2358 }
2349 2359
2350 if (len == (size_t)-1) 2360 if (len == (size_t)-1)
2361 {
2362 mbstate.reset (); // reset now undefined conversion state
2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2363 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2364 }
2352 2365
2353 // assume wchar == unicode 2366 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2368 return wc & UNICODE_MASK;
2356 } 2369 }
… …
2367 : NOCHAR; 2380 : NOCHAR;
2368} 2381}
2369 2382
2370static class out_of_input out_of_input; 2383static class out_of_input out_of_input;
2371 2384
2372/* rxvt_cmd_getc () - Return next input character */
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t 2385wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2386rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2387{
2380 wchar_t c = next_char (); 2388 wchar_t c = next_char ();
2381 2389
… …
2400/*----------------------------------------------------------------------*/ 2408/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2409#ifdef PRINTPIPE
2402FILE * 2410FILE *
2403rxvt_term::popen_printer () 2411rxvt_term::popen_printer ()
2404{ 2412{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2413 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2414
2407 if (stream == NULL) 2415 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2416 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2417
2410 return stream; 2418 return stream;
… …
2421 * simulate attached vt100 printer 2429 * simulate attached vt100 printer
2422 */ 2430 */
2423void 2431void
2424rxvt_term::process_print_pipe () 2432rxvt_term::process_print_pipe ()
2425{ 2433{
2426 int done; 2434 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2435
2429 if ((fd = popen_printer ()) == NULL) 2436 if (!fd)
2430 return; 2437 return;
2431 2438
2432 /* 2439 /*
2433 * Send all input to the printer until either ESC[4i or ESC[?4i 2440 * Send all input to the printer until either ESC[4i or ESC[?4i
2434 * is received. 2441 * is received.
2435 */ 2442 */
2436 for (done = 0; !done;) 2443 for (int done = 0; !done; )
2437 { 2444 {
2438 unsigned char buf[8]; 2445 unsigned char buf[8];
2439 unicode_t ch; 2446 unicode_t ch;
2440 unsigned int i, len; 2447 unsigned int i, len;
2441 2448
… …
2475 pclose_printer (fd); 2482 pclose_printer (fd);
2476} 2483}
2477#endif /* PRINTPIPE */ 2484#endif /* PRINTPIPE */
2478/*}}} */ 2485/*}}} */
2479 2486
2480/* *INDENT-OFF* */
2481enum { 2487enum {
2482 C1_40 = 0x40, 2488 C1_40 = 0x40,
2483 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2489 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2484 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2490 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2485 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2486 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2487}; 2493};
2488/* *INDENT-ON* */
2489 2494
2490/*{{{ process non-printing single characters */ 2495/*{{{ process non-printing single characters */
2491void 2496void
2492rxvt_term::process_nonprinting (unicode_t ch) 2497rxvt_term::process_nonprinting (unicode_t ch)
2493{ 2498{
… …
2586 break; 2591 break;
2587 case 'Z': /* identify the terminal type */ 2592 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2593 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2594 break;
2590 case '<': /* turn off VT52 mode */ 2595 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2596 priv_modes &= ~PrivMode_vt52;
2592 break; 2597 break;
2593 case 'F': /* use special graphics character set */ 2598 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2599 case 'G': /* use regular character set */
2595 /* unimplemented */ 2600 /* unimplemented */
2596 break; 2601 break;
… …
2615 return; 2620 return;
2616 } 2621 }
2617 2622
2618 switch (ch) 2623 switch (ch)
2619 { 2624 {
2620 /* case 1: do_tek_mode (); break; */
2621 case '#': 2625 case '#':
2622 if (cmd_getc () == '8') 2626 if (cmd_getc () == '8')
2623 scr_E (); 2627 scr_E ();
2624 break; 2628 break;
2625 case '(': 2629 case '(':
… …
2648#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2649 case '9': 2653 case '9':
2650 scr_forwardindex (); 2654 scr_forwardindex ();
2651 break; 2655 break;
2652#endif 2656#endif
2657 // DECPAM/DECPNM
2653 case '=': 2658 case '=':
2659 priv_modes |= PrivMode_aplKP;
2660 break;
2654 case '>': 2661 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2662 priv_modes &= ~PrivMode_aplKP;
2656 break; 2663 break;
2657 2664
2658 case C1_40: 2665 case C1_40:
2659 cmd_getc (); 2666 cmd_getc ();
2660 break; 2667 break;
… …
2664 2671
2665 /* 8.3.87: NEXT LINE */ 2672 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2673 case C1_NEL: /* ESC E */
2667 { 2674 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2675 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2676 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2670 } 2677 }
2671 break; 2678 break;
2672 2679
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2680 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2681 case C1_ESA: /* ESC G */
2675 process_graphics (); 2682 // used by original rxvt for rob nations own graphics mode
2683 if (cmd_getc () == 'Q')
2684 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2676 break; 2685 break;
2677 2686
2678 /* 8.3.63: CHARACTER TABULATION SET */ 2687 /* 8.3.63: CHARACTER TABULATION SET */
2679 case C1_HTS: /* ESC H */ 2688 case C1_HTS: /* ESC H */
2680 scr_set_tab (1); 2689 scr_set_tab (1);
… …
2684 case C1_RI: /* ESC M */ 2693 case C1_RI: /* ESC M */
2685 scr_index (DN); 2694 scr_index (DN);
2686 break; 2695 break;
2687 2696
2688 /* 8.3.142: SINGLE-SHIFT TWO */ 2697 /* 8.3.142: SINGLE-SHIFT TWO */
2689 /*case C1_SS2: scr_single_shift (2); break; */ 2698 /* case C1_SS2: break; */
2690 2699
2691 /* 8.3.143: SINGLE-SHIFT THREE */ 2700 /* 8.3.143: SINGLE-SHIFT THREE */
2692 /*case C1_SS3: scr_single_shift (3); break; */ 2701 /* case C1_SS3: break; */
2693 2702
2694 /* 8.3.27: DEVICE CONTROL STRING */ 2703 /* 8.3.27: DEVICE CONTROL STRING */
2695 case C1_DCS: /* ESC P */ 2704 case C1_DCS: /* ESC P */
2696 process_dcs_seq (); 2705 process_dcs_seq ();
2697 break; 2706 break;
… …
2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2708 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700 case C1_SCI: /* ESC Z */ 2709 case C1_SCI: /* ESC Z */
2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2710 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702 break; /* steal obsolete ESC [ c */ 2711 break; /* steal obsolete ESC [ c */
2703 2712
2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2713 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705 case C1_CSI: /* ESC [ */ 2714 case C1_CSI: /* ESC [ */
2706 process_csi_seq (); 2715 process_csi_seq ();
2707 break; 2716 break;
2708 2717
2709 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2718 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710 case C1_OSC: /* ESC ] */ 2719 case C1_OSC: /* ESC ] */
2711 process_osc_seq (); 2720 process_osc_seq ();
2712 break; 2721 break;
2713 2722
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2723 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715 case 'c': 2724 case 'c':
2716 mbstate.reset (); 2725 mbstate.reset ();
2717 scr_poweron (); 2726 scr_poweron ();
2718 scrollbar_show (1); 2727 scrollBar.show (1);
2719 break; 2728 break;
2720 2729
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2730 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2731 case 'n':
2723 scr_charset_choose (2); 2732 scr_charset_choose (2);
… …
2730 } 2739 }
2731} 2740}
2732/*}}} */ 2741/*}}} */
2733 2742
2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2743/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2735/* *INDENT-OFF* */
2736enum { 2744enum {
2737 CSI_ICH = 0x40, 2745 CSI_ICH = 0x40,
2738 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2746 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2739 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2747 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2740 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2748 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2751 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2752 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2753 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746}; 2754};
2747 2755
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2756#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2757 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2758 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2759#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2760 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2761
2754const unsigned char csi_defaults[] = 2762static const unsigned char csi_defaults[] =
2755 { 2763 {
2756 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2764 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2765 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2766 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2767 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2760 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2768 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2761 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2762 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2763 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2764 }; 2772 };
2765/* *INDENT-ON* */
2766 2773
2767void 2774void
2768rxvt_term::process_csi_seq () 2775rxvt_term::process_csi_seq ()
2769{ 2776{
2770 unicode_t ch, priv, i; 2777 unicode_t ch, priv, i;
… …
2774 2781
2775 nargs = 0; 2782 nargs = 0;
2776 2783
2777 priv = 0; 2784 priv = 0;
2778 ch = cmd_getc (); 2785 ch = cmd_getc ();
2779 if (ch >= '<' && ch <= '?') 2786 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 { 2787 {
2781 /* '<' '=' '>' '?' */ 2788 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2789 priv = ch;
2783 ch = cmd_getc (); 2790 ch = cmd_getc ();
2784 } 2791 }
2785 2792
2786 /* read any numerical arguments */ 2793 /* read any numerical arguments */
… …
2840 2847
2841 case '?': 2848 case '?':
2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2849 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843 process_terminal_mode (ch, priv, nargs, arg); 2850 process_terminal_mode (ch, priv, nargs, arg);
2844 break; 2851 break;
2852
2853 case '!':
2854 if (ch == CSI_70)
2855 {
2856 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2857 scr_soft_reset ();
2858
2859 static const int pm_h[] = { 7, 25 };
2860 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2861
2862 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2863 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2845 } 2864 }
2865 break;
2866 }
2867
2846 return; 2868 return;
2847 } 2869 }
2848 2870
2849 switch (ch) 2871 switch (ch)
2850 { 2872 {
… …
3065 } 3087 }
3066} 3088}
3067/*}}} */ 3089/*}}} */
3068 3090
3069#if !ENABLE_MINIMAL 3091#if !ENABLE_MINIMAL
3070/* ARGSUSED */
3071void 3092void
3072rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3093rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3073{ 3094{
3074 int x, y; 3095 int x, y;
3075 XWindowAttributes wattr; 3096 XWindowAttributes wattr;
… …
3084 { 3105 {
3085 /* 3106 /*
3086 * commands 3107 * commands
3087 */ 3108 */
3088 case 1: /* deiconify window */ 3109 case 1: /* deiconify window */
3089 XMapWindow (dpy, parent[0]); 3110 XMapWindow (dpy, parent);
3090 break; 3111 break;
3091 case 2: /* iconify window */ 3112 case 2: /* iconify window */
3092 XIconifyWindow (dpy, parent[0], display->screen); 3113 XIconifyWindow (dpy, parent, display->screen);
3093 break; 3114 break;
3094 case 3: /* set position (pixels) */ 3115 case 3: /* set position (pixels) */
3095 XMoveWindow (dpy, parent[0], args[1], args[2]); 3116 XMoveWindow (dpy, parent, args[1], args[2]);
3096 break; 3117 break;
3097 case 4: /* set size (pixels) */ 3118 case 4: /* set size (pixels) */
3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3119 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3099 break; 3120 break;
3100 case 5: /* raise window */ 3121 case 5: /* raise window */
3101 XRaiseWindow (dpy, parent[0]); 3122 XRaiseWindow (dpy, parent);
3102 break; 3123 break;
3103 case 6: /* lower window */ 3124 case 6: /* lower window */
3104 XLowerWindow (dpy, parent[0]); 3125 XLowerWindow (dpy, parent);
3105 break; 3126 break;
3106 case 7: /* refresh window */ 3127 case 7: /* refresh window */
3107 scr_touch (true); 3128 scr_touch (true);
3108 break; 3129 break;
3109 case 8: /* set size (chars) */ 3130 case 8: /* set size (chars) */
… …
3120 3141
3121 /* 3142 /*
3122 * reports - some output format copied from XTerm 3143 * reports - some output format copied from XTerm
3123 */ 3144 */
3124 case 11: /* report window state */ 3145 case 11: /* report window state */
3125 XGetWindowAttributes (dpy, parent[0], &wattr); 3146 XGetWindowAttributes (dpy, parent, &wattr);
3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3147 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3127 break; 3148 break;
3128 case 13: /* report window position */ 3149 case 13: /* report window position */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent, &wattr);
3130 XTranslateCoordinates (dpy, parent[0], wattr.root, 3151 XTranslateCoordinates (dpy, parent, wattr.root,
3131 -wattr.border_width, -wattr.border_width, 3152 -wattr.border_width, -wattr.border_width,
3132 &x, &y, &wdummy); 3153 &x, &y, &wdummy);
3133 tt_printf ("\033[3;%d;%dt", x, y); 3154 tt_printf ("\033[3;%d;%dt", x, y);
3134 break; 3155 break;
3135 case 14: /* report window size (pixels) */ 3156 case 14: /* report window size (pixels) */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3157 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3158 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3138 break; 3159 break;
3139 case 18: /* report text area size (chars) */ 3160 case 18: /* report text area size (chars) */
3140 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3141 break; 3162 break;
… …
3143 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3144 break; 3165 break;
3145 case 20: /* report icon label */ 3166 case 20: /* report icon label */
3146 { 3167 {
3147 char *s; 3168 char *s;
3148 XGetIconName (dpy, parent[0], &s); 3169 XGetIconName (dpy, parent, &s);
3149 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150 XFree (s); 3171 XFree (s);
3151 } 3172 }
3152 break; 3173 break;
3153 case 21: /* report window title */ 3174 case 21: /* report window title */
3154 { 3175 {
3155 char *s; 3176 char *s;
3156 XFetchName (dpy, parent[0], &s); 3177 XFetchName (dpy, parent, &s);
3157 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158 XFree (s); 3179 XFree (s);
3159 } 3180 }
3160 break; 3181 break;
3161 } 3182 }
… …
3217 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3238 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3218 */ 3239 */
3219void 3240void
3220rxvt_term::process_dcs_seq () 3241rxvt_term::process_dcs_seq ()
3221{ 3242{
3222 char *s;
3223 unicode_t eh;
3224
3225 /* 3243 /*
3226 * Not handled yet 3244 * Not handled yet
3227 */ 3245 */
3246
3247 unicode_t eh;
3228 s = get_to_st (eh); 3248 char *s = get_to_st (eh);
3229 if (s) 3249 if (s)
3230 free (s); 3250 free (s);
3231 3251
3232 return; 3252 return;
3233} 3253}
… …
3237 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3257 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3238 */ 3258 */
3239void 3259void
3240rxvt_term::process_osc_seq () 3260rxvt_term::process_osc_seq ()
3241{ 3261{
3242 unicode_t ch, eh;
3243 int arg; 3262 int arg;
3244 3263
3245 ch = cmd_getc (); 3264 unicode_t ch = cmd_getc ();
3246 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3265 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3247 arg = arg * 10 + (ch - '0'); 3266 arg = arg * 10 + (ch - '0');
3248 3267
3249 if (ch == ';') 3268 if (ch == ';')
3250 { 3269 {
3270 unicode_t eh;
3251 char *s = get_to_st (eh); 3271 char *s = get_to_st (eh);
3252 3272
3253 if (s) 3273 if (s)
3254 { 3274 {
3255 process_xterm_seq (arg, s, eh); 3275 process_xterm_seq (arg, s, eh);
… …
3279 3299
3280/* 3300/*
3281 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3301 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3282 */ 3302 */
3283void 3303void
3284rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3304rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285{ 3305{
3286 int color; 3306 int color;
3287 char *buf, *name; 3307 char *buf, *name;
3288 bool query = str[0] == '?' && !str[1]; 3308 bool query = str[0] == '?' && !str[1];
3289 int saveop = op; 3309 int saveop = op;
… …
3316 unsigned long bytes_after; 3336 unsigned long bytes_after;
3317 unsigned char *value = 0; 3337 unsigned char *value = 0;
3318 const char *str = ""; 3338 const char *str = "";
3319 3339
3320 if (prop 3340 if (prop
3321 && XGetWindowProperty (dpy, parent[0], 3341 && XGetWindowProperty (dpy, parent,
3322 prop, 0, 1<<16, 0, AnyPropertyType, 3342 prop, 0, 1<<16, 0, AnyPropertyType,
3323 &actual_type, &actual_format, 3343 &actual_type, &actual_format,
3324 &nitems, &bytes_after, &value) == Success 3344 &nitems, &bytes_after, &value) == Success
3325 && actual_type != None 3345 && actual_type != None
3326 && actual_format == 8) 3346 && actual_format == 8)
… …
3330 3350
3331 XFree (value); 3351 XFree (value);
3332 } 3352 }
3333 else 3353 else
3334 { 3354 {
3335 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3355 char *eq = strchr (str, '=');
3336 3356
3337 if (eq) 3357 if (eq)
3338 { 3358 {
3339 *eq = 0; 3359 *eq = 0;
3340 set_utf8_property (display->atom (str), eq + 1); 3360 set_utf8_property (display->atom (str), eq + 1);
3341 } 3361 }
3342 else 3362 else
3343 XDeleteProperty (dpy, parent[0], 3363 XDeleteProperty (dpy, parent,
3344 display->atom (str)); 3364 display->atom (str));
3345 } 3365 }
3346 break; 3366 break;
3347 3367
3348 case XTerm_Color: 3368 case XTerm_Color:
… …
3380 process_color_seq (op, Color_pointer_fg, str, resp); 3400 process_color_seq (op, Color_pointer_fg, str, resp);
3381 break; 3401 break;
3382 case XTerm_Color_pointer_bg: 3402 case XTerm_Color_pointer_bg:
3383 process_color_seq (op, Color_pointer_bg, str, resp); 3403 process_color_seq (op, Color_pointer_bg, str, resp);
3384 break; 3404 break;
3405#ifdef OPTION_HC
3406 case XTerm_Color_HC:
3407 process_color_seq (op, Color_HC, str, resp);
3408 break;
3409 case XTerm_Color_HTC:
3410 process_color_seq (op, Color_HTC, str, resp);
3411 break;
3412#endif
3385#ifndef NO_BOLD_UNDERLINE_REVERSE 3413#ifndef NO_BOLD_UNDERLINE_REVERSE
3386 case XTerm_Color_RV:
3387 process_color_seq (op, Color_RV, str, resp);
3388 break;
3389 case Rxvt_Color_BD:
3390 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3391 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3392 break; 3416 break;
3393 case Rxvt_Color_UL:
3394 case URxvt_Color_UL: 3417 case URxvt_Color_UL:
3395 process_color_seq (op, Color_UL, str, resp); 3418 process_color_seq (op, Color_UL, str, resp);
3396 break; 3419 break;
3397 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3398 process_color_seq (op, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3399 break; 3422 break;
3400#endif 3423#endif
3424 case URxvt_Color_border:
3425 process_color_seq (op, Color_border, str, resp);
3426 break;
3401#if ENABLE_TRANSPARENCY 3427#if ENABLE_TRANSPARENCY
3402 case URxvt_Color_tint: 3428 case URxvt_Color_tint:
3403 process_color_seq (op, Color_tint, str, resp); 3429 process_color_seq (op, Color_tint, str, resp);
3404 { 3430 {
3405 bool changed = false; 3431 bool changed = false;
3406 3432
3407 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3411 3435
3412 if (changed) 3436 if (changed)
3413 update_background (); 3437 update_background ();
3414 } 3438 }
3415 3439
… …
3420 case Rxvt_Pixmap: 3444 case Rxvt_Pixmap:
3421 if (!strcmp (str, "?")) 3445 if (!strcmp (str, "?"))
3422 { 3446 {
3423 char str[256]; 3447 char str[256];
3424 3448
3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3449 sprintf (str, "[%dx%d+%d+%d]",
3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3450 min (h_scale, 32767), min (v_scale, 32767),
3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3451 min (h_align, 32767), min (v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST); 3452 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 } 3453 }
3430 else 3454 else
3431 { 3455 {
3432 int changed = 0; 3456 bool changed = false;
3433 3457
3434 if (*str != ';') 3458 if (*str != ';')
3435 { 3459 {
3436 /* reset to default scaling :*/
3437 bgPixmap.unset_geometry ();
3438 if (bgPixmap.set_file (str)) /* change pixmap */ 3460 if (bg_set_file (str)) /* change pixmap */
3439 changed++; 3461 changed = true;
3440 str = strchr (str, ';');
3441 if (str == NULL)
3442 bgPixmap.set_defaultGeometry ();
3443 } 3462 }
3444 3463 else
3445 while (str)
3446 { 3464 {
3447 str++; 3465 str++;
3448 if (bgPixmap.set_geometry (str)) 3466 if (bg_set_geometry (str, true))
3449 changed++; 3467 changed = true;
3450 str = strchr (str, ';');
3451 } 3468 }
3452 3469
3453 if (changed) 3470 if (changed)
3471 {
3472 if (bg_window_position_sensitive ())
3473 {
3474 int x, y;
3475 get_window_origin (x, y);
3476 bg_set_position (x, y);
3477 }
3454 update_background (); 3478 update_background ();
3479 }
3455 } 3480 }
3456 break; 3481 break;
3457#endif 3482#endif
3458 3483
3459 case XTerm_logfile: 3484 case XTerm_logfile:
… …
3529 break; 3554 break;
3530#endif 3555#endif
3531 3556
3532#if ENABLE_PERL 3557#if ENABLE_PERL
3533 case URxvt_perl: 3558 case URxvt_perl:
3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3559 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535 ; // no responses yet
3536 break; 3560 break;
3537#endif 3561#endif
3538 } 3562 }
3539} 3563}
3540/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
… …
3563 { 3587 {
3564 if (mode == 'r') 3588 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3589 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3590 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3591 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3592
3593 if (state)
3594 priv_modes |= bit;
3595 else
3596 priv_modes &= ~bit;
3569 } 3597 }
3570 3598
3571 return state; 3599 return state;
3572} 3600}
3573 3601
3574/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3575void 3603void
3576rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3577{ 3605{
3578 unsigned int i, j; 3606 unsigned int i, j;
3579 int state; 3607 int state;
3580 3608
3581 static const struct 3609 static const struct
3582 { 3610 {
3583 const int argval; 3611 const int argval;
3584 const unsigned long bit; 3612 const unsigned long bit;
3585 } argtopriv[] = { 3613 } argtopriv[] = {
3586 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR }, // DECCKM
3587 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 }, // DECANM
3588 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 }, // DECCOLM
3589 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll }, // DECSCLM
3590 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo }, // DECSCNM
3591 { 6, PrivMode_relOrigin }, 3619 { 6, PrivMode_relOrigin }, // DECOM
3592 { 7, PrivMode_Autowrap }, 3620 { 7, PrivMode_Autowrap }, // DECAWM
3593 // 8, bi-directional support mode 3621 // 8, auto-repeat keys // DECARM
3594 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
3595 // 18, 19 printing-related 3623 // 18 end FF to printer after print screen
3624 // 19 Print screen prints full screen/scroll region
3596 { 25, PrivMode_VisibleCursor }, 3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3597#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
3598 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
3599#endif 3628#endif
3600 { 35, PrivMode_ShiftKeys }, // rxvt extension 3629 { 35, PrivMode_ShiftKeys }, // rxvt extension
3630 // 38, tektronix mode // DECTEK
3601 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3602 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3603 // 45 margin bell NYI 3633 // 45 margin bell NYI
3604 // 46 start logging 3634 // 46 start logging
3605 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3606 { 66, PrivMode_aplKP }, 3636 { 66, PrivMode_aplKP }, // DECNKM
3607#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3608 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace }, // DECBKM
3609#endif 3639#endif
3610 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3611 { 1002, PrivMode_MouseBtnEvent }, 3641 { 1002, PrivMode_MouseBtnEvent },
3612 { 1003, PrivMode_MouseAnyEvent }, 3642 { 1003, PrivMode_MouseAnyEvent },
3643#if ENABLE_FRILLS
3644 { 1005, PrivMode_ExtModeMouse },
3645#endif
3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3646 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3614 { 1011, PrivMode_Keypress }, // rxvt extension 3647 { 1011, PrivMode_Keypress }, // rxvt extension
3648#if ENABLE_FRILLS
3649 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3650#endif
3615 // 1035 enable modifiers for alt, numlock NYI 3651 // 1035 enable modifiers for alt, numlock NYI
3616 // 1036 send ESC for meta keys NYI 3652 // 1036 send ESC for meta keys NYI
3617 // 1037 send DEL for keypad delete NYI 3653 // 1037 send DEL for keypad delete NYI
3618 { 1047, PrivMode_Screen }, 3654 { 1047, PrivMode_Screen },
3619 // 1048 save and restore cursor 3655 // 1048 save and restore cursor, implemented in code
3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3656 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste }, 3658 { 2004, PrivMode_BracketPaste },
3623 }; 3659 };
3624 3660
… …
3634 for (i = 0; i < nargs; i++) 3670 for (i = 0; i < nargs; i++)
3635 { 3671 {
3636 state = -1; 3672 state = -1;
3637 3673
3638 /* basic handling */ 3674 /* basic handling */
3639 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3675 for (j = 0; j < ecb_array_length (argtopriv); j++)
3640 if (argtopriv[j].argval == arg[i]) 3676 if (argtopriv[j].argval == arg[i])
3641 { 3677 {
3642 state = privcases (mode, argtopriv[j].bit); 3678 state = privcases (mode, argtopriv[j].bit);
3643 break; 3679 break;
3644 } 3680 }
… …
3652 3688
3653 scr_touch (true); 3689 scr_touch (true);
3654 break; 3690 break;
3655#endif 3691#endif
3656 case 1048: /* alternative cursor save */ 3692 case 1048: /* alternative cursor save */
3657 case 1049:
3658 if (option (Opt_secondaryScreen)) 3693 if (option (Opt_secondaryScreen))
3659 if (mode == 0) 3694 if (mode == 0)
3660 scr_cursor (RESTORE); 3695 scr_cursor (RESTORE);
3661 else if (mode == 1) 3696 else if (mode == 1)
3662 scr_cursor (SAVE); 3697 scr_cursor (SAVE);
… …
3671 case 2: /* VT52 mode */ 3706 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3707 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3708 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3709 * within VT52 mode
3675 */ 3710 */
3676 PrivMode (1, PrivMode_vt52); 3711 priv_modes |= PrivMode_vt52;
3677 break; 3712 break;
3678 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3715 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683 }
3684 break; 3716 break;
3685 case 4: /* smooth scrolling */ 3717 case 4: /* smooth scrolling */
3686 set_option (Opt_jumpScroll, !state); 3718 set_option (Opt_jumpScroll, !state);
3687 break; 3719 break;
3688 case 5: /* reverse video */ 3720 case 5: /* reverse video */
… …
3699 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3732 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3733 break;
3702#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
3703 case scrollBar_esc: 3735 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3736 scrollBar.map (state);
3705 {
3706 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3738 scr_touch (true);
3708 }
3709 break; 3739 break;
3710#endif 3740#endif
3711 case 25: /* visible/invisible cursor */ 3741 case 25: /* visible/invisible cursor */
3712 scr_cursor_visible (state); 3742 scr_cursor_visible (state);
3713 break; 3743 break;
… …
3726 case 1003: 3756 case 1003:
3727 if (state) 3757 if (state)
3728 { 3758 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 mouse_row = mouse_col = 0;
3731 vt_emask_mouse = PointerMotionMask; 3762 vt_emask_mouse = PointerMotionMask;
3732 } 3763 }
3733 else 3764 else
3734 vt_emask_mouse = NoEventMask; 3765 vt_emask_mouse = NoEventMask;
3766
3735 vt_select_input (); 3767 vt_select_input ();
3736 break; 3768 break;
3737 case 1010: /* scroll to bottom on TTY output inhibit */ 3769 case 1010: /* scroll to bottom on TTY output inhibit */
3738 set_option (Opt_scrollTtyOutput, !state); 3770 set_option (Opt_scrollTtyOutput, !state);
3739 break; 3771 break;
3740 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
3741 set_option (Opt_scrollTtyKeypress, state); 3773 set_option (Opt_scrollTtyKeypress, state);
3742 break; 3774 break;
3743 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
3744 if (option (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3777 if (!state)
3746 scr_erase_screen (2); 3778 scr_erase_screen (2);
3779
3747 scr_change_screen (state); 3780 scr_change_screen (state);
3748 break; 3781 break;
3749 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
3783 if (option (Opt_secondaryScreen))
3784 if (state)
3785 scr_cursor (SAVE);
3786
3750 scr_change_screen (state); 3787 scr_change_screen (state);
3788
3751 if (option (Opt_secondaryScreen)) 3789 if (option (Opt_secondaryScreen))
3752 if (current_screen != PRIMARY) 3790 if (state)
3753 scr_erase_screen (2); 3791 scr_erase_screen (2);
3792 else
3793 scr_cursor (RESTORE);
3754 break; 3794 break;
3755 default: 3795 default:
3756 break; 3796 break;
3757 } 3797 }
3758 } 3798 }
… …
3911 } 3951 }
3912 } 3952 }
3913} 3953}
3914/*}}} */ 3954/*}}} */
3915 3955
3916/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3917void
3918rxvt_term::process_graphics ()
3919{
3920 unicode_t ch, cmd = cmd_getc ();
3921
3922 if (cmd == 'Q')
3923 {
3924 /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 3956/* ------------------------------------------------------------------------- */
3936 3957
3937/* 3958/*
3938 * Send printf () formatted output to the command. 3959 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 3960 * Only use for small amounts of data.
… …
3952 3973
3953/* ---------------------------------------------------------------------- */ 3974/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 3975/* Write data to the pty as typed by the user, pasted with the mouse,
3955 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
3956 */ 3977 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3978static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 3979
3959void 3980void
3960rxvt_term::tt_write (const char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 3982{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3967 3988
3968 if (v_buflen == 0) 3989 if (v_buflen == 0)
3969 { 3990 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971 3992
3993 max_it (written, 0);
3994
3972 if ((unsigned int)written == len) 3995 if (written == len)
3973 return; 3996 return;
3974 3997
3975 data += written; 3998 data += written;
3976 len -= written; 3999 len -= written;
3977 } 4000 }
3978 4001
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4003
3981 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4005 v_buflen += len;
3983 4006
3984 pty_ev.set (ev::READ | ev::WRITE); 4007 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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