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.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC

… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
61 62
62#ifndef NO_FRILLS 63#if ENABLE_FRILLS || ISO_14755
63 64
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL 65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL 66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
67 70
71#if ISO_14755
68static unsigned short iso14755_symtab[] = { 72static unsigned short iso14755_symtab[] = {
69 // keysym, unicode 73 // keysym, unicode
70 XK_Left, 0x2190, 74 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190, 75 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191, 76 XK_Up, 0x2191,
… …
115 XK_KP_Space, 0x2422, 119 XK_KP_Space, 0x2422,
116 0, 120 0,
117}; 121};
118 122
119void 123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
120rxvt_term::commit_iso14755 () 210rxvt_term::commit_iso14755 ()
121{ 211{
122 wchar_t ch[2]; 212 wchar_t ch[2];
123 213
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 214 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 215 ch[1] = 0;
126 216
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 217 if (iso14755buf & ISO_14755_51)
128 { 218 {
129 char mb[16]; 219 char mb[16];
130 int len; 220 int len;
131 221
132 // allow verbatim 0-bytes and control-bytes to be entered 222 // allow verbatim 0-bytes and control-bytes to be entered
… …
320 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
321 { 411 {
322 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
323 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
324 } 414 }
325 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
326 { 416 {
327 switch (keysym) 417 switch (keysym)
328 { 418 {
329 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
330 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
331 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
332 return; 422 return;
333#if TODO // TODO 423#if TODO
334 /* rxvt extras */ 424 /* rxvt extras */
335 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
336 change_font (FONT_UP); 426 change_font (FONT_UP);
337 return; 427 return;
338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
341#endif 431#endif
342 } 432 }
343 } 433 }
344 } 434 }
345 435
346#ifndef NO_FRILLS 436#if ENABLE_FRILLS || ISO_14755
347 // ISO 14755 support 437 // ISO 14755 support
348 if (shft && ctrl) 438 if (shft && ctrl)
349 { 439 {
350 int hv; 440 int hv;
351 441
442 if (iso14755buf & ISO_14755_51
352 if (keysym == XK_space || keysym == XK_KP_Space 443 && (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter) 444 || keysym == XK_Return || keysym == XK_KP_Enter))
354 { 445 {
355 commit_iso14755 (); 446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
356 return; 451 return;
357 } 452 }
358 else if ((hv = hex_keyval (ev)) >= 0) 453 else if ((hv = hex_keyval (ev)) >= 0)
359 { 454 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
361 return; 460 return;
362 } 461 }
363 else 462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
364 iso14755buf = 0; 467 iso14755buf = 0;
468 }
365 } 469 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
368 iso14755buf |= ISO_14755_ACTIVE; 474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
369#endif 480#endif
370 481
371#ifdef PRINTPIPE 482#ifdef PRINTPIPE
372 if (keysym == XK_Print) 483 if (keysym == XK_Print)
373 { 484 {
… …
407 newlen = 1; 518 newlen = 1;
408 switch (keysym) 519 switch (keysym)
409 { 520 {
410#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 522 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
413 { 524 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
417 } 528 }
418 else 529 else
419 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
420 break; 531 break;
421#endif 532#endif
422#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
423 case XK_Delete: 534 case XK_Delete:
424 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
425 break; 536 break;
426#endif 537#endif
427 case XK_Tab: 538 case XK_Tab:
428 if (shft) 539 if (shft)
429 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
430 else 541 else
431 { 542 {
432#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 544 if (ctrl)
434 meta = 1; 545 meta = 1;
… …
444#ifdef XK_KP_Left 555#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 561 {
451 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 564 break;
454 } 565 }
455 else 566 else
456 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
459#endif 570#endif
460 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 577 /* do Shift first */
467 if (shft) 578 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 580 else if (ctrl)
470 { 581 {
471 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 584 }
474 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
476 break; 587 break;
477 588
478#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
480 case XK_KP_Prior: 591 case XK_KP_Prior:
481 /* allow shift to override */ 592 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 594 {
484 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
485 break; 596 break;
486 } 597 }
487 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
488# endif 599# endif
489 case XK_Prior: 600 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
491 break; 602 break;
492# ifdef XK_KP_Next 603# ifdef XK_KP_Next
493 case XK_KP_Next: 604 case XK_KP_Next:
494 /* allow shift to override */ 605 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 607 {
497 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
498 break; 609 break;
499 } 610 }
500 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
501# endif 612# endif
502 case XK_Next: 613 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
504 break; 615 break;
505#endif 616#endif
506 case XK_KP_Enter: 617 case XK_KP_Enter:
507 /* allow shift to override */ 618 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 620 {
510 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
511 } 633 }
512 else 634 else
513 { 635 {
514 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
516 } 638 }
517 break; 639 break;
518 640
519#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
520 case XK_KP_Begin: 642 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
522 break; 644 break;
523 645
524 case XK_KP_Insert: 646 case XK_KP_Insert:
525 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
526 break; 648 break;
527 649
528 case XK_KP_Delete: 650 case XK_KP_Delete:
529 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
530 break; 652 break;
531#endif 653#endif
532 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
538 break; 660 break;
539 661
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 678 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 680 {
559 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 683 }
562 else 684 else
563 { 685 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
566 } 688 }
567 break; 689 break;
568 690
569 case XK_Find: 691 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
571 break; 693 break;
572 case XK_Insert: 694 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
574 break; 696 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 698 case DXK_Remove:
577 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
578#endif 700#endif
579 case XK_Execute: 701 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
581 break; 703 break;
582 case XK_Select: 704 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
584 break; 706 break;
585#ifdef XK_KP_End 707#ifdef XK_KP_End
586 case XK_KP_End: 708 case XK_KP_End:
587 /* allow shift to override */ 709 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 711 {
590 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
591 break; 713 break;
592 } 714 }
593 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
594#endif 716#endif
595 case XK_End: 717 case XK_End:
596 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
597 break; 719 break;
598#ifdef XK_KP_Home 720#ifdef XK_KP_Home
599 case XK_KP_Home: 721 case XK_KP_Home:
600 /* allow shift to override */ 722 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 724 {
603 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
604 break; 726 break;
605 } 727 }
606 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
607#endif 729#endif
608 case XK_Home: 730 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
610 break; 732 break;
611 733
612#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 736
… …
667 default: 789 default:
668 newlen = 0; 790 newlen = 0;
669 break; 791 break;
670 } 792 }
671 if (newlen) 793 if (newlen)
672 len = STRLEN (kbuf); 794 len = strlen (kbuf);
673 } 795 }
674 796
675 /* 797 /*
676 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
677 */ 799 */
… …
705 } 827 }
706 828
707 if (len <= 0) 829 if (len <= 0)
708 return; /* not mapped */ 830 return; /* not mapped */
709 831
710 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
711 if (TermWin.view_start) 833 if (TermWin.view_start)
712 { 834 {
713 TermWin.view_start = 0; 835 TermWin.view_start = 0;
714 want_refresh = 1; 836 want_refresh = 1;
715 } 837 }
… …
764 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 888
767 if (n > 0 && s < count) 889 if (n > 0 && s < count)
768 { 890 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
773 s += n; 895 s += n;
774 } 896 }
… …
789#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
790 912
791void 913void
792rxvt_term::flush () 914rxvt_term::flush ()
793{ 915{
916 flush_ev.stop ();
917
794#ifdef TRANSPARENT 918#ifdef TRANSPARENT
795 if (want_full_refresh) 919 if (want_full_refresh)
796 { 920 {
797 want_full_refresh = 0; 921 want_full_refresh = 0;
798 scr_clear (); 922 scr_clear ();
… …
808 IMSendSpot (); 932 IMSendSpot ();
809#endif 933#endif
810 } 934 }
811 935
812 display->flush (); 936 display->flush ();
813
814 flush_ev.stop ();
815} 937}
816 938
817void 939void
818rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
819{ 941{
… …
917 1039
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
921 1043
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1045
924 if (n > 0) 1046 if (n > 0)
925 { 1047 {
926 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
927 return true; 1049 return true;
… …
954 recolour_cursor (); 1076 recolour_cursor ();
955 1077
956#ifdef POINTER_BLANK 1078#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1079 hidden_pointer = 0;
958 1080
959 if (Options & Opt_pointerBlank) 1081 if (options & Opt_pointerBlank)
960 pointer_ev.start (NOW + pointerBlankDelay); 1082 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1083#endif
962} 1084}
963 1085
964#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
965void 1087void
966rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
967{ 1089{
968 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
969 return; 1091 return;
970 1092
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
972 XFlush (display->display); 1094 XFlush (display->display);
973 1095
… …
993 x = ev.x; 1115 x = ev.x;
994 y = ev.y; 1116 y = ev.y;
995 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
996 1118
997 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1120 button_number = 3;
1000 }
1001 else 1121 else
1002 { 1122 {
1003 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1125 if (button_number >= 3)
1006 button_number += (64 - 3); 1126 button_number += (64 - 3);
1007 } 1127 }
1008 1128
1009 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
1010 { 1130 {
1011 /* 1131 /*
1012 * do not report ButtonRelease 1132 * do not report ButtonRelease
1013 * no state info allowed 1133 * no state info allowed
1014 */ 1134 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1153#endif
1034
1035 } 1154 }
1036 1155
1037#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1158 if (key_state & 16)
1040 fputc ('C', stderr); 1159 fputc ('C', stderr);
1041 if (key_state & 4) 1160 if (key_state & 4)
1042 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1165 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1167 button_number,
1049 x + 1, 1168 x + 1,
1050 y + 1); 1169 y + 1);
1051#else 1170#endif
1171
1052 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
1054 (32 + x + 1), 1174 (32 + x + 1),
1055 (32 + y + 1)); 1175 (32 + y + 1));
1056#endif
1057} 1176}
1058 1177
1059#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
1060void 1179void
1061rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
1072{ 1191{
1073 SET_R (this); 1192 SET_R (this);
1074 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
1075 1194
1076#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1197 {
1079 if (hidden_cursor) 1198 if (hidden_cursor)
1080 { 1199 {
1081 hidden_cursor = 0; 1200 hidden_cursor = 0;
1082 want_refresh = 1; 1201 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1205 }
1087#endif 1206#endif
1088 1207
1089#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1210 {
1092 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1214 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1218 pointer_blank ();
1100 } 1219 }
1101#endif 1220#endif
1102 1221
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1224 unsigned int unused_mask;
1111
1112#ifdef DEBUG_X
1113 const char *const eventnames[] =
1114 { /* mason - this matches my system */
1115 "",
1116 "",
1117 "KeyPress",
1118 "KeyRelease",
1119 "ButtonPress",
1120 "ButtonRelease",
1121 "MotionNotify",
1122 "EnterNotify",
1123 "LeaveNotify",
1124 "FocusIn",
1125 "FocusOut",
1126 "KeymapNotify",
1127 "Expose",
1128 "GraphicsExpose",
1129 "NoExpose",
1130 "VisibilityNotify",
1131 "CreateNotify",
1132 "DestroyNotify",
1133 "UnmapNotify",
1134 "MapNotify",
1135 "MapRequest",
1136 "ReparentNotify",
1137 "ConfigureNotify",
1138 "ConfigureRequest",
1139 "GravityNotify",
1140 "ResizeRequest",
1141 "CirculateNotify",
1142 "CirculateRequest",
1143 "PropertyNotify",
1144 "SelectionClear",
1145 "SelectionRequest",
1146 "SelectionNotify",
1147 "ColormapNotify",
1148 "ClientMessage",
1149 "MappingNotify"
1150 };
1151#endif
1152
1153#ifdef DEBUG_X
1154 struct timeval tp;
1155 struct tm *ltt;
1156 (void)gettimeofday (&tp, NULL);
1157 ltt = localtime (& (tp.tv_sec));
1158 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1159#endif
1160 1225
1161 switch (ev.type) 1226 switch (ev.type)
1162 { 1227 {
1163 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1165 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1166 1233
1167 break; 1234 break;
1168 1235
1169 case KeyRelease: 1236 case KeyRelease:
1170 { 1237 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1239 KeySym ks;
1173 1240
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1242#endif
1176 1243
1177#ifndef NO_FRILLS 1244#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1245 // ISO 14755 support
1179 if (iso14755buf) 1246 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1247 if (iso14755buf & ISO_14755_52)
1181 { 1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1253 // iso14755 part 5.2 handling: release time
1183 // first: controls 1254 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1255 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1256 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1257 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1258 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1260 commit_iso14755 ();
1190 return; // case-break; 1261 return; // case-break;
1191 } 1262 }
1192 1263
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1265 if (i[0] == ks)
1195 { 1266 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1267 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1268 commit_iso14755 ();
1198 return; // case-break; 1269 return; // case-break;
1199 } 1270 }
1200 1271
1272 scr_bell ();
1273# endif
1201 iso14755buf = 0; 1274 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1275 break;
1204 } 1276 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1282 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1283 commit_iso14755 ();
1284#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1211 } 1295 }
1212#endif 1296#endif
1213 1297
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
… …
1250 0L, 1000000L, 1334 0L, 1000000L,
1251 False, AnyPropertyType, 1335 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1254 &data); 1338 &data);
1255 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1340 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1262 } 1343 }
1263#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1264 break; 1345 break;
1265 1346
… …
1297 { 1378 {
1298 TermWin.focus = 1; 1379 TermWin.focus = 1;
1299 want_refresh = 1; 1380 want_refresh = 1;
1300#ifdef USE_XIM 1381#ifdef USE_XIM
1301 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1302 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1303#endif 1387#endif
1304#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif 1391#endif
1308#ifdef OFF_FOCUS_FADING 1392#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade]) 1393 if (rs[Rs_fade])
1310 { 1394 {
1311 PixColors = PixColorsFocused; 1395 pix_colors = pix_colors_focused;
1312 set_colorfgbg ();
1313 scr_clear (); 1396 scr_recolour ();
1314 scr_touch (true);
1315 } 1397 }
1316#endif 1398#endif
1317 1399
1318 } 1400 }
1319 break; 1401 break;
… …
1321 case FocusOut: 1403 case FocusOut:
1322 if (TermWin.focus) 1404 if (TermWin.focus)
1323 { 1405 {
1324 TermWin.focus = 0; 1406 TermWin.focus = 0;
1325 want_refresh = 1; 1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1326#ifdef USE_XIM 1415#ifdef USE_XIM
1327 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1329#endif 1418#endif
1330#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1332 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1333 hidden_cursor = 0; 1422 hidden_cursor = 0;
1334#endif 1423#endif
1335#ifdef OFF_FOCUS_FADING 1424#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade]) 1425 if (rs[Rs_fade])
1337 { 1426 {
1338 PixColors = PixColorsUnFocused; 1427 pix_colors = pix_colors_unfocused;
1339 set_colorfgbg ();
1340 scr_clear (); 1428 scr_recolour ();
1341 scr_touch (true);
1342 } 1429 }
1343#endif 1430#endif
1344
1345 } 1431 }
1346 break; 1432 break;
1347 1433
1348 case ConfigureNotify: 1434 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 } 1444 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360 1446
1361 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1448 {
1449 seen_resize = 1;
1362 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1451 }
1363 1452
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1455 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1456#endif
1372 } 1457 }
1373 break; 1458 break;
1374 1459
1375 case PropertyNotify: 1460 case PropertyNotify:
… …
1383 selection_clear (); 1468 selection_clear ();
1384 break; 1469 break;
1385 1470
1386 case SelectionNotify: 1471 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1474 break;
1391 1475
1392 case SelectionRequest: 1476 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1394 break; 1478 break;
… …
1466 { 1550 {
1467 menubar_control (ev.xbutton); 1551 menubar_control (ev.xbutton);
1468 break; 1552 break;
1469 } 1553 }
1470#endif 1554#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1556 break;
1473 1557
1474 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1475 { 1559 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1561 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1479 ; 1563 ;
1480 1564
1481 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1482 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1569 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1573 {
1490#endif 1574#endif
1575#if ISO_14755
1576 // 5.4
1577 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1578 {
1579 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1580 break;
1581 }
1582#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1493#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1496 { 1589 {
1497 int dist; 1590 int dist;
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1597
1505 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1507 */ 1600 */
1508 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1604
1513 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1515 { 1607 {
1516 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1518 } 1610 }
1519 else 1611 else
1520 { 1612 {
1521 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y -
1523 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1524 } 1615 }
1616
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1527 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1529 } 1622 }
1530 else 1623 else
1531 { 1624 {
1532 /* we are within the text window, so we 1625 /* we are within the text window, so we
1533 * shouldn't be scrolling 1626 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1628 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1629 sel_scroll_ev.stop();
1537 } 1630 }
1538#endif 1631#endif
1539#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1540
1541 } 1633 }
1542#endif 1634#endif
1543
1544 } 1635 }
1545 } 1636 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1638 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1549 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1550 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1551 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1647 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1649 scrollbar_size ());
1557 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1583 return; 1676 return;
1584 1677
1585 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1586 case ReparentNotify: 1679 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1589 break; 1682 break;
1590 } 1683 }
1591} 1684}
1592#endif 1685#endif
… …
1596{ 1689{
1597 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1598 1691
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1693 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1602 /* 1696 /*
1603 * VT window processing of button press 1697 * VT window processing of button press
1604 */ 1698 */
1605 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1606 { 1700 {
1701#if ISO_14755
1702 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 {
1705 iso14755_54 (ev.x, ev.y);
1706 return;
1707 }
1708#endif
1709
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1608 if (reportmode) 1712 if (reportmode)
1609 { 1713 {
1610 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1641 } 1745 }
1642 else 1746 else
1643 { 1747 {
1644 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1646 switch (ev.button) 1751 switch (ev.button)
1647 { 1752 {
1648 case Button1: 1753 case Button1:
1754 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */
1756#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask);
1758#else
1759 selection.rect = false;
1760#endif
1761
1649 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1764 {
1652 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1654 else 1767 else
1655 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1783 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1673 else 1786 else
1674 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1675 MEvent.button = Button3; 1789 MEvent.button = Button3;
1676 break; 1790 break;
1677 } 1791 }
1678 } 1792 }
1793
1679 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1680 return; 1795 return;
1681 } 1796 }
1682 1797
1683 /* 1798 /*
… …
1836{ 1951{
1837 int reportmode = 0; 1952 int reportmode = 0;
1838 1953
1839 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 1955 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 1957
1843 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1844 { 1959 {
1845 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1846 scrollbar_show (0); 1961 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 1964#endif
1850
1851 } 1965 }
1966
1852#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 1968 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 1969 sel_scroll_ev.stop();
1855#endif 1970#endif
1971
1856 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1857 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1858 if (reportmode) 1979 if (reportmode)
1859 { 1980 {
1860 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1877 mouse_report (ev); 1998 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2000 return;
1880 } 2001 }
2002
1881 /* 2003 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2005 * when overriding mouse reporting
1884 */ 2006 */
1885 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2008 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1889 2011
1890 switch (ev.button) 2012 switch (ev.button)
… …
1905 2027
1906 v = ev.button == Button4 ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
1907 2029
1908 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1909 i = 1; 2031 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2032 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1912 else 2034 else
1913 i = 5; 2035 i = 5;
1914 2036
1915# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
… …
2200 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
2202 2324
2203 pchanged = 0; 2325 pchanged = 0;
2204 2326
2205 if (!(Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
2207 2329
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
2210 2332
… …
2213 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
2214 { 2336 {
2215 if (am_transparent) 2337 if (am_transparent)
2216 { 2338 {
2217 pchanged = 1; 2339 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
2220 } 2342 }
2221 2343
2222 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
2223 } 2345 }
… …
2286 sy = 0; 2408 sy = 0;
2287 } 2409 }
2288 2410
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2291 allowedxerror = -1; 2415 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2417
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
… …
2318 if (ISSET_PIXCOLOR (Color_tint)) 2442 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2443 {
2320 unsigned short rm, gm, bm; 2444 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2446
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2448
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2449 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2450 }
2327#endif 2451#endif
2328 2452
… …
2341 2465
2342 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2343 } 2467 }
2344 } 2468 }
2345 2469
2346 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2347 { 2473 {
2348 unsigned int n; 2474 unsigned int n;
2349 /* 2475 /*
2350 * InheritPixmap transparency 2476 * InheritPixmap transparency
2351 */ 2477 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 { 2479 {
2355 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2483 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2484
2361 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2362 { 2486 {
2363 if (oldp != None) 2487 if (oldp != None)
2364 pchanged = 1; 2488 pchanged = 1;
… …
2375 if (pchanged) 2499 if (pchanged)
2376 { 2500 {
2377 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2378 { 2502 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2505 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break; 2507 break;
2385 } 2508 }
2386 } 2509 }
2387 } 2510 }
2388 2511
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 { 2513 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2516 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2396 } 2518 }
2397 else 2519 else
2398 { 2520 {
2399#if WAIT_FOR_WM 2521#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2524 sleep (1);
2403#endif 2525#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2406 { 2527 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2529 XClearWindow (display->display, TermWin.parent[n]);
2409 } 2530 }
… …
2414 2535
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2537 TermWin.parent[i] = None;
2417 } 2538 }
2418 2539
2419 // this is experimental
2420 if (scrollBar.win) 2540 if (scrollBar.win)
2421 { 2541 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2543 scrollBar.setIdle ();
2425 scrollbar_show (0); 2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2426 } 2552 }
2427 2553
2428 return pchanged; 2554 return pchanged;
2429} 2555}
2430#endif 2556#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2575 if (ch == NOCHAR) // TODO: improve
2450 break; 2576 break;
2451 2577
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2578 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2579 {
2580 if (!seen_input)
2581 {
2582 seen_input = 1;
2583 // many badly-written programs (e.g. jed) contain a race condition:
2584 // they first read the screensize and then install a SIGWINCH handler.
2585 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized.
2590 if (seen_resize)
2591 kill (-cmd_pid, SIGWINCH);
2592 }
2593
2454 /* Read a text string from the input buffer */ 2594 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2595 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2596 bool refreshnow = false;
2457 int nlines = 0; 2597 int nlines = 0;
2458 unicode_t *str = buf; 2598 unicode_t *str = buf;
… …
2467 if (ch == C0_LF) 2607 if (ch == C0_LF)
2468 { 2608 {
2469 nlines++; 2609 nlines++;
2470 refresh_count++; 2610 refresh_count++;
2471 2611
2472 if (!(Options & Opt_jumpScroll) 2612 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2614 {
2475 refreshnow = true; 2615 refreshnow = true;
2476 ch = NOCHAR; 2616 ch = NOCHAR;
2477 break; 2617 break;
… …
2504 * the number of pages between refreshes is refresh_limit, which 2644 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2645 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2646 */
2507 if (refreshnow) 2647 if (refreshnow)
2508 { 2648 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2650 refresh_limit++;
2511 else 2651 else
2512 { 2652 {
2513 flag = true; 2653 flag = true;
2514 scr_refresh (refresh_type); 2654 scr_refresh (refresh_type);
… …
2704 process_escape_seq (); 2844 process_escape_seq ();
2705 break; 2845 break;
2706 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2850 else
2711 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2713 break; 2853 break;
2714 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2715 scr_bell (); 2855 scr_bell ();
2716 break; 2856 break;
2717 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2816void 2956void
2817rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2818{ 2958{
2819 unicode_t ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2820 2960
2821 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2822 { 2962 {
2823 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2824 return; 2964 return;
2825 } 2965 }
2826 2966
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2982 break;
2843 case '+': 2983 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2985 break;
2846#ifndef NO_FRILLS 2986#if ENABLE_FRILLS
2847 case '6': 2987 case '6':
2848 scr_backindex (); 2988 scr_backindex ();
2849 break; 2989 break;
2850#endif 2990#endif
2851 case '7': 2991 case '7':
2852 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2853 break; 2993 break;
2854 case '8': 2994 case '8':
2855 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2856 break; 2996 break;
2857#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2858 case '9': 2998 case '9':
2859 scr_forwardindex (); 2999 scr_forwardindex ();
2860 break; 3000 break;
2861#endif 3001#endif
2862 case '=': 3002 case '=':
… …
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
3162 break; 3302 break;
3163 3303
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3307 break;
3168 3308
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
3171 break; 3311 break;
… …
3178 break; 3318 break;
3179 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
3180 scr_report_position (); 3320 scr_report_position ();
3181 break; 3321 break;
3182 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3323 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3325 break;
3186 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3328 break;
3189 } 3329 }
… …
3225 break; 3365 break;
3226 3366
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3368 if (arg[0] == 4)
3229 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
3230 break; 3372 break;
3231 3373
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3375 if (arg[0] == 4)
3234 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
3235 break; 3379 break;
3236 3380
3237 /* 3381 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3383 */
… …
3251 break; 3395 break;
3252 case CSI_75: 3396 case CSI_75:
3253 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
3254 break; 3398 break;
3255 3399
3256#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
3257 case CSI_74: 3401 case CSI_74:
3258 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
3259 break; 3403 break;
3260#endif 3404#endif
3261 3405
… …
3268 break; 3412 break;
3269 } 3413 }
3270} 3414}
3271/*}}} */ 3415/*}}} */
3272 3416
3273#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
3274/* ARGSUSED */ 3418/* ARGSUSED */
3275void 3419void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3421{
3278 int x, y; 3422 int x, y;
… …
3348 break; 3492 break;
3349 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3350 { 3494 {
3351 char *s; 3495 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3498 XFree (s);
3355 } 3499 }
3356 break; 3500 break;
3357 case 21: /* report window title */ 3501 case 21: /* report window title */
3358 { 3502 {
3359 char *s; 3503 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3506 XFree (s);
3363 } 3507 }
3364 break; 3508 break;
3365 } 3509 }
3366} 3510}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3516 * ends_how is terminator used. returned input must be free()'d
3373 */ 3517 */
3374unsigned char * 3518unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3520{
3377 unicode_t prev = 0, ch; 3521 unicode_t ch;
3522 bool seen_esc = false;
3378 unsigned int n = 0; 3523 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3524 wchar_t string[STRING_MAX];
3381 3525
3382 while ((ch = cmd_getc ()) != NOCHAR) 3526 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3527 {
3384 if (prev == C0_ESC) 3528 if (seen_esc)
3385 { 3529 {
3386 if (ch == 0x5c) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
3387 break; 3531 break;
3388 else 3532 else
3389 return NULL; 3533 return NULL;
3390 } 3534 }
3535 else if (ch == C0_ESC)
3536 {
3537 seen_esc = true;
3538 continue;
3539 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3540 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3541 break;
3393 else if (ch < 0x20) 3542 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3395 3546
3396 if (n >= sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3397 // stop at some sane length 3548 // stop at some sane length
3398 return NULL; 3549 return NULL;
3399 3550
3400 if (ch == C0_SYN) 3551 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3552 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3553 else
3406 string[n++] = prev = ch; 3554 string[n++] = ch;
3407 } 3555 }
3408 3556
3409 string[n++] = '\0'; 3557 string[n++] = '\0';
3410 3558
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3560
3416 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
3417} 3562}
3418 3563
3419/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3420/* 3565/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3612{
3468 if (str[0] == '?' && !str[1]) 3613 if (str[0] == '?' && !str[1])
3469 { 3614 {
3470 unsigned short r, g, b; 3615 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3616 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3618 }
3474 else 3619 else
3475 set_window_color (color, str); 3620 set_window_color (color, str);
3476} 3621}
… …
3505{ 3650{
3506 int changed = 0; 3651 int changed = 0;
3507 int color; 3652 int color;
3508 char *buf, *name; 3653 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
3510 3656
3511 assert (str != NULL); 3657 assert (str != NULL);
3512 switch (op) 3658 switch (op)
3513 { 3659 {
3514 case XTerm_name: 3660 case XTerm_name:
… …
3521 set_title (str); 3667 set_title (str);
3522 break; 3668 break;
3523 case XTerm_property: 3669 case XTerm_property:
3524 if (str[0] == '?') 3670 if (str[0] == '?')
3525 { 3671 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3672 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3673 Atom actual_type;
3528 int actual_format; 3674 int actual_format;
3529 unsigned long nitems; 3675 unsigned long nitems;
3530 unsigned long bytes_after; 3676 unsigned long bytes_after;
3531 unsigned char *value = 0; 3677 unsigned char *value = 0;
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3696
3551 if (eq) 3697 if (eq)
3552 { 3698 {
3553 *eq = 0; 3699 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3700 set_utf8_property (display->atom (str), eq + 1);
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 } 3701 }
3559 else 3702 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3703 XDeleteProperty (display->display, TermWin.parent[0],
3561 display->atom (str)); 3704 display->atom (str));
3562 } 3705 }
3563 break; 3706 break;
3564 3707
3565 case XTerm_Color: 3708 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3567 { 3710 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3712 break;
3570 3713
3571 *name++ = '\0'; 3714 *name++ = '\0';
3572 color = atoi (buf); 3715 color = atoi (buf);
3573 3716
3574 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3718 break;
3576 3719
3577 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3721 *buf++ = '\0';
3579 3722
3580 if (name[0] == '?' && !name[1]) 3723 if (name[0] == '?' && !name[1])
3581 { 3724 {
3582 unsigned short r, g, b; 3725 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3728 }
3586 else 3729 else
3587 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3588 } 3731 }
… …
3606 break; 3749 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break; 3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3611 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3759 break;
3614 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762 break;
3763#endif
3764#if TRANSPARENT && TINTING
3765 case XTerm_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3767 check_our_parents ();
3768 if (am_transparent)
3769 want_full_refresh = want_refresh = 1;
3616 break; 3770 break;
3617#endif 3771#endif
3618 3772
3619 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3620 if (*str != ';') 3774 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3625#endif 3779#endif
3626 scr_touch (true); 3780 scr_touch (true);
3627 } 3781 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3629 { 3783 {
3630 str++; 3784 str++;
3631#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3633#endif 3787#endif
… …
3652 case XTerm_logfile: 3806 case XTerm_logfile:
3653 // TODO, when secure mode? 3807 // TODO, when secure mode?
3654 break; 3808 break;
3655 3809
3656 case XTerm_font: 3810 case XTerm_font:
3811 op = URxvt_font;
3812 case URxvt_font:
3813#if ENABLE_STYLES
3814 case URxvt_boldFont:
3815 case URxvt_italicFont:
3816 case URxvt_boldItalicFont:
3817#endif
3657 if (query) 3818 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3819 tt_printf ("\33]%d;%-.250s%c", saveop,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc 3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3660 ? TermWin.fontset->fontdesc : "", 3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3661 resp); 3822 resp);
3662 else 3823 else
3824 {
3825 const char *&res = rs[Rs_font + (op - URxvt_font)];
3826
3827 res = strdup (str);
3828 allocated.push_back ((void *)res);
3663 change_font (str); 3829 set_fonts ();
3830 }
3664 break; 3831 break;
3665 3832
3666#ifndef NO_FRILLS 3833#if ENABLE_FRILLS
3667 case XTerm_locale: 3834 case XTerm_locale:
3668 if (query) 3835 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); 3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3670 else 3837 else
3671 { 3838 {
3672 set_locale (str); 3839 set_locale (str);
3673# ifdef USE_XIM 3840# ifdef USE_XIM
3674 im_cb (); 3841 im_cb ();
3675# endif 3842# endif
3676 } 3843 }
3677 break; 3844 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif 3845#endif
3689 3846
3690#ifdef MENUBAR 3847#ifdef MENUBAR
3691 case XTerm_Menu: 3848 case XTerm_Menu:
3692 if (Options & Opt_insecure) 3849 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3851 break;
3695#endif 3852#endif
3696#if 0 3853#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
… …
3724{ 3881{
3725 int state; 3882 int state;
3726 3883
3727 if (mode == 's') 3884 if (mode == 's')
3728 { 3885 {
3729 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3730 return -1; 3887 return -1;
3731 } 3888 }
3732 else 3889 else
3733 { 3890 {
3734 if (mode == 'r') 3891 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3893 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3895 PrivMode (state, bit);
3739 } 3896 }
3740 3897
3741 return state; 3898 return state;
3742} 3899}
… …
3760 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3924#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3768#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3931#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3934 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3935 // 45 margin bell NYI
3779 // 46 start logging 3936 // 46 start logging
… …
3820 3977
3821 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3979 switch (arg[i])
3823 { 3980 {
3824 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3825 if (Options & Opt_secondaryScreen) 3983 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 3984 if (mode == 0)
3827 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3828 else if (mode == 1) 3986 else if (mode == 1)
3829 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3830 break; 3988 break;
… …
3841 * within VT52 mode 3999 * within VT52 mode
3842 */ 4000 */
3843 PrivMode (1, PrivMode_vt52); 4001 PrivMode (1, PrivMode_vt52);
3844 break; 4002 break;
3845 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3848 break; 4006 break;
3849 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3850 if (state) 4008 if (state)
3851 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3852 else 4010 else
3853 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3854 break; 4012 break;
3855 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3857 break; 4015 break;
3858 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4020 scr_autowrap (state);
3863 break; 4021 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4022 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4025 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4026 break;
3869#ifdef menuBar_esc 4027#ifdef menuBar_esc
3870 case menuBar_esc: 4028 case menuBar_esc:
3871#ifdef MENUBAR 4029#ifdef MENUBAR
3872 map_menuBar (state); 4030 map_menuBar (state);
… …
3892 break; 4050 break;
3893 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4055 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4056 break;
3899#if 0 4057#if 0
3900 case 1001: 4058 case 1001:
3901 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3902#endif 4060#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4062 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3906 else 4064 else
3907 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3908 break; 4066 break;
3909 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3910 if (state) 4068 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3912 else 4070 else
3913 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3914 break; 4072 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4073 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4074 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4076 scr_erase_screen (2);
3919 scr_change_screen (state); 4077 scr_change_screen (state);
3920 break; 4078 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4079 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4080 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4081 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4082 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4083 scr_erase_screen (2);
3926 break; 4084 break;
3927 default: 4085 default:
3928 break; 4086 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3955 break; 4113 break;
3956 case 1: 4114 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3958 break; 4116 break;
3959 //case 2: // faint or second colour 4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3960 case 4: 4121 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3962 break; 4123 break;
3963 case 5: // slowly blinking 4124 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4125 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4137 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4138 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4139 //...
3979 //case 19: // ninth alt font 4140 //case 19: // ninth alt font
3980 //case 20: // gothic 4141 //case 20: // gothic
3981 case 21: // disable bold, faint 4142 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
3983 break; 4144 break;
3984 case 22: 4145 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
3986 break; 4147 break;
3987 //case 23: disable italic 4148 case 23: // disable italic
4149 rendset = 0, rendstyle = RS_Italic;
4150 break;
3988 case 24: 4151 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3990 break; 4153 break;
3991 case 25: 4154 case 25:
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
4157 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3993 break; 4159 break;
3994 case 27: 4160 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3996 break; 4162 break;
… …
4014 case 35: 4180 case 35:
4015 case 36: 4181 case 36:
4016 case 37: 4182 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4184 break;
4019#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4187 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4189 i += 2;
4025 } 4190 }
4026 break; 4191 break;
4027#endif
4028 case 39: /* default fg */ 4192 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
4030 break; 4194 break;
4031 4195
4032 case 40: 4196 case 40:
… …
4037 case 45: 4201 case 45:
4038 case 46: 4202 case 46:
4039 case 47: 4203 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4205 break;
4042#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4208 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4210 i += 2;
4048 } 4211 }
4049 break; 4212 break;
4050#endif
4051 case 49: /* default bg */ 4213 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
4053 break; 4215 break;
4216
4217 //case 50: // not variable spacing
4054 4218
4055#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
4056 case 90: 4220 case 90:
4057 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
4058 case 92: 4222 case 92:
4059 case 93: 4223 case 93:
4060 case 94: 4224 case 94:
4061 case 95: 4225 case 95:
4062 case 96: 4226 case 96:
4063 case 97: 4227 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4229 break;
4067 case 100: 4230 case 100:
4068 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
4069 case 102: 4232 case 102:
4070 case 103: 4233 case 103:
4071 case 104: 4234 case 104:
4072 case 105: 4235 case 105:
4073 case 106: 4236 case 106:
4074 case 107: 4237 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4239 break;
4078#endif 4240#endif
4079 4241
4080 } 4242 }
4081 } 4243 }
… …
4088{ 4250{
4089 unicode_t ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
4090 4252
4091 if (cmd == 'Q') 4253 if (cmd == 'Q')
4092 { /* query graphics */ 4254 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4256 return;
4095 } 4257 }
4096 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
4097 do 4259 do
4098 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4275 unsigned char buf[256];
4114 4276
4115 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4279 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
4119} 4281}
4120 4282
4121/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4284/* Write data to the pty as typed by the user, pasted with the mouse,
4123 * or generated by us in response to a query ESC sequence. 4285 * or generated by us in response to a query ESC sequence.
4124 */ 4286 */
4125void 4287void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4289{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4129 4291
4130 if (len) 4292 if (len)
4131 { 4293 {
4132 if (v_buflen == 0) 4294 if (v_buflen == 0)
4133 { 4295 {
4134 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4135 4297
4136 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
4137 return; 4299 return;
4138 4300
4139 data += written; 4301 data += written;
… …
4147 v_buflen += len; 4309 v_buflen += len;
4148 } 4310 }
4149 4311
4150 for (;;) 4312 for (;;)
4151 { 4313 {
4152 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4153 4315
4154 if (written > 0) 4316 if (written > 0)
4155 { 4317 {
4156 v_buflen -= written; 4318 v_buflen -= written;
4157 4319

Diff Legend

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