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.183 by root, Tue Dec 21 06:43:00 2004 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
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 <cwchar>
54#include <csignal>
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 {
… …
377#endif 488#endif
378 489
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 491 {
381#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
383 { 494 {
384 unsigned int l; 495 unsigned int l;
385 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
386 497
387 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
… …
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
… …
663 case XK_F35: /* "\033[49~" */ 785 case XK_F35: /* "\033[49~" */
664 FKEY (31, XK_F17); 786 FKEY (31, XK_F17);
665 break; 787 break;
666#undef FKEY 788#undef FKEY
667 default: 789 default:
668 newlen = 0; 790 if (len == 0
669 break; 791 && (keysym & 0xfff0) != 0xff70
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
670 } 795 }
796
671 if (newlen) 797 if (newlen)
672 len = STRLEN (kbuf); 798 len = strlen (kbuf);
673 } 799 }
674 800
675 /* 801 /*
676 * Pass meta for all function keys, if 'meta' option set 802 * Pass meta for all function keys, if 'meta' option set
677 */ 803 */
… …
684 else if (ctrl && keysym == XK_minus) 810 else if (ctrl && keysym == XK_minus)
685 { 811 {
686 len = 1; 812 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 813 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 814 }
815 else if (keysym == XK_ISO_Left_Tab)
816 {
817 strcpy (kbuf, "\033[Z");
818 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
689 else 827 else
690 { 828 {
691#ifdef META8_OPTION 829#ifdef META8_OPTION
692 /* set 8-bit on */ 830 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 831 if (meta && (meta_char == 0x80))
… …
705 } 843 }
706 844
707 if (len <= 0) 845 if (len <= 0)
708 return; /* not mapped */ 846 return; /* not mapped */
709 847
710 if (Options & Opt_scrollTtyKeypress) 848 if (options & Opt_scrollTtyKeypress)
711 if (TermWin.view_start) 849 if (TermWin.view_start)
712 { 850 {
713 TermWin.view_start = 0; 851 TermWin.view_start = 0;
714 want_refresh = 1; 852 want_refresh = 1;
715 } 853 }
… …
764 n = cmdbuf_ptr - cmdbuf_base; 902 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 904
767 if (n > 0 && s < count) 905 if (n > 0 && s < count)
768 { 906 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 907 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 908 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 909 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 910 cmdbuf_endp -= n;
773 s += n; 911 s += n;
774 } 912 }
… …
789#endif /* MENUBAR_MAX */ 927#endif /* MENUBAR_MAX */
790 928
791void 929void
792rxvt_term::flush () 930rxvt_term::flush ()
793{ 931{
932 flush_ev.stop ();
933
794#ifdef TRANSPARENT 934#ifdef TRANSPARENT
795 if (want_full_refresh) 935 if (want_full_refresh)
796 { 936 {
797 want_full_refresh = 0; 937 want_full_refresh = 0;
798 scr_clear (); 938 scr_clear ();
… …
808 IMSendSpot (); 948 IMSendSpot ();
809#endif 949#endif
810 } 950 }
811 951
812 display->flush (); 952 display->flush ();
813
814 flush_ev.stop ();
815} 953}
816 954
817void 955void
818rxvt_term::check_cb (check_watcher &w) 956rxvt_term::check_cb (check_watcher &w)
819{ 957{
… …
917 1055
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1056 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1057 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1058 cmdbuf_endp = cmdbuf_ptr + n;
921 1059
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1061
924 if (n > 0) 1062 if (n > 0)
925 { 1063 {
926 cmdbuf_endp += n; 1064 cmdbuf_endp += n;
927 return true; 1065 return true;
… …
936rxvt_term::pty_cb (io_watcher &w, short revents) 1074rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1075{
938 SET_R (this); 1076 SET_R (this);
939 SET_LOCALE (locale); 1077 SET_LOCALE (locale);
940 1078
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1079 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1080 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1081 while (pty_fill ())
946 if (cmd_parse ()) 1082 if (cmd_parse ())
947 break; 1083 break;
1084
1085 if (revents & EVENT_WRITE)
1086 pty_write ();
948} 1087}
949 1088
950void 1089void
951rxvt_term::pointer_unblank () 1090rxvt_term::pointer_unblank ()
952{ 1091{
… …
954 recolour_cursor (); 1093 recolour_cursor ();
955 1094
956#ifdef POINTER_BLANK 1095#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1096 hidden_pointer = 0;
958 1097
959 if (Options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
960 pointer_ev.start (NOW + pointerBlankDelay); 1099 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1100#endif
962} 1101}
963 1102
964#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
965void 1104void
966rxvt_term::pointer_blank () 1105rxvt_term::pointer_blank ()
967{ 1106{
968 if (! (Options & Opt_pointerBlank)) 1107 if (! (options & Opt_pointerBlank))
969 return; 1108 return;
970 1109
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1110 XDefineCursor (display->display, TermWin.vt, blank_cursor);
972 XFlush (display->display); 1111 XFlush (display->display);
973 1112
… …
993 x = ev.x; 1132 x = ev.x;
994 y = ev.y; 1133 y = ev.y;
995 pixel_position (&x, &y); 1134 pixel_position (&x, &y);
996 1135
997 if (MEvent.button == AnyButton) 1136 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1137 button_number = 3;
1000 }
1001 else 1138 else
1002 { 1139 {
1003 button_number = MEvent.button - Button1; 1140 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1141 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1142 if (button_number >= 3)
1006 button_number += (64 - 3); 1143 button_number += (64 - 3);
1007 } 1144 }
1008 1145
1009 if (PrivateModes & PrivMode_MouseX10) 1146 if (priv_modes & PrivMode_MouseX10)
1010 { 1147 {
1011 /* 1148 /*
1012 * do not report ButtonRelease 1149 * do not report ButtonRelease
1013 * no state info allowed 1150 * no state info allowed
1014 */ 1151 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1166 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1167 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1168#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1169 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1170#endif
1034
1035 } 1171 }
1036 1172
1037#ifdef DEBUG_MOUSEREPORT 1173#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1174 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1175 if (key_state & 16)
1040 fputc ('C', stderr); 1176 fputc ('C', stderr);
1041 if (key_state & 4) 1177 if (key_state & 4)
1042 fputc ('S', stderr); 1178 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1182 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1183 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1184 button_number,
1049 x + 1, 1185 x + 1,
1050 y + 1); 1186 y + 1);
1051#else 1187#endif
1188
1052 tt_printf ("\033[M%c%c%c", 1189 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1190 (32 + button_number + key_state),
1054 (32 + x + 1), 1191 (32 + x + 1),
1055 (32 + y + 1)); 1192 (32 + y + 1));
1056#endif
1057} 1193}
1058 1194
1059#ifdef USING_W11LIB 1195#ifdef USING_W11LIB
1060void 1196void
1061rxvt_W11_process_x_event (XEvent *ev) 1197rxvt_W11_process_x_event (XEvent *ev)
… …
1072{ 1208{
1073 SET_R (this); 1209 SET_R (this);
1074 SET_LOCALE (locale); 1210 SET_LOCALE (locale);
1075 1211
1076#if defined(CURSOR_BLINK) 1212#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1214 {
1079 if (hidden_cursor) 1215 if (hidden_cursor)
1080 { 1216 {
1081 hidden_cursor = 0; 1217 hidden_cursor = 0;
1082 want_refresh = 1; 1218 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1222 }
1087#endif 1223#endif
1088 1224
1089#if defined(POINTER_BLANK) 1225#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1227 {
1092 if (ev.type == MotionNotify 1228 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1229 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1230 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1231 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1234 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1235 pointer_blank ();
1100 } 1236 }
1101#endif 1237#endif
1102 1238
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1239 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1240 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1241 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 1242
1161 switch (ev.type) 1243 switch (ev.type)
1162 { 1244 {
1163 case KeyPress: 1245 case KeyPress:
1246#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1165 lookup_key (ev.xkey); 1249 lookup_key (ev.xkey);
1166 1250
1167 break; 1251 break;
1168 1252
1169 case KeyRelease: 1253 case KeyRelease:
1170 { 1254 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1256 KeySym ks;
1173 1257
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1259#endif
1176 1260
1177#ifndef NO_FRILLS 1261#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1262 // ISO 14755 support
1179 if (iso14755buf) 1263 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1264 if (iso14755buf & ISO_14755_52)
1181 { 1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1270 // iso14755 part 5.2 handling: release time
1183 // first: controls 1271 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1272 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1273 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1274 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1275 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1277 commit_iso14755 ();
1190 return; // case-break; 1278 return; // case-break;
1191 } 1279 }
1192 1280
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1282 if (i[0] == ks)
1195 { 1283 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1284 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1285 commit_iso14755 ();
1198 return; // case-break; 1286 return; // case-break;
1199 } 1287 }
1200 1288
1289 scr_bell ();
1290# endif
1201 iso14755buf = 0; 1291 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1292 break;
1204 } 1293 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1299 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1300 commit_iso14755 ();
1301#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1211 } 1312 }
1212#endif 1313#endif
1213 1314
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1316 if (!(ev.xkey.state & ControlMask))
… …
1250 0L, 1000000L, 1351 0L, 1000000L,
1251 False, AnyPropertyType, 1352 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1353 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1354 &Size, &RemainingBytes,
1254 &data); 1355 &data);
1255 XChangeProperty (display->display, display->root, 1356 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1357 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1358 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1262 } 1360 }
1263#endif /* OFFIX_DND */ 1361#endif /* OFFIX_DND */
1264 break; 1362 break;
1265 1363
… …
1297 { 1395 {
1298 TermWin.focus = 1; 1396 TermWin.focus = 1;
1299 want_refresh = 1; 1397 want_refresh = 1;
1300#ifdef USE_XIM 1398#ifdef USE_XIM
1301 if (Input_Context != NULL) 1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1302 XSetICFocus (Input_Context); 1402 XSetICFocus (Input_Context);
1403 }
1303#endif 1404#endif
1304#ifdef CURSOR_BLINK 1405#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink) 1406 if (options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif 1408#endif
1308#ifdef OFF_FOCUS_FADING 1409#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade]) 1410 if (rs[Rs_fade])
1310 { 1411 {
1311 PixColors = PixColorsFocused; 1412 pix_colors = pix_colors_focused;
1312 set_colorfgbg ();
1313 scr_clear (); 1413 scr_recolour ();
1314 scr_touch (true);
1315 } 1414 }
1316#endif 1415#endif
1317 1416
1318 } 1417 }
1319 break; 1418 break;
… …
1321 case FocusOut: 1420 case FocusOut:
1322 if (TermWin.focus) 1421 if (TermWin.focus)
1323 { 1422 {
1324 TermWin.focus = 0; 1423 TermWin.focus = 0;
1325 want_refresh = 1; 1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1326#ifdef USE_XIM 1432#ifdef USE_XIM
1327 if (Input_Context != NULL) 1433 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context); 1434 XUnsetICFocus (Input_Context);
1329#endif 1435#endif
1330#ifdef CURSOR_BLINK 1436#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink) 1437 if (options & Opt_cursorBlink)
1332 cursor_blink_ev.stop (); 1438 cursor_blink_ev.stop ();
1333 hidden_cursor = 0; 1439 hidden_cursor = 0;
1334#endif 1440#endif
1335#ifdef OFF_FOCUS_FADING 1441#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade]) 1442 if (rs[Rs_fade])
1337 { 1443 {
1338 PixColors = PixColorsUnFocused; 1444 pix_colors = pix_colors_unfocused;
1339 set_colorfgbg ();
1340 scr_clear (); 1445 scr_recolour ();
1341 scr_touch (true);
1342 } 1446 }
1343#endif 1447#endif
1344
1345 } 1448 }
1346 break; 1449 break;
1347 1450
1348 case ConfigureNotify: 1451 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0]) 1452 if (ev.xconfigure.window == TermWin.parent[0])
… …
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 } 1461 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360 1463
1361 if (szHint.width != width || szHint.height != height) 1464 if (szHint.width != width || szHint.height != height)
1465 {
1466 seen_resize = 1;
1362 resize_all_windows (width, height, 1); 1467 resize_all_windows (width, height, 1);
1468 }
1363 1469
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1471 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1472 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1473#endif
1372 } 1474 }
1373 break; 1475 break;
1374 1476
1375 case PropertyNotify: 1477 case PropertyNotify:
… …
1383 selection_clear (); 1485 selection_clear ();
1384 break; 1486 break;
1385 1487
1386 case SelectionNotify: 1488 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1489 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1490 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1491 break;
1391 1492
1392 case SelectionRequest: 1493 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1494 selection_send (ev.xselectionrequest);
1394 break; 1495 break;
… …
1466 { 1567 {
1467 menubar_control (ev.xbutton); 1568 menubar_control (ev.xbutton);
1468 break; 1569 break;
1469 } 1570 }
1470#endif 1571#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1573 break;
1473 1574
1474 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == TermWin.vt)
1475 { 1576 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1577 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1578 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1479 ; 1580 ;
1480 1581
1481 XQueryPointer (display->display, TermWin.vt, 1582 XQueryPointer (display->display, TermWin.vt,
1482 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1585 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1586 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1588 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1589 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1590 {
1490#endif 1591#endif
1592#if ISO_14755
1593 // 5.4
1594 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1595 {
1596 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1597 break;
1598 }
1599#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1600 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1601 ev.xbutton.state & Button3Mask ? 2 : 0);
1602
1493#ifdef SELECTION_SCROLLING 1603#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1604 if (ev.xbutton.y < TermWin.int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1496 { 1606 {
1497 int dist; 1607 int dist;
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1614
1505 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1507 */ 1617 */
1508 selection_save_x=ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1619 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1621
1513 /* calc number of lines to scroll */ 1622 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1623 if (ev.xbutton.y < TermWin.int_bwidth)
1515 { 1624 {
1516 scroll_selection_dir = UP; 1625 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1626 dist = TermWin.int_bwidth - ev.xbutton.y;
1518 } 1627 }
1519 else 1628 else
1520 { 1629 {
1521 scroll_selection_dir = DN; 1630 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y -
1523 (TermWin.int_bwidth + TermWin.height); 1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1524 } 1632 }
1633
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1634 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1635 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1;
1527 MIN_IT (scroll_selection_lines, 1637 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1638 SELECTION_SCROLL_MAX_LINES);
1529 } 1639 }
1530 else 1640 else
1531 { 1641 {
1532 /* we are within the text window, so we 1642 /* we are within the text window, so we
1533 * shouldn't be scrolling 1643 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1645 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1646 sel_scroll_ev.stop();
1537 } 1647 }
1538#endif 1648#endif
1539#ifdef MOUSE_THRESHOLD 1649#ifdef MOUSE_THRESHOLD
1540
1541 } 1650 }
1542#endif 1651#endif
1543
1544 } 1652 }
1545 } 1653 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1655 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1549 MotionNotify, &ev)) ; 1657 MotionNotify, &ev))
1658 ;
1659
1550 XQueryPointer (display->display, scrollBar.win, 1660 XQueryPointer (display->display, scrollBar.win,
1551 &unused_root, &unused_child, 1661 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1662 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1663 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1664 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1666 scrollbar_size ());
1557 scr_refresh (refresh_type); 1667 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1668 refresh_limit = 0;
… …
1574 case PropertyNotify: 1684 case PropertyNotify:
1575 /* 1685 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1686 * if user used some Esetroot compatible prog to set the root bg,
1577 * use the property to determine the pixmap. We use it later on. 1687 * use the property to determine the pixmap. We use it later on.
1578 */ 1688 */
1579 if (xa[XA_XROOTPMAPID] == 0)
1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1581
1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1691 return;
1584 1692
1585 /* FALLTHROUGH */ 1693 /* FALLTHROUGH */
1586 case ReparentNotify: 1694 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1696 want_refresh = want_full_refresh = 1;
1589 break; 1697 break;
1590 } 1698 }
1591} 1699}
1592#endif 1700#endif
… …
1596{ 1704{
1597 int reportmode = 0, clickintime; 1705 int reportmode = 0, clickintime;
1598 1706
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1708 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1709 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710
1602 /* 1711 /*
1603 * VT window processing of button press 1712 * VT window processing of button press
1604 */ 1713 */
1605 if (ev.window == TermWin.vt) 1714 if (ev.window == TermWin.vt)
1606 { 1715 {
1716#if ISO_14755
1717 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 {
1720 iso14755_54 (ev.x, ev.y);
1721 return;
1722 }
1723#endif
1724
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1725 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1726
1608 if (reportmode) 1727 if (reportmode)
1609 { 1728 {
1610 /* mouse report from vt window */ 1729 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1730 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1731 MEvent.state = ev.state;
… …
1641 } 1760 }
1642 else 1761 else
1643 { 1762 {
1644 if (ev.button != MEvent.button) 1763 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1764 MEvent.clicks = 0;
1765
1646 switch (ev.button) 1766 switch (ev.button)
1647 { 1767 {
1648 case Button1: 1768 case Button1:
1769 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */
1771#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask);
1773#else
1774 selection.rect = false;
1775#endif
1776
1649 /* allow shift+left click to extend selection */ 1777 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1779 {
1652 if (MEvent.button == Button1 && clickintime) 1780 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1781 selection_rotate (ev.x, ev.y);
1654 else 1782 else
1655 selection_extend (ev.x, ev.y, 1); 1783 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1798 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1799 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1800 selection_rotate (ev.x, ev.y);
1673 else 1801 else
1674 selection_extend (ev.x, ev.y, 1); 1802 selection_extend (ev.x, ev.y, 1);
1803
1675 MEvent.button = Button3; 1804 MEvent.button = Button3;
1676 break; 1805 break;
1677 } 1806 }
1678 } 1807 }
1808
1679 MEvent.time = ev.time; 1809 MEvent.time = ev.time;
1680 return; 1810 return;
1681 } 1811 }
1682 1812
1683 /* 1813 /*
… …
1836{ 1966{
1837 int reportmode = 0; 1967 int reportmode = 0;
1838 1968
1839 csrO = 0; /* reset csr Offset */ 1969 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 1970 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1971 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 1972
1843 if (scrollbar_isUpDn ()) 1973 if (scrollbar_isUpDn ())
1844 { 1974 {
1845 scrollBar.setIdle (); 1975 scrollBar.setIdle ();
1846 scrollbar_show (0); 1976 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 1978 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 1979#endif
1850
1851 } 1980 }
1981
1852#ifdef SELECTION_SCROLLING 1982#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 1983 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 1984 sel_scroll_ev.stop();
1855#endif 1985#endif
1986
1856 if (ev.window == TermWin.vt) 1987 if (ev.window == TermWin.vt)
1857 { 1988 {
1989#if ISO_14755
1990 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return;
1993#endif
1858 if (reportmode) 1994 if (reportmode)
1859 { 1995 {
1860 /* mouse report from vt window */ 1996 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 1997 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 1998 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2012 MEvent.button = AnyButton;
1877 mouse_report (ev); 2013 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2014#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2015 return;
1880 } 2016 }
2017
1881 /* 2018 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2019 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2020 * when overriding mouse reporting
1884 */ 2021 */
1885 if (PrivateModes & PrivMode_mouse_report 2022 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2023 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2024 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2025 selection_extend (ev.x, ev.y, 0);
1889 2026
1890 switch (ev.button) 2027 switch (ev.button)
… …
1905 2042
1906 v = ev.button == Button4 ? UP : DN; 2043 v = ev.button == Button4 ? UP : DN;
1907 2044
1908 if (ev.state & ShiftMask) 2045 if (ev.state & ShiftMask)
1909 i = 1; 2046 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2047 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2048 i = TermWin.nrow - 1;
1912 else 2049 else
1913 i = 5; 2050 i = 5;
1914 2051
1915# ifdef MOUSE_SLIP_WHEELING 2052# ifdef MOUSE_SLIP_WHEELING
… …
2200 Pixmap rootpixmap = None; 2337 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2338 XWindowAttributes wattr, wrootattr;
2202 2339
2203 pchanged = 0; 2340 pchanged = 0;
2204 2341
2205 if (!(Options & Opt_transparent)) 2342 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2207 2344
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2346 rootdepth = wrootattr.depth;
2210 2347
… …
2213 if (rootdepth != wattr.depth) 2350 if (rootdepth != wattr.depth)
2214 { 2351 {
2215 if (am_transparent) 2352 if (am_transparent)
2216 { 2353 {
2217 pchanged = 1; 2354 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2356 am_transparent = am_pixmap_trans = 0;
2220 } 2357 }
2221 2358
2222 return pchanged; /* Don't try any more */ 2359 return pchanged; /* Don't try any more */
2223 } 2360 }
… …
2228 /* 2365 /*
2229 * Make the frame window set by the window manager have 2366 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2367 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2368 * windows for each client, so we have to take care about that.
2232 */ 2369 */
2233 i = (xa[XA_XROOTPMAPID] 2370 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2373 &nitems, &bytes_after, &prop) == Success);
2237 2374
2238 if (!i || prop == NULL) 2375 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2376 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2379 &nitems, &bytes_after, &prop) == Success);
2243 2380
2244 if (!i || prop == NULL 2381 if (!i || prop == NULL
2245#if TINTING 2382#if TINTING
… …
2286 sy = 0; 2423 sy = 0;
2287 } 2424 }
2288 2425
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
2291 allowedxerror = -1; 2430 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2432
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2434 /* XXX: may need a delay here? */
… …
2318 if (ISSET_PIXCOLOR (Color_tint)) 2457 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2458 {
2320 unsigned short rm, gm, bm; 2459 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2461
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2463
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2464 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2465 }
2327#endif 2466#endif
2328 2467
… …
2341 2480
2342 am_transparent = am_pixmap_trans = 1; 2481 am_transparent = am_pixmap_trans = 1;
2343 } 2482 }
2344 } 2483 }
2345 2484
2346 if (!am_pixmap_trans) 2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
2347 { 2488 {
2348 unsigned int n; 2489 unsigned int n;
2349 /* 2490 /*
2350 * InheritPixmap transparency 2491 * InheritPixmap transparency
2351 */ 2492 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 { 2494 {
2355 oldp = TermWin.parent[i]; 2495 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2497 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2498 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2499
2361 if (TermWin.parent[i] == display->root) 2500 if (TermWin.parent[i] == display->root)
2362 { 2501 {
2363 if (oldp != None) 2502 if (oldp != None)
2364 pchanged = 1; 2503 pchanged = 1;
… …
2375 if (pchanged) 2514 if (pchanged)
2376 { 2515 {
2377 for (; n < (unsigned int)i; n++) 2516 for (; n < (unsigned int)i; n++)
2378 { 2517 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2518 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) 2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2520 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break; 2522 break;
2385 } 2523 }
2386 } 2524 }
2387 } 2525 }
2388 2526
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 { 2528 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2531 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2532 /* XXX: also turn off Opt_transparent? */
2396 } 2533 }
2397 else 2534 else
2398 { 2535 {
2399#if WAIT_FOR_WM 2536#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2537 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2538 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2539 sleep (1);
2403#endif 2540#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2541 for (n = 0; n < (unsigned int)i; n++)
2406 { 2542 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2544 XClearWindow (display->display, TermWin.parent[n]);
2409 } 2545 }
… …
2414 2550
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2552 TermWin.parent[i] = None;
2417 } 2553 }
2418 2554
2419 // this is experimental
2420 if (scrollBar.win) 2555 if (scrollBar.win)
2421 { 2556 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2558 scrollBar.setIdle ();
2425 scrollbar_show (0); 2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2426 } 2567 }
2427 2568
2428 return pchanged; 2569 return pchanged;
2429} 2570}
2430#endif 2571#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2590 if (ch == NOCHAR) // TODO: improve
2450 break; 2591 break;
2451 2592
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2594 {
2595 if (!seen_input)
2596 {
2597 seen_input = 1;
2598 // many badly-written programs (e.g. jed) contain a race condition:
2599 // they first read the screensize and then install a SIGWINCH handler.
2600 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized.
2605 if (seen_resize)
2606 kill (-cmd_pid, SIGWINCH);
2607 }
2608
2454 /* Read a text string from the input buffer */ 2609 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2610 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2611 bool refreshnow = false;
2457 int nlines = 0; 2612 int nlines = 0;
2458 unicode_t *str = buf; 2613 unicode_t *str = buf;
… …
2467 if (ch == C0_LF) 2622 if (ch == C0_LF)
2468 { 2623 {
2469 nlines++; 2624 nlines++;
2470 refresh_count++; 2625 refresh_count++;
2471 2626
2472 if (!(Options & Opt_jumpScroll) 2627 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2629 {
2475 refreshnow = true; 2630 refreshnow = true;
2476 ch = NOCHAR; 2631 ch = NOCHAR;
2477 break; 2632 break;
… …
2504 * the number of pages between refreshes is refresh_limit, which 2659 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2660 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2661 */
2507 if (refreshnow) 2662 if (refreshnow)
2508 { 2663 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2665 refresh_limit++;
2511 else 2666 else
2512 { 2667 {
2513 flag = true; 2668 flag = true;
2514 scr_refresh (refresh_type); 2669 scr_refresh (refresh_type);
… …
2568 if (len == (size_t)-1) 2723 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2725
2571 // assume wchar == unicode 2726 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2727 cmdbuf_ptr += len;
2573 return wc; 2728 return wc & UNICODE_MASK;
2574 } 2729 }
2575 2730
2576 return NOCHAR; 2731 return NOCHAR;
2577} 2732}
2578 2733
… …
2704 process_escape_seq (); 2859 process_escape_seq ();
2705 break; 2860 break;
2706 case C0_ENQ: /* terminal Status */ 2861 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2862 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2865 else
2711 tt_write ((unsigned char *)VT100_ANS, 2866 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2867 (unsigned int)strlen (VT100_ANS));
2713 break; 2868 break;
2714 case C0_BEL: /* bell */ 2869 case C0_BEL: /* bell */
2715 scr_bell (); 2870 scr_bell ();
2716 break; 2871 break;
2717 case C0_BS: /* backspace */ 2872 case C0_BS: /* backspace */
… …
2816void 2971void
2817rxvt_term::process_escape_seq () 2972rxvt_term::process_escape_seq ()
2818{ 2973{
2819 unicode_t ch = cmd_getc (); 2974 unicode_t ch = cmd_getc ();
2820 2975
2821 if (PrivateModes & PrivMode_vt52) 2976 if (priv_modes & PrivMode_vt52)
2822 { 2977 {
2823 process_escape_vt52 (ch); 2978 process_escape_vt52 (ch);
2824 return; 2979 return;
2825 } 2980 }
2826 2981
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2996 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2997 break;
2843 case '+': 2998 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2999 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3000 break;
2846#ifndef NO_FRILLS 3001#if ENABLE_FRILLS
2847 case '6': 3002 case '6':
2848 scr_backindex (); 3003 scr_backindex ();
2849 break; 3004 break;
2850#endif 3005#endif
2851 case '7': 3006 case '7':
2852 scr_cursor (SAVE); 3007 scr_cursor (SAVE);
2853 break; 3008 break;
2854 case '8': 3009 case '8':
2855 scr_cursor (RESTORE); 3010 scr_cursor (RESTORE);
2856 break; 3011 break;
2857#ifndef NO_FRILLS 3012#if ENABLE_FRILLS
2858 case '9': 3013 case '9':
2859 scr_forwardindex (); 3014 scr_forwardindex ();
2860 break; 3015 break;
2861#endif 3016#endif
2862 case '=': 3017 case '=':
… …
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
3162 break; 3317 break;
3163 3318
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3320 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3322 break;
3168 3323
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3325 process_sgr_mode (nargs, arg);
3171 break; 3326 break;
… …
3178 break; 3333 break;
3179 case 6: /* CPR requested */ 3334 case 6: /* CPR requested */
3180 scr_report_position (); 3335 scr_report_position ();
3181 break; 3336 break;
3182 case 7: /* unofficial extension */ 3337 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3338 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3339 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3340 break;
3186 case 8: /* unofficial extension */ 3341 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3343 break;
3189 } 3344 }
… …
3225 break; 3380 break;
3226 3381
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3382 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3383 if (arg[0] == 4)
3229 scr_insert_mode (0); 3384 scr_insert_mode (0);
3385 else if (arg[0] == 20)
3386 priv_modes &= ~PrivMode_LFNL;
3230 break; 3387 break;
3231 3388
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3389 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3390 if (arg[0] == 4)
3234 scr_insert_mode (1); 3391 scr_insert_mode (1);
3392 else if (arg[0] == 20)
3393 priv_modes |= PrivMode_LFNL;
3235 break; 3394 break;
3236 3395
3237 /* 3396 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3397 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3398 */
… …
3251 break; 3410 break;
3252 case CSI_75: 3411 case CSI_75:
3253 scr_cursor (RESTORE); 3412 scr_cursor (RESTORE);
3254 break; 3413 break;
3255 3414
3256#ifndef NO_FRILLS 3415#if ENABLE_FRILLS
3257 case CSI_74: 3416 case CSI_74:
3258 process_window_ops (arg, nargs); 3417 process_window_ops (arg, nargs);
3259 break; 3418 break;
3260#endif 3419#endif
3261 3420
… …
3268 break; 3427 break;
3269 } 3428 }
3270} 3429}
3271/*}}} */ 3430/*}}} */
3272 3431
3273#ifndef NO_FRILLS 3432#if ENABLE_FRILLS
3274/* ARGSUSED */ 3433/* ARGSUSED */
3275void 3434void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3435rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3436{
3278 int x, y; 3437 int x, y;
… …
3348 break; 3507 break;
3349 case 20: /* report icon label */ 3508 case 20: /* report icon label */
3350 { 3509 {
3351 char *s; 3510 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3511 XGetIconName (display->display, TermWin.parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3513 XFree (s);
3355 } 3514 }
3356 break; 3515 break;
3357 case 21: /* report window title */ 3516 case 21: /* report window title */
3358 { 3517 {
3359 char *s; 3518 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3519 XFetchName (display->display, TermWin.parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3521 XFree (s);
3363 } 3522 }
3364 break; 3523 break;
3365 } 3524 }
3366} 3525}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3531 * ends_how is terminator used. returned input must be free()'d
3373 */ 3532 */
3374unsigned char * 3533unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3534rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3535{
3377 unicode_t prev = 0, ch; 3536 unicode_t ch;
3537 bool seen_esc = false;
3378 unsigned int n = 0; 3538 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3539 wchar_t string[STRING_MAX];
3381 3540
3382 while ((ch = cmd_getc ()) != NOCHAR) 3541 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3542 {
3384 if (prev == C0_ESC) 3543 if (seen_esc)
3385 { 3544 {
3386 if (ch == 0x5c) /* 7bit ST */ 3545 if (ch == 0x5c) /* 7bit ST */
3387 break; 3546 break;
3388 else 3547 else
3389 return NULL; 3548 return NULL;
3390 } 3549 }
3550 else if (ch == C0_ESC)
3551 {
3552 seen_esc = true;
3553 continue;
3554 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3555 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3556 break;
3393 else if (ch < 0x20) 3557 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3558 return NULL; /* other control character - exit */
3559
3560 seen_esc = false;
3395 3561
3396 if (n >= sizeof (string) - 1) 3562 if (n >= sizeof (string) - 1)
3397 // stop at some sane length 3563 // stop at some sane length
3398 return NULL; 3564 return NULL;
3399 3565
3400 if (ch == C0_SYN) 3566 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3567 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3568 else
3406 string[n++] = prev = ch; 3569 string[n++] = ch;
3407 } 3570 }
3408 3571
3409 string[n++] = '\0'; 3572 string[n++] = '\0';
3410 3573
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3574 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3575
3416 return s; 3576 return (unsigned char *)rxvt_wcstombs (string);
3417} 3577}
3418 3578
3419/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
3420/* 3580/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3581 * 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) 3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3627{
3468 if (str[0] == '?' && !str[1]) 3628 if (str[0] == '?' && !str[1])
3469 { 3629 {
3470 unsigned short r, g, b; 3630 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3631 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3633 }
3474 else 3634 else
3475 set_window_color (color, str); 3635 set_window_color (color, str);
3476} 3636}
… …
3505{ 3665{
3506 int changed = 0; 3666 int changed = 0;
3507 int color; 3667 int color;
3508 char *buf, *name; 3668 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3669 bool query = str[0] == '?' && !str[1];
3670 int saveop = op;
3510 3671
3511 assert (str != NULL); 3672 assert (str != NULL);
3512 switch (op) 3673 switch (op)
3513 { 3674 {
3514 case XTerm_name: 3675 case XTerm_name:
… …
3521 set_title (str); 3682 set_title (str);
3522 break; 3683 break;
3523 case XTerm_property: 3684 case XTerm_property:
3524 if (str[0] == '?') 3685 if (str[0] == '?')
3525 { 3686 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3687 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3688 Atom actual_type;
3528 int actual_format; 3689 int actual_format;
3529 unsigned long nitems; 3690 unsigned long nitems;
3530 unsigned long bytes_after; 3691 unsigned long bytes_after;
3531 unsigned char *value = 0; 3692 unsigned char *value = 0;
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3710 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3711
3551 if (eq) 3712 if (eq)
3552 { 3713 {
3553 *eq = 0; 3714 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3715 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 } 3716 }
3559 else 3717 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3718 XDeleteProperty (display->display, TermWin.parent[0],
3561 display->atom (str)); 3719 display->atom (str));
3562 } 3720 }
3563 break; 3721 break;
3564 3722
3565 case XTerm_Color: 3723 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3724 for (buf = (char *)str; buf && *buf;)
3567 { 3725 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3726 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3727 break;
3570 3728
3571 *name++ = '\0'; 3729 *name++ = '\0';
3572 color = atoi (buf); 3730 color = atoi (buf);
3573 3731
3574 if (color < 0 || color >= TOTAL_COLORS) 3732 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3733 break;
3576 3734
3577 if ((buf = STRCHR (name, ';')) != NULL) 3735 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3736 *buf++ = '\0';
3579 3737
3580 if (name[0] == '?' && !name[1]) 3738 if (name[0] == '?' && !name[1])
3581 { 3739 {
3582 unsigned short r, g, b; 3740 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3741 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); 3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3743 }
3586 else 3744 else
3587 set_window_color (color + minCOLOR, name); 3745 set_window_color (color + minCOLOR, name);
3588 } 3746 }
… …
3606 break; 3764 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3765#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD: 3766 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break; 3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3611 case XTerm_Color_UL: 3772 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3774 break;
3614 case XTerm_Color_RV: 3775 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break;
3778#endif
3779#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3782 check_our_parents ();
3783 if (am_transparent)
3784 want_full_refresh = want_refresh = 1;
3616 break; 3785 break;
3617#endif 3786#endif
3618 3787
3619 case XTerm_Pixmap: 3788 case XTerm_Pixmap:
3620 if (*str != ';') 3789 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3792 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3793 set_bgPixmap (str); /* change pixmap */
3625#endif 3794#endif
3626 scr_touch (true); 3795 scr_touch (true);
3627 } 3796 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3797 while ((str = strchr (str, ';')) != NULL)
3629 { 3798 {
3630 str++; 3799 str++;
3631#if XPM_BACKGROUND 3800#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3801 changed += scale_pixmap (str);
3633#endif 3802#endif
… …
3652 case XTerm_logfile: 3821 case XTerm_logfile:
3653 // TODO, when secure mode? 3822 // TODO, when secure mode?
3654 break; 3823 break;
3655 3824
3656 case XTerm_font: 3825 case XTerm_font:
3826 op = URxvt_font;
3827 case URxvt_font:
3828#if ENABLE_STYLES
3829 case URxvt_boldFont:
3830 case URxvt_italicFont:
3831 case URxvt_boldItalicFont:
3832#endif
3657 if (query) 3833 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3834 tt_printf ("\33]%d;%-.250s%c", saveop,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc 3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3660 ? TermWin.fontset->fontdesc : "", 3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3661 resp); 3837 resp);
3662 else 3838 else
3839 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841
3842 res = strdup (str);
3843 allocated.push_back ((void *)res);
3663 change_font (str); 3844 set_fonts ();
3845 }
3664 break; 3846 break;
3665 3847
3666#ifndef NO_FRILLS 3848#if ENABLE_FRILLS
3667 case XTerm_locale: 3849 case XTerm_locale:
3668 if (query) 3850 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); 3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3670 else 3852 else
3671 { 3853 {
3672 set_locale (str); 3854 set_locale (str);
3673# ifdef USE_XIM 3855# ifdef USE_XIM
3674 im_cb (); 3856 im_cb ();
3675# endif 3857# endif
3676 } 3858 }
3677 break; 3859 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 3860#endif
3689 3861
3690#ifdef MENUBAR 3862#ifdef MENUBAR
3691 case XTerm_Menu: 3863 case XTerm_Menu:
3692 if (Options & Opt_insecure) 3864 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3866 break;
3695#endif 3867#endif
3696#if 0 3868#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3869 case XTerm_dumpscreen: /* no error notices */
… …
3724{ 3896{
3725 int state; 3897 int state;
3726 3898
3727 if (mode == 's') 3899 if (mode == 's')
3728 { 3900 {
3729 SavedModes |= (PrivateModes & bit); 3901 SavedModes |= (priv_modes & bit);
3730 return -1; 3902 return -1;
3731 } 3903 }
3732 else 3904 else
3733 { 3905 {
3734 if (mode == 'r') 3906 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3907 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3908 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3909 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3910 PrivMode (state, bit);
3739 } 3911 }
3740 3912
3741 return state; 3913 return state;
3742} 3914}
… …
3760 { 3, PrivMode_132 }, 3932 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3933 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3934 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3935 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3936 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3938 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3939#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3940 { menuBar_esc, PrivMode_menuBar },
3768#endif 3941#endif
3942 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3944#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3945 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3946#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3947 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3948 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3949 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3950 // 45 margin bell NYI
3779 // 46 start logging 3951 // 46 start logging
… …
3820 3992
3821 /* extra handling for values with state unkept */ 3993 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3994 switch (arg[i])
3823 { 3995 {
3824 case 1048: /* alternative cursor save */ 3996 case 1048: /* alternative cursor save */
3997 case 1049:
3825 if (Options & Opt_secondaryScreen) 3998 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 3999 if (mode == 0)
3827 scr_cursor (RESTORE); 4000 scr_cursor (RESTORE);
3828 else if (mode == 1) 4001 else if (mode == 1)
3829 scr_cursor (SAVE); 4002 scr_cursor (SAVE);
3830 break; 4003 break;
… …
3841 * within VT52 mode 4014 * within VT52 mode
3842 */ 4015 */
3843 PrivMode (1, PrivMode_vt52); 4016 PrivMode (1, PrivMode_vt52);
3844 break; 4017 break;
3845 case 3: /* 80/132 */ 4018 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4019 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3848 break; 4021 break;
3849 case 4: /* smooth scrolling */ 4022 case 4: /* smooth scrolling */
3850 if (state) 4023 if (state)
3851 Options &= ~Opt_jumpScroll; 4024 options &= ~Opt_jumpScroll;
3852 else 4025 else
3853 Options |= Opt_jumpScroll; 4026 options |= Opt_jumpScroll;
3854 break; 4027 break;
3855 case 5: /* reverse video */ 4028 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4029 scr_rvideo_mode (state);
3857 break; 4030 break;
3858 case 6: /* relative/absolute origins */ 4031 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4035 scr_autowrap (state);
3863 break; 4036 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4037 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4038 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4039 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4040 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4041 break;
3869#ifdef menuBar_esc 4042#ifdef menuBar_esc
3870 case menuBar_esc: 4043 case menuBar_esc:
3871#ifdef MENUBAR 4044#ifdef MENUBAR
3872 map_menuBar (state); 4045 map_menuBar (state);
… …
3892 break; 4065 break;
3893 /* case 66: - application key pad */ 4066 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4067 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4068 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4070 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4071 break;
3899#if 0 4072#if 0
3900 case 1001: 4073 case 1001:
3901 break; /* X11 mouse highlighting */ 4074 break; /* X11 mouse highlighting */
3902#endif 4075#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4076 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4077 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4078 options &= ~Opt_scrollTtyOutput;
3906 else 4079 else
3907 Options |= Opt_scrollTtyOutput; 4080 options |= Opt_scrollTtyOutput;
3908 break; 4081 break;
3909 case 1011: /* scroll to bottom on key press */ 4082 case 1011: /* scroll to bottom on key press */
3910 if (state) 4083 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4084 options |= Opt_scrollTtyKeypress;
3912 else 4085 else
3913 Options &= ~Opt_scrollTtyKeypress; 4086 options &= ~Opt_scrollTtyKeypress;
3914 break; 4087 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4088 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4089 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4090 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4091 scr_erase_screen (2);
3919 scr_change_screen (state); 4092 scr_change_screen (state);
3920 break; 4093 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4094 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4095 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4096 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4097 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4098 scr_erase_screen (2);
3926 break; 4099 break;
3927 default: 4100 default:
3928 break; 4101 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4127 rendset = 0, rendstyle = ~RS_None;
3955 break; 4128 break;
3956 case 1: 4129 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4130 rendset = 1, rendstyle = RS_Bold;
3958 break; 4131 break;
3959 //case 2: // faint or second colour 4132 //case 2: // low intensity
4133 case 3:
4134 rendset = 1, rendstyle = RS_Italic;
4135 break;
3960 case 4: 4136 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4137 rendset = 1, rendstyle = RS_Uline;
3962 break; 4138 break;
3963 case 5: // slowly blinking 4139 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4140 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4152 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4153 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4154 //...
3979 //case 19: // ninth alt font 4155 //case 19: // ninth alt font
3980 //case 20: // gothic 4156 //case 20: // gothic
3981 case 21: // disable bold, faint 4157 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4158 rendset = 0, rendstyle = RS_Bold;
3983 break; 4159 break;
3984 case 22: 4160 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4161 rendset = 0, rendstyle = RS_Bold;
3986 break; 4162 break;
3987 //case 23: disable italic 4163 case 23: // disable italic
4164 rendset = 0, rendstyle = RS_Italic;
4165 break;
3988 case 24: 4166 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4167 rendset = 0, rendstyle = RS_Uline;
3990 break; 4168 break;
3991 case 25: 4169 case 25:
4170 rendset = 0, rendstyle = RS_Blink;
4171 break;
4172 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4173 rendset = 0, rendstyle = RS_Blink;
3993 break; 4174 break;
3994 case 27: 4175 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4176 rendset = 0, rendstyle = RS_RVid;
3996 break; 4177 break;
… …
4014 case 35: 4195 case 35:
4015 case 36: 4196 case 36:
4016 case 37: 4197 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4199 break;
4019#ifdef TTY_256COLOR 4200 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4202 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4204 i += 2;
4025 } 4205 }
4026 break; 4206 break;
4027#endif
4028 case 39: /* default fg */ 4207 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4208 scr_color (Color_fg, Color_fg);
4030 break; 4209 break;
4031 4210
4032 case 40: 4211 case 40:
… …
4037 case 45: 4216 case 45:
4038 case 46: 4217 case 46:
4039 case 47: 4218 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4220 break;
4042#ifdef TTY_256COLOR 4221 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4223 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4225 i += 2;
4048 } 4226 }
4049 break; 4227 break;
4050#endif
4051 case 49: /* default bg */ 4228 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4229 scr_color (Color_bg, Color_bg);
4053 break; 4230 break;
4231
4232 //case 50: // not variable spacing
4054 4233
4055#ifndef NO_BRIGHTCOLOR 4234#ifndef NO_BRIGHTCOLOR
4056 case 90: 4235 case 90:
4057 case 91: /* set bright fg color */ 4236 case 91: /* set bright fg color */
4058 case 92: 4237 case 92:
4059 case 93: 4238 case 93:
4060 case 94: 4239 case 94:
4061 case 95: 4240 case 95:
4062 case 96: 4241 case 96:
4063 case 97: 4242 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4243 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4244 break;
4067 case 100: 4245 case 100:
4068 case 101: /* set bright bg color */ 4246 case 101: /* set bright bg color */
4069 case 102: 4247 case 102:
4070 case 103: 4248 case 103:
4071 case 104: 4249 case 104:
4072 case 105: 4250 case 105:
4073 case 106: 4251 case 106:
4074 case 107: 4252 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4254 break;
4078#endif 4255#endif
4079 4256
4080 } 4257 }
4081 } 4258 }
… …
4088{ 4265{
4089 unicode_t ch, cmd = cmd_getc (); 4266 unicode_t ch, cmd = cmd_getc ();
4090 4267
4091 if (cmd == 'Q') 4268 if (cmd == 'Q')
4092 { /* query graphics */ 4269 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4270 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4271 return;
4095 } 4272 }
4096 /* swallow other graphics sequences until terminating ':' */ 4273 /* swallow other graphics sequences until terminating ':' */
4097 do 4274 do
4098 ch = cmd_getc (); 4275 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4290 unsigned char buf[256];
4114 4291
4115 va_start (arg_ptr, fmt); 4292 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4294 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4295 tt_write (buf, strlen (buf));
4119} 4296}
4120 4297
4121/* ---------------------------------------------------------------------- */ 4298/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4299/* 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. 4300 * or generated by us in response to a query ESC sequence.
4124 */ 4301 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303
4125void 4304void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4305rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4306{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4307 if (v_buflen == 0)
4308 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4129 4310
4130 if (len) 4311 if ((unsigned int)written == len)
4312 return;
4313
4314 data += written;
4315 len -= written;
4131 { 4316 }
4317
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4319
4320 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len;
4322
4323 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324}
4325
4326void rxvt_term::pty_write ()
4327{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329
4330 if (written > 0)
4331 {
4332 v_buflen -= written;
4333
4132 if (v_buflen == 0) 4334 if (v_buflen == 0)
4133 { 4335 {
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); 4336 free (v_buffer);
4161 v_buffer = 0; 4337 v_buffer = 0;
4162 v_buflen = 0; 4338 v_buflen = 0;
4163 4339
4164 pty_ev.set (EVENT_READ); 4340 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; 4341 return;
4177 } 4342 }
4343
4344 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4345 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this...
4348 destroy ();
4179} 4349}
4180 4350
4181/*----------------------- end-of-file (C source) -----------------------*/ 4351/*----------------------- end-of-file (C source) -----------------------*/
4182 4352

Diff Legend

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