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

Diff Legend

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