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.177 by root, Mon Dec 13 07:18:52 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;
… …
936rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1059{
938 SET_R (this); 1060 SET_R (this);
939 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
940 1062
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1065 while (pty_fill ())
946 if (cmd_parse ()) 1066 if (cmd_parse ())
947 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
948} 1071}
949 1072
950void 1073void
951rxvt_term::pointer_unblank () 1074rxvt_term::pointer_unblank ()
952{ 1075{
… …
954 recolour_cursor (); 1077 recolour_cursor ();
955 1078
956#ifdef POINTER_BLANK 1079#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1080 hidden_pointer = 0;
958 1081
959 if (Options & Opt_pointerBlank) 1082 if (options & Opt_pointerBlank)
960 pointer_ev.start (NOW + pointerBlankDelay); 1083 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1084#endif
962} 1085}
963 1086
964#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
965void 1088void
966rxvt_term::pointer_blank () 1089rxvt_term::pointer_blank ()
967{ 1090{
968 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
969 return; 1092 return;
970 1093
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
972 XFlush (display->display); 1095 XFlush (display->display);
973 1096
… …
993 x = ev.x; 1116 x = ev.x;
994 y = ev.y; 1117 y = ev.y;
995 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
996 1119
997 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1121 button_number = 3;
1000 }
1001 else 1122 else
1002 { 1123 {
1003 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1126 if (button_number >= 3)
1006 button_number += (64 - 3); 1127 button_number += (64 - 3);
1007 } 1128 }
1008 1129
1009 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
1010 { 1131 {
1011 /* 1132 /*
1012 * do not report ButtonRelease 1133 * do not report ButtonRelease
1013 * no state info allowed 1134 * no state info allowed
1014 */ 1135 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1154#endif
1034
1035 } 1155 }
1036 1156
1037#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1159 if (key_state & 16)
1040 fputc ('C', stderr); 1160 fputc ('C', stderr);
1041 if (key_state & 4) 1161 if (key_state & 4)
1042 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1166 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1168 button_number,
1049 x + 1, 1169 x + 1,
1050 y + 1); 1170 y + 1);
1051#else 1171#endif
1172
1052 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
1054 (32 + x + 1), 1175 (32 + x + 1),
1055 (32 + y + 1)); 1176 (32 + y + 1));
1056#endif
1057} 1177}
1058 1178
1059#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
1060void 1180void
1061rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
1072{ 1192{
1073 SET_R (this); 1193 SET_R (this);
1074 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
1075 1195
1076#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1198 {
1079 if (hidden_cursor) 1199 if (hidden_cursor)
1080 { 1200 {
1081 hidden_cursor = 0; 1201 hidden_cursor = 0;
1082 want_refresh = 1; 1202 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1206 }
1087#endif 1207#endif
1088 1208
1089#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1211 {
1092 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1215 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1219 pointer_blank ();
1100 } 1220 }
1101#endif 1221#endif
1102 1222
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1225 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 1226
1161 switch (ev.type) 1227 switch (ev.type)
1162 { 1228 {
1163 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
1165 lookup_key (ev.xkey); 1233 lookup_key (ev.xkey);
1166 1234
1167 break; 1235 break;
1168 1236
1169 case KeyRelease: 1237 case KeyRelease:
1170 { 1238 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1240 KeySym ks;
1173 1241
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1243#endif
1176 1244
1177#ifndef NO_FRILLS 1245#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1246 // ISO 14755 support
1179 if (iso14755buf) 1247 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1248 if (iso14755buf & ISO_14755_52)
1181 { 1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1254 // iso14755 part 5.2 handling: release time
1183 // first: controls 1255 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1256 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1257 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1258 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1259 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1261 commit_iso14755 ();
1190 return; // case-break; 1262 return; // case-break;
1191 } 1263 }
1192 1264
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1266 if (i[0] == ks)
1195 { 1267 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1268 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1269 commit_iso14755 ();
1198 return; // case-break; 1270 return; // case-break;
1199 } 1271 }
1200 1272
1273 scr_bell ();
1274# endif
1201 iso14755buf = 0; 1275 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1276 break;
1204 } 1277 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1283 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1284 commit_iso14755 ();
1285#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1211 } 1296 }
1212#endif 1297#endif
1213 1298
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
… …
1250 0L, 1000000L, 1335 0L, 1000000L,
1251 False, AnyPropertyType, 1336 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1254 &data); 1339 &data);
1255 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1341 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1262 } 1344 }
1263#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1264 break; 1346 break;
1265 1347
… …
1297 { 1379 {
1298 TermWin.focus = 1; 1380 TermWin.focus = 1;
1299 want_refresh = 1; 1381 want_refresh = 1;
1300#ifdef USE_XIM 1382#ifdef USE_XIM
1301 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1302 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1303#endif 1388#endif
1304#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif 1392#endif
1308#ifdef OFF_FOCUS_FADING 1393#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade]) 1394 if (rs[Rs_fade])
1310 { 1395 {
1311 PixColors = PixColorsFocused; 1396 pix_colors = pix_colors_focused;
1312 set_colorfgbg ();
1313 scr_clear (); 1397 scr_recolour ();
1314 scr_touch (true);
1315 } 1398 }
1316#endif 1399#endif
1317 1400
1318 } 1401 }
1319 break; 1402 break;
… …
1321 case FocusOut: 1404 case FocusOut:
1322 if (TermWin.focus) 1405 if (TermWin.focus)
1323 { 1406 {
1324 TermWin.focus = 0; 1407 TermWin.focus = 0;
1325 want_refresh = 1; 1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1326#ifdef USE_XIM 1416#ifdef USE_XIM
1327 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1329#endif 1419#endif
1330#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1332 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1333 hidden_cursor = 0; 1423 hidden_cursor = 0;
1334#endif 1424#endif
1335#ifdef OFF_FOCUS_FADING 1425#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade]) 1426 if (rs[Rs_fade])
1337 { 1427 {
1338 PixColors = PixColorsUnFocused; 1428 pix_colors = pix_colors_unfocused;
1339 set_colorfgbg ();
1340 scr_clear (); 1429 scr_recolour ();
1341 scr_touch (true);
1342 } 1430 }
1343#endif 1431#endif
1344
1345 } 1432 }
1346 break; 1433 break;
1347 1434
1348 case ConfigureNotify: 1435 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 } 1445 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360 1447
1361 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1449 {
1450 seen_resize = 1;
1362 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1452 }
1363 1453
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1456 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1457#endif
1372 } 1458 }
1373 break; 1459 break;
1374 1460
1375 case PropertyNotify: 1461 case PropertyNotify:
… …
1383 selection_clear (); 1469 selection_clear ();
1384 break; 1470 break;
1385 1471
1386 case SelectionNotify: 1472 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1475 break;
1391 1476
1392 case SelectionRequest: 1477 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1394 break; 1479 break;
… …
1466 { 1551 {
1467 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1468 break; 1553 break;
1469 } 1554 }
1470#endif 1555#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1557 break;
1473 1558
1474 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1475 { 1560 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1562 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1479 ; 1564 ;
1480 1565
1481 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1482 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1570 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1574 {
1490#endif 1575#endif
1576#if ISO_14755
1577 // 5.4
1578 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1579 {
1580 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1581 break;
1582 }
1583#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1493#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1496 { 1590 {
1497 int dist; 1591 int dist;
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1598
1505 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1507 */ 1601 */
1508 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1605
1513 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1515 { 1608 {
1516 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1518 } 1611 }
1519 else 1612 else
1520 { 1613 {
1521 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y -
1523 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1524 } 1616 }
1617
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1527 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1529 } 1623 }
1530 else 1624 else
1531 { 1625 {
1532 /* we are within the text window, so we 1626 /* we are within the text window, so we
1533 * shouldn't be scrolling 1627 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1629 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1537 } 1631 }
1538#endif 1632#endif
1539#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1540
1541 } 1634 }
1542#endif 1635#endif
1543
1544 } 1636 }
1545 } 1637 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1639 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1549 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1550 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1551 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1648 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1650 scrollbar_size ());
1557 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1583 return; 1677 return;
1584 1678
1585 /* FALLTHROUGH */ 1679 /* FALLTHROUGH */
1586 case ReparentNotify: 1680 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1682 want_refresh = want_full_refresh = 1;
1589 break; 1683 break;
1590 } 1684 }
1591} 1685}
1592#endif 1686#endif
… …
1596{ 1690{
1597 int reportmode = 0, clickintime; 1691 int reportmode = 0, clickintime;
1598 1692
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1694 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1695 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696
1602 /* 1697 /*
1603 * VT window processing of button press 1698 * VT window processing of button press
1604 */ 1699 */
1605 if (ev.window == TermWin.vt) 1700 if (ev.window == TermWin.vt)
1606 { 1701 {
1702#if ISO_14755
1703 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 {
1706 iso14755_54 (ev.x, ev.y);
1707 return;
1708 }
1709#endif
1710
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1711 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1712
1608 if (reportmode) 1713 if (reportmode)
1609 { 1714 {
1610 /* mouse report from vt window */ 1715 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1716 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1717 MEvent.state = ev.state;
… …
1641 } 1746 }
1642 else 1747 else
1643 { 1748 {
1644 if (ev.button != MEvent.button) 1749 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1750 MEvent.clicks = 0;
1751
1646 switch (ev.button) 1752 switch (ev.button)
1647 { 1753 {
1648 case Button1: 1754 case Button1:
1755 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */
1757#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask);
1759#else
1760 selection.rect = false;
1761#endif
1762
1649 /* allow shift+left click to extend selection */ 1763 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1765 {
1652 if (MEvent.button == Button1 && clickintime) 1766 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1767 selection_rotate (ev.x, ev.y);
1654 else 1768 else
1655 selection_extend (ev.x, ev.y, 1); 1769 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1784 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1785 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1786 selection_rotate (ev.x, ev.y);
1673 else 1787 else
1674 selection_extend (ev.x, ev.y, 1); 1788 selection_extend (ev.x, ev.y, 1);
1789
1675 MEvent.button = Button3; 1790 MEvent.button = Button3;
1676 break; 1791 break;
1677 } 1792 }
1678 } 1793 }
1794
1679 MEvent.time = ev.time; 1795 MEvent.time = ev.time;
1680 return; 1796 return;
1681 } 1797 }
1682 1798
1683 /* 1799 /*
… …
1836{ 1952{
1837 int reportmode = 0; 1953 int reportmode = 0;
1838 1954
1839 csrO = 0; /* reset csr Offset */ 1955 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 1956 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1957 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 1958
1843 if (scrollbar_isUpDn ()) 1959 if (scrollbar_isUpDn ())
1844 { 1960 {
1845 scrollBar.setIdle (); 1961 scrollBar.setIdle ();
1846 scrollbar_show (0); 1962 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 1964 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 1965#endif
1850
1851 } 1966 }
1967
1852#ifdef SELECTION_SCROLLING 1968#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 1969 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 1970 sel_scroll_ev.stop();
1855#endif 1971#endif
1972
1856 if (ev.window == TermWin.vt) 1973 if (ev.window == TermWin.vt)
1857 { 1974 {
1975#if ISO_14755
1976 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return;
1979#endif
1858 if (reportmode) 1980 if (reportmode)
1859 { 1981 {
1860 /* mouse report from vt window */ 1982 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 1983 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 1984 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 1998 MEvent.button = AnyButton;
1877 mouse_report (ev); 1999 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2000#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2001 return;
1880 } 2002 }
2003
1881 /* 2004 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2005 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2006 * when overriding mouse reporting
1884 */ 2007 */
1885 if (PrivateModes & PrivMode_mouse_report 2008 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2009 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2010 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2011 selection_extend (ev.x, ev.y, 0);
1889 2012
1890 switch (ev.button) 2013 switch (ev.button)
… …
1905 2028
1906 v = ev.button == Button4 ? UP : DN; 2029 v = ev.button == Button4 ? UP : DN;
1907 2030
1908 if (ev.state & ShiftMask) 2031 if (ev.state & ShiftMask)
1909 i = 1; 2032 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2033 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2034 i = TermWin.nrow - 1;
1912 else 2035 else
1913 i = 5; 2036 i = 5;
1914 2037
1915# ifdef MOUSE_SLIP_WHEELING 2038# ifdef MOUSE_SLIP_WHEELING
… …
2200 Pixmap rootpixmap = None; 2323 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2324 XWindowAttributes wattr, wrootattr;
2202 2325
2203 pchanged = 0; 2326 pchanged = 0;
2204 2327
2205 if (!(Options & Opt_transparent)) 2328 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2329 return pchanged; /* Don't try any more */
2207 2330
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2332 rootdepth = wrootattr.depth;
2210 2333
… …
2213 if (rootdepth != wattr.depth) 2336 if (rootdepth != wattr.depth)
2214 { 2337 {
2215 if (am_transparent) 2338 if (am_transparent)
2216 { 2339 {
2217 pchanged = 1; 2340 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2342 am_transparent = am_pixmap_trans = 0;
2220 } 2343 }
2221 2344
2222 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2223 } 2346 }
… …
2286 sy = 0; 2409 sy = 0;
2287 } 2410 }
2288 2411
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2291 allowedxerror = -1; 2416 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2418
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
… …
2318 if (ISSET_PIXCOLOR (Color_tint)) 2443 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2444 {
2320 unsigned short rm, gm, bm; 2445 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2447
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2449
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2450 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2451 }
2327#endif 2452#endif
2328 2453
… …
2341 2466
2342 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2343 } 2468 }
2344 } 2469 }
2345 2470
2346 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2347 { 2474 {
2348 unsigned int n; 2475 unsigned int n;
2349 /* 2476 /*
2350 * InheritPixmap transparency 2477 * InheritPixmap transparency
2351 */ 2478 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 { 2480 {
2355 oldp = TermWin.parent[i]; 2481 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2483 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2484 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2485
2361 if (TermWin.parent[i] == display->root) 2486 if (TermWin.parent[i] == display->root)
2362 { 2487 {
2363 if (oldp != None) 2488 if (oldp != None)
2364 pchanged = 1; 2489 pchanged = 1;
… …
2375 if (pchanged) 2500 if (pchanged)
2376 { 2501 {
2377 for (; n < (unsigned int)i; n++) 2502 for (; n < (unsigned int)i; n++)
2378 { 2503 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2504 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) 2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2506 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break; 2508 break;
2385 } 2509 }
2386 } 2510 }
2387 } 2511 }
2388 2512
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 { 2514 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2517 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2518 /* XXX: also turn off Opt_transparent? */
2396 } 2519 }
2397 else 2520 else
2398 { 2521 {
2399#if WAIT_FOR_WM 2522#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2523 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2524 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2525 sleep (1);
2403#endif 2526#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2527 for (n = 0; n < (unsigned int)i; n++)
2406 { 2528 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2530 XClearWindow (display->display, TermWin.parent[n]);
2409 } 2531 }
… …
2414 2536
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2538 TermWin.parent[i] = None;
2417 } 2539 }
2418 2540
2419 // this is experimental
2420 if (scrollBar.win) 2541 if (scrollBar.win)
2421 { 2542 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2544 scrollBar.setIdle ();
2425 scrollbar_show (0); 2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2426 } 2553 }
2427 2554
2428 return pchanged; 2555 return pchanged;
2429} 2556}
2430#endif 2557#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2576 if (ch == NOCHAR) // TODO: improve
2450 break; 2577 break;
2451 2578
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2580 {
2581 if (!seen_input)
2582 {
2583 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized.
2591 if (seen_resize)
2592 kill (-cmd_pid, SIGWINCH);
2593 }
2594
2454 /* Read a text string from the input buffer */ 2595 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2596 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2597 bool refreshnow = false;
2457 int nlines = 0; 2598 int nlines = 0;
2458 unicode_t *str = buf; 2599 unicode_t *str = buf;
… …
2467 if (ch == C0_LF) 2608 if (ch == C0_LF)
2468 { 2609 {
2469 nlines++; 2610 nlines++;
2470 refresh_count++; 2611 refresh_count++;
2471 2612
2472 if (!(Options & Opt_jumpScroll) 2613 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2615 {
2475 refreshnow = true; 2616 refreshnow = true;
2476 ch = NOCHAR; 2617 ch = NOCHAR;
2477 break; 2618 break;
… …
2504 * the number of pages between refreshes is refresh_limit, which 2645 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2646 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2647 */
2507 if (refreshnow) 2648 if (refreshnow)
2508 { 2649 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2651 refresh_limit++;
2511 else 2652 else
2512 { 2653 {
2513 flag = true; 2654 flag = true;
2514 scr_refresh (refresh_type); 2655 scr_refresh (refresh_type);
… …
2704 process_escape_seq (); 2845 process_escape_seq ();
2705 break; 2846 break;
2706 case C0_ENQ: /* terminal Status */ 2847 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2848 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2851 else
2711 tt_write ((unsigned char *)VT100_ANS, 2852 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2853 (unsigned int)strlen (VT100_ANS));
2713 break; 2854 break;
2714 case C0_BEL: /* bell */ 2855 case C0_BEL: /* bell */
2715 scr_bell (); 2856 scr_bell ();
2716 break; 2857 break;
2717 case C0_BS: /* backspace */ 2858 case C0_BS: /* backspace */
… …
2816void 2957void
2817rxvt_term::process_escape_seq () 2958rxvt_term::process_escape_seq ()
2818{ 2959{
2819 unicode_t ch = cmd_getc (); 2960 unicode_t ch = cmd_getc ();
2820 2961
2821 if (PrivateModes & PrivMode_vt52) 2962 if (priv_modes & PrivMode_vt52)
2822 { 2963 {
2823 process_escape_vt52 (ch); 2964 process_escape_vt52 (ch);
2824 return; 2965 return;
2825 } 2966 }
2826 2967
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2982 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2983 break;
2843 case '+': 2984 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2985 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2986 break;
2846#ifndef NO_FRILLS 2987#if ENABLE_FRILLS
2847 case '6': 2988 case '6':
2848 scr_backindex (); 2989 scr_backindex ();
2849 break; 2990 break;
2850#endif 2991#endif
2851 case '7': 2992 case '7':
2852 scr_cursor (SAVE); 2993 scr_cursor (SAVE);
2853 break; 2994 break;
2854 case '8': 2995 case '8':
2855 scr_cursor (RESTORE); 2996 scr_cursor (RESTORE);
2856 break; 2997 break;
2857#ifndef NO_FRILLS 2998#if ENABLE_FRILLS
2858 case '9': 2999 case '9':
2859 scr_forwardindex (); 3000 scr_forwardindex ();
2860 break; 3001 break;
2861#endif 3002#endif
2862 case '=': 3003 case '=':
… …
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
3162 break; 3303 break;
3163 3304
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3306 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3308 break;
3168 3309
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3311 process_sgr_mode (nargs, arg);
3171 break; 3312 break;
… …
3178 break; 3319 break;
3179 case 6: /* CPR requested */ 3320 case 6: /* CPR requested */
3180 scr_report_position (); 3321 scr_report_position ();
3181 break; 3322 break;
3182 case 7: /* unofficial extension */ 3323 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3324 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3325 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3326 break;
3186 case 8: /* unofficial extension */ 3327 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3329 break;
3189 } 3330 }
… …
3225 break; 3366 break;
3226 3367
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3368 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3369 if (arg[0] == 4)
3229 scr_insert_mode (0); 3370 scr_insert_mode (0);
3371 else if (arg[0] == 20)
3372 priv_modes &= ~PrivMode_LFNL;
3230 break; 3373 break;
3231 3374
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3375 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3376 if (arg[0] == 4)
3234 scr_insert_mode (1); 3377 scr_insert_mode (1);
3378 else if (arg[0] == 20)
3379 priv_modes |= PrivMode_LFNL;
3235 break; 3380 break;
3236 3381
3237 /* 3382 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3383 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3384 */
… …
3251 break; 3396 break;
3252 case CSI_75: 3397 case CSI_75:
3253 scr_cursor (RESTORE); 3398 scr_cursor (RESTORE);
3254 break; 3399 break;
3255 3400
3256#ifndef NO_FRILLS 3401#if ENABLE_FRILLS
3257 case CSI_74: 3402 case CSI_74:
3258 process_window_ops (arg, nargs); 3403 process_window_ops (arg, nargs);
3259 break; 3404 break;
3260#endif 3405#endif
3261 3406
… …
3268 break; 3413 break;
3269 } 3414 }
3270} 3415}
3271/*}}} */ 3416/*}}} */
3272 3417
3273#ifndef NO_FRILLS 3418#if ENABLE_FRILLS
3274/* ARGSUSED */ 3419/* ARGSUSED */
3275void 3420void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3421rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3422{
3278 int x, y; 3423 int x, y;
… …
3348 break; 3493 break;
3349 case 20: /* report icon label */ 3494 case 20: /* report icon label */
3350 { 3495 {
3351 char *s; 3496 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3497 XGetIconName (display->display, TermWin.parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3499 XFree (s);
3355 } 3500 }
3356 break; 3501 break;
3357 case 21: /* report window title */ 3502 case 21: /* report window title */
3358 { 3503 {
3359 char *s; 3504 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3505 XFetchName (display->display, TermWin.parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3507 XFree (s);
3363 } 3508 }
3364 break; 3509 break;
3365 } 3510 }
3366} 3511}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3517 * ends_how is terminator used. returned input must be free()'d
3373 */ 3518 */
3374unsigned char * 3519unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3521{
3377 unicode_t prev = 0, ch; 3522 unicode_t ch;
3523 bool seen_esc = false;
3378 unsigned int n = 0; 3524 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3525 wchar_t string[STRING_MAX];
3381 3526
3382 while ((ch = cmd_getc ()) != NOCHAR) 3527 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3528 {
3384 if (prev == C0_ESC) 3529 if (seen_esc)
3385 { 3530 {
3386 if (ch == 0x5c) /* 7bit ST */ 3531 if (ch == 0x5c) /* 7bit ST */
3387 break; 3532 break;
3388 else 3533 else
3389 return NULL; 3534 return NULL;
3390 } 3535 }
3536 else if (ch == C0_ESC)
3537 {
3538 seen_esc = true;
3539 continue;
3540 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3541 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3542 break;
3393 else if (ch < 0x20) 3543 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3545
3546 seen_esc = false;
3395 3547
3396 if (n >= sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3397 // stop at some sane length 3549 // stop at some sane length
3398 return NULL; 3550 return NULL;
3399 3551
3400 if (ch == C0_SYN) 3552 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3553 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3554 else
3406 string[n++] = prev = ch; 3555 string[n++] = ch;
3407 } 3556 }
3408 3557
3409 string[n++] = '\0'; 3558 string[n++] = '\0';
3410 3559
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3561
3416 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
3417} 3563}
3418 3564
3419/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
3420/* 3566/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * 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) 3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3613{
3468 if (str[0] == '?' && !str[1]) 3614 if (str[0] == '?' && !str[1])
3469 { 3615 {
3470 unsigned short r, g, b; 3616 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3617 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3619 }
3474 else 3620 else
3475 set_window_color (color, str); 3621 set_window_color (color, str);
3476} 3622}
… …
3505{ 3651{
3506 int changed = 0; 3652 int changed = 0;
3507 int color; 3653 int color;
3508 char *buf, *name; 3654 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3655 bool query = str[0] == '?' && !str[1];
3656 int saveop = op;
3510 3657
3511 assert (str != NULL); 3658 assert (str != NULL);
3512 switch (op) 3659 switch (op)
3513 { 3660 {
3514 case XTerm_name: 3661 case XTerm_name:
… …
3521 set_title (str); 3668 set_title (str);
3522 break; 3669 break;
3523 case XTerm_property: 3670 case XTerm_property:
3524 if (str[0] == '?') 3671 if (str[0] == '?')
3525 { 3672 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3673 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3674 Atom actual_type;
3528 int actual_format; 3675 int actual_format;
3529 unsigned long nitems; 3676 unsigned long nitems;
3530 unsigned long bytes_after; 3677 unsigned long bytes_after;
3531 unsigned char *value = 0; 3678 unsigned char *value = 0;
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3697
3551 if (eq) 3698 if (eq)
3552 { 3699 {
3553 *eq = 0; 3700 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3701 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 } 3702 }
3559 else 3703 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3704 XDeleteProperty (display->display, TermWin.parent[0],
3561 display->atom (str)); 3705 display->atom (str));
3562 } 3706 }
3563 break; 3707 break;
3564 3708
3565 case XTerm_Color: 3709 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3710 for (buf = (char *)str; buf && *buf;)
3567 { 3711 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3712 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3713 break;
3570 3714
3571 *name++ = '\0'; 3715 *name++ = '\0';
3572 color = atoi (buf); 3716 color = atoi (buf);
3573 3717
3574 if (color < 0 || color >= TOTAL_COLORS) 3718 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3719 break;
3576 3720
3577 if ((buf = STRCHR (name, ';')) != NULL) 3721 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3722 *buf++ = '\0';
3579 3723
3580 if (name[0] == '?' && !name[1]) 3724 if (name[0] == '?' && !name[1])
3581 { 3725 {
3582 unsigned short r, g, b; 3726 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3727 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); 3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3729 }
3586 else 3730 else
3587 set_window_color (color + minCOLOR, name); 3731 set_window_color (color + minCOLOR, name);
3588 } 3732 }
… …
3606 break; 3750 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3751#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD: 3752 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break; 3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3611 case XTerm_Color_UL: 3758 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3760 break;
3614 case XTerm_Color_RV: 3761 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break;
3764#endif
3765#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3768 check_our_parents ();
3769 if (am_transparent)
3770 want_full_refresh = want_refresh = 1;
3616 break; 3771 break;
3617#endif 3772#endif
3618 3773
3619 case XTerm_Pixmap: 3774 case XTerm_Pixmap:
3620 if (*str != ';') 3775 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3778 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3779 set_bgPixmap (str); /* change pixmap */
3625#endif 3780#endif
3626 scr_touch (true); 3781 scr_touch (true);
3627 } 3782 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3783 while ((str = strchr (str, ';')) != NULL)
3629 { 3784 {
3630 str++; 3785 str++;
3631#if XPM_BACKGROUND 3786#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3787 changed += scale_pixmap (str);
3633#endif 3788#endif
… …
3652 case XTerm_logfile: 3807 case XTerm_logfile:
3653 // TODO, when secure mode? 3808 // TODO, when secure mode?
3654 break; 3809 break;
3655 3810
3656 case XTerm_font: 3811 case XTerm_font:
3812 op = URxvt_font;
3813 case URxvt_font:
3814#if ENABLE_STYLES
3815 case URxvt_boldFont:
3816 case URxvt_italicFont:
3817 case URxvt_boldItalicFont:
3818#endif
3657 if (query) 3819 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3820 tt_printf ("\33]%d;%-.250s%c", saveop,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc 3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3660 ? TermWin.fontset->fontdesc : "", 3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3661 resp); 3823 resp);
3662 else 3824 else
3825 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827
3828 res = strdup (str);
3829 allocated.push_back ((void *)res);
3663 change_font (str); 3830 set_fonts ();
3831 }
3664 break; 3832 break;
3665 3833
3666#ifndef NO_FRILLS 3834#if ENABLE_FRILLS
3667 case XTerm_locale: 3835 case XTerm_locale:
3668 if (query) 3836 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); 3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3670 else 3838 else
3671 { 3839 {
3672 set_locale (str); 3840 set_locale (str);
3673# ifdef USE_XIM 3841# ifdef USE_XIM
3674 im_cb (); 3842 im_cb ();
3675# endif 3843# endif
3676 } 3844 }
3677 break; 3845 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 3846#endif
3689 3847
3690#ifdef MENUBAR 3848#ifdef MENUBAR
3691 case XTerm_Menu: 3849 case XTerm_Menu:
3692 if (Options & Opt_insecure) 3850 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3852 break;
3695#endif 3853#endif
3696#if 0 3854#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3855 case XTerm_dumpscreen: /* no error notices */
… …
3724{ 3882{
3725 int state; 3883 int state;
3726 3884
3727 if (mode == 's') 3885 if (mode == 's')
3728 { 3886 {
3729 SavedModes |= (PrivateModes & bit); 3887 SavedModes |= (priv_modes & bit);
3730 return -1; 3888 return -1;
3731 } 3889 }
3732 else 3890 else
3733 { 3891 {
3734 if (mode == 'r') 3892 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3894 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3895 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3896 PrivMode (state, bit);
3739 } 3897 }
3740 3898
3741 return state; 3899 return state;
3742} 3900}
… …
3760 { 3, PrivMode_132 }, 3918 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3919 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3920 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3921 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3922 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3924 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3925#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3926 { menuBar_esc, PrivMode_menuBar },
3768#endif 3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3930#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3931 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3932#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3933 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3934 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3935 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3936 // 45 margin bell NYI
3779 // 46 start logging 3937 // 46 start logging
… …
3820 3978
3821 /* extra handling for values with state unkept */ 3979 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3980 switch (arg[i])
3823 { 3981 {
3824 case 1048: /* alternative cursor save */ 3982 case 1048: /* alternative cursor save */
3983 case 1049:
3825 if (Options & Opt_secondaryScreen) 3984 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 3985 if (mode == 0)
3827 scr_cursor (RESTORE); 3986 scr_cursor (RESTORE);
3828 else if (mode == 1) 3987 else if (mode == 1)
3829 scr_cursor (SAVE); 3988 scr_cursor (SAVE);
3830 break; 3989 break;
… …
3841 * within VT52 mode 4000 * within VT52 mode
3842 */ 4001 */
3843 PrivMode (1, PrivMode_vt52); 4002 PrivMode (1, PrivMode_vt52);
3844 break; 4003 break;
3845 case 3: /* 80/132 */ 4004 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4005 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3848 break; 4007 break;
3849 case 4: /* smooth scrolling */ 4008 case 4: /* smooth scrolling */
3850 if (state) 4009 if (state)
3851 Options &= ~Opt_jumpScroll; 4010 options &= ~Opt_jumpScroll;
3852 else 4011 else
3853 Options |= Opt_jumpScroll; 4012 options |= Opt_jumpScroll;
3854 break; 4013 break;
3855 case 5: /* reverse video */ 4014 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4015 scr_rvideo_mode (state);
3857 break; 4016 break;
3858 case 6: /* relative/absolute origins */ 4017 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4021 scr_autowrap (state);
3863 break; 4022 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4023 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4024 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4025 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4026 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4027 break;
3869#ifdef menuBar_esc 4028#ifdef menuBar_esc
3870 case menuBar_esc: 4029 case menuBar_esc:
3871#ifdef MENUBAR 4030#ifdef MENUBAR
3872 map_menuBar (state); 4031 map_menuBar (state);
… …
3892 break; 4051 break;
3893 /* case 66: - application key pad */ 4052 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4053 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4054 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4055 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4056 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4057 break;
3899#if 0 4058#if 0
3900 case 1001: 4059 case 1001:
3901 break; /* X11 mouse highlighting */ 4060 break; /* X11 mouse highlighting */
3902#endif 4061#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4062 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4063 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4064 options &= ~Opt_scrollTtyOutput;
3906 else 4065 else
3907 Options |= Opt_scrollTtyOutput; 4066 options |= Opt_scrollTtyOutput;
3908 break; 4067 break;
3909 case 1011: /* scroll to bottom on key press */ 4068 case 1011: /* scroll to bottom on key press */
3910 if (state) 4069 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4070 options |= Opt_scrollTtyKeypress;
3912 else 4071 else
3913 Options &= ~Opt_scrollTtyKeypress; 4072 options &= ~Opt_scrollTtyKeypress;
3914 break; 4073 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4074 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4077 scr_erase_screen (2);
3919 scr_change_screen (state); 4078 scr_change_screen (state);
3920 break; 4079 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4080 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4081 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4082 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4083 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4084 scr_erase_screen (2);
3926 break; 4085 break;
3927 default: 4086 default:
3928 break; 4087 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4113 rendset = 0, rendstyle = ~RS_None;
3955 break; 4114 break;
3956 case 1: 4115 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4116 rendset = 1, rendstyle = RS_Bold;
3958 break; 4117 break;
3959 //case 2: // faint or second colour 4118 //case 2: // low intensity
4119 case 3:
4120 rendset = 1, rendstyle = RS_Italic;
4121 break;
3960 case 4: 4122 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4123 rendset = 1, rendstyle = RS_Uline;
3962 break; 4124 break;
3963 case 5: // slowly blinking 4125 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4126 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4138 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4139 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4140 //...
3979 //case 19: // ninth alt font 4141 //case 19: // ninth alt font
3980 //case 20: // gothic 4142 //case 20: // gothic
3981 case 21: // disable bold, faint 4143 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4144 rendset = 0, rendstyle = RS_Bold;
3983 break; 4145 break;
3984 case 22: 4146 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4147 rendset = 0, rendstyle = RS_Bold;
3986 break; 4148 break;
3987 //case 23: disable italic 4149 case 23: // disable italic
4150 rendset = 0, rendstyle = RS_Italic;
4151 break;
3988 case 24: 4152 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4153 rendset = 0, rendstyle = RS_Uline;
3990 break; 4154 break;
3991 case 25: 4155 case 25:
4156 rendset = 0, rendstyle = RS_Blink;
4157 break;
4158 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4159 rendset = 0, rendstyle = RS_Blink;
3993 break; 4160 break;
3994 case 27: 4161 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4162 rendset = 0, rendstyle = RS_RVid;
3996 break; 4163 break;
… …
4014 case 35: 4181 case 35:
4015 case 36: 4182 case 36:
4016 case 37: 4183 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4184 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4185 break;
4019#ifdef TTY_256COLOR 4186 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4187 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4188 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4189 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4190 i += 2;
4025 } 4191 }
4026 break; 4192 break;
4027#endif
4028 case 39: /* default fg */ 4193 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4194 scr_color (Color_fg, Color_fg);
4030 break; 4195 break;
4031 4196
4032 case 40: 4197 case 40:
… …
4037 case 45: 4202 case 45:
4038 case 46: 4203 case 46:
4039 case 47: 4204 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4205 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4206 break;
4042#ifdef TTY_256COLOR 4207 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4208 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4209 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4210 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4211 i += 2;
4048 } 4212 }
4049 break; 4213 break;
4050#endif
4051 case 49: /* default bg */ 4214 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4215 scr_color (Color_bg, Color_bg);
4053 break; 4216 break;
4217
4218 //case 50: // not variable spacing
4054 4219
4055#ifndef NO_BRIGHTCOLOR 4220#ifndef NO_BRIGHTCOLOR
4056 case 90: 4221 case 90:
4057 case 91: /* set bright fg color */ 4222 case 91: /* set bright fg color */
4058 case 92: 4223 case 92:
4059 case 93: 4224 case 93:
4060 case 94: 4225 case 94:
4061 case 95: 4226 case 95:
4062 case 96: 4227 case 96:
4063 case 97: 4228 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4229 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4230 break;
4067 case 100: 4231 case 100:
4068 case 101: /* set bright bg color */ 4232 case 101: /* set bright bg color */
4069 case 102: 4233 case 102:
4070 case 103: 4234 case 103:
4071 case 104: 4235 case 104:
4072 case 105: 4236 case 105:
4073 case 106: 4237 case 106:
4074 case 107: 4238 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4240 break;
4078#endif 4241#endif
4079 4242
4080 } 4243 }
4081 } 4244 }
… …
4088{ 4251{
4089 unicode_t ch, cmd = cmd_getc (); 4252 unicode_t ch, cmd = cmd_getc ();
4090 4253
4091 if (cmd == 'Q') 4254 if (cmd == 'Q')
4092 { /* query graphics */ 4255 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4256 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4257 return;
4095 } 4258 }
4096 /* swallow other graphics sequences until terminating ':' */ 4259 /* swallow other graphics sequences until terminating ':' */
4097 do 4260 do
4098 ch = cmd_getc (); 4261 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4276 unsigned char buf[256];
4114 4277
4115 va_start (arg_ptr, fmt); 4278 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4280 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4281 tt_write (buf, strlen (buf));
4119} 4282}
4120 4283
4121/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* 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. 4286 * or generated by us in response to a query ESC sequence.
4124 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
4125void 4290void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4292{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 if (v_buflen == 0)
4294 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4129 4296
4130 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
4131 { 4302 }
4303
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4305
4306 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len;
4308
4309 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310}
4311
4312void rxvt_term::pty_write ()
4313{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4132 if (v_buflen == 0) 4320 if (v_buflen == 0)
4133 { 4321 {
4134 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
4135
4136 if ((unsigned int)written == len)
4137 return;
4138
4139 data += written;
4140 len -= written;
4141 }
4142
4143
4144 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4145
4146 memcpy (v_buffer + v_buflen, data, len);
4147 v_buflen += len;
4148 }
4149
4150 for (;;)
4151 {
4152 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4153
4154 if (written > 0)
4155 {
4156 v_buflen -= written;
4157
4158 if (v_buflen == 0)
4159 {
4160 free (v_buffer); 4322 free (v_buffer);
4161 v_buffer = 0; 4323 v_buffer = 0;
4162 v_buflen = 0; 4324 v_buflen = 0;
4163 4325
4164 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
4165 return;
4166 }
4167
4168 memmove (v_buffer, v_buffer + written, v_buflen);
4169 }
4170 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4171 // original code just ignores this...
4172 destroy ();
4173 else
4174 {
4175 pty_ev.set (EVENT_READ | EVENT_WRITE);
4176 return; 4327 return;
4177 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4179} 4335}
4180 4336
4181/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
4182 4338

Diff Legend

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