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.192 by root, Fri Feb 4 11:41: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)
… …
1068 1182
1069/*{{{ process an X event */ 1183/*{{{ process an X event */
1070void 1184void
1071rxvt_term::x_cb (XEvent &ev) 1185rxvt_term::x_cb (XEvent &ev)
1072{ 1186{
1187 dDisp;
1188
1073 SET_R (this); 1189 SET_R (this);
1074 SET_LOCALE (locale); 1190 SET_LOCALE (locale);
1075 1191
1076#if defined(CURSOR_BLINK) 1192#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1194 {
1079 if (hidden_cursor) 1195 if (hidden_cursor)
1080 { 1196 {
1081 hidden_cursor = 0; 1197 hidden_cursor = 0;
1082 want_refresh = 1; 1198 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1201 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1202 }
1087#endif 1203#endif
1088 1204
1089#if defined(POINTER_BLANK) 1205#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1206 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1207 {
1092 if (ev.type == MotionNotify 1208 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1209 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1210 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1211 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1214 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1215 pointer_blank ();
1100 } 1216 }
1101#endif 1217#endif
1102 1218
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1219 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1220 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1221 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 1222
1161 switch (ev.type) 1223 switch (ev.type)
1162 { 1224 {
1163 case KeyPress: 1225 case KeyPress:
1226#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1227 if (!(iso14755buf & ISO_14755_52))
1228#endif
1165 lookup_key (ev.xkey); 1229 lookup_key (ev.xkey);
1166 1230
1167 break; 1231 break;
1168 1232
1169 case KeyRelease: 1233 case KeyRelease:
1170 { 1234 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1235#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1236 KeySym ks;
1173 1237
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1238 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1239#endif
1176 1240
1177#ifndef NO_FRILLS 1241#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1242 // ISO 14755 support
1179 if (iso14755buf) 1243 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1244 if (iso14755buf & ISO_14755_52)
1181 { 1245 {
1246# if ENABLE_OVERLAY
1247 scr_overlay_off ();
1248# endif
1249# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1250 // iso14755 part 5.2 handling: release time
1183 // first: controls 1251 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1252 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1253 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1254 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1255 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1256 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1257 commit_iso14755 ();
1190 return; // case-break; 1258 return; // case-break;
1191 } 1259 }
1192 1260
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1261 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1262 if (i[0] == ks)
1195 { 1263 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1264 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1265 commit_iso14755 ();
1198 return; // case-break; 1266 return; // case-break;
1199 } 1267 }
1200 1268
1269 scr_bell ();
1270# endif
1201 iso14755buf = 0; 1271 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1272 break;
1204 } 1273 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1274 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1275 {
1276# if ENABLE_OVERLAY
1277 scr_overlay_off ();
1278# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1279 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1280 commit_iso14755 ();
1281#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1282 else if (iso14755buf & ISO_14755_STARTED)
1283 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1284 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1285
1286 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1287 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1288 }
1289# endif
1290 else
1291 iso14755buf = 0;
1211 } 1292 }
1212#endif 1293#endif
1213 1294
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1295#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1296 if (!(ev.xkey.state & ControlMask))
… …
1243 Atom ActualType; 1324 Atom ActualType;
1244 int ActualFormat; 1325 int ActualFormat;
1245 unsigned char *data; 1326 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1327 unsigned long Size, RemainingBytes;
1247 1328
1248 XGetWindowProperty (display->display, display->root, 1329 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1330 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1331 0L, 1000000L,
1251 False, AnyPropertyType, 1332 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1333 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1334 &Size, &RemainingBytes,
1254 &data); 1335 &data);
1255 XChangeProperty (display->display, display->root, 1336 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1337 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1340 }
1263#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1264 break; 1342 break;
1265 1343
1266 case MappingNotify: 1344 case MappingNotify:
… …
1297 { 1375 {
1298 TermWin.focus = 1; 1376 TermWin.focus = 1;
1299 want_refresh = 1; 1377 want_refresh = 1;
1300#ifdef USE_XIM 1378#ifdef USE_XIM
1301 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1302 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1303#endif 1384#endif
1304#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif 1388#endif
1308#ifdef OFF_FOCUS_FADING 1389#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade]) 1390 if (rs[Rs_fade])
1310 { 1391 {
1311 PixColors = PixColorsFocused; 1392 pix_colors = pix_colors_focused;
1312 set_colorfgbg ();
1313 scr_clear (); 1393 scr_recolour ();
1314 scr_touch (true);
1315 } 1394 }
1316#endif 1395#endif
1317 1396
1318 } 1397 }
1319 break; 1398 break;
… …
1321 case FocusOut: 1400 case FocusOut:
1322 if (TermWin.focus) 1401 if (TermWin.focus)
1323 { 1402 {
1324 TermWin.focus = 0; 1403 TermWin.focus = 0;
1325 want_refresh = 1; 1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1326#ifdef USE_XIM 1412#ifdef USE_XIM
1327 if (Input_Context != NULL) 1413 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context); 1414 XUnsetICFocus (Input_Context);
1329#endif 1415#endif
1330#ifdef CURSOR_BLINK 1416#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink) 1417 if (options & Opt_cursorBlink)
1332 cursor_blink_ev.stop (); 1418 cursor_blink_ev.stop ();
1333 hidden_cursor = 0; 1419 hidden_cursor = 0;
1334#endif 1420#endif
1335#ifdef OFF_FOCUS_FADING 1421#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade]) 1422 if (rs[Rs_fade])
1337 { 1423 {
1338 PixColors = PixColorsUnFocused; 1424 pix_colors = pix_colors_unfocused;
1339 set_colorfgbg ();
1340 scr_clear (); 1425 scr_recolour ();
1341 scr_touch (true);
1342 } 1426 }
1343#endif 1427#endif
1344
1345 } 1428 }
1346 break; 1429 break;
1347 1430
1348 case ConfigureNotify: 1431 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0]) 1432 if (ev.xconfigure.window == TermWin.parent[0])
… …
1354 { /* Wrap lots of configures into one */ 1437 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width; 1438 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height; 1439 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 } 1441 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1360 1443
1361 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != width || szHint.height != height)
1445 {
1446 seen_resize = 1;
1362 resize_all_windows (width, height, 1); 1447 resize_all_windows (width, height, 1);
1448 }
1363 1449
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1451 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1452 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1453#endif
1372 } 1454 }
1373 break; 1455 break;
1374 1456
1375 case PropertyNotify: 1457 case PropertyNotify:
… …
1383 selection_clear (); 1465 selection_clear ();
1384 break; 1466 break;
1385 1467
1386 case SelectionNotify: 1468 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1469 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1471 break;
1391 1472
1392 case SelectionRequest: 1473 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1394 break; 1475 break;
… …
1418 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1419 { 1500 {
1420 do 1501 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1424 1505
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1507
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1430 1511
1431 scr_refresh (refresh_type); 1512 scr_refresh (refresh_type);
1432 } 1513 }
1433 else 1514 else
1434 { 1515 {
1435 XEvent unused_event; 1516 XEvent unused_event;
1436 1517
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1519 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1521 ;
1441 1522
1442 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1443 { 1524 {
1444 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
… …
1449 menubar_expose (); 1530 menubar_expose ();
1450#endif 1531#endif
1451 1532
1452#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1535 XClearWindow (disp, ev.xany.window);
1455#endif 1536#endif
1456 } 1537 }
1457 break; 1538 break;
1458 1539
1459 case MotionNotify: 1540 case MotionNotify:
… …
1466 { 1547 {
1467 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1468 break; 1549 break;
1469 } 1550 }
1470#endif 1551#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1553 break;
1473 1554
1474 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1475 { 1556 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1558 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1479 ; 1560 ;
1480 1561
1481 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1482 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1565 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1566 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1570 {
1490#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 ev.xbutton.state & Button3Mask ? 2 : 0);
1582
1493#ifdef SELECTION_SCROLLING 1583#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1584 if (ev.xbutton.y < TermWin.int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1496 { 1586 {
1497 int dist; 1587 int dist;
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1593 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1594
1505 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1507 */ 1597 */
1508 selection_save_x=ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1599 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1601
1513 /* calc number of lines to scroll */ 1602 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1603 if (ev.xbutton.y < TermWin.int_bwidth)
1515 { 1604 {
1516 scroll_selection_dir = UP; 1605 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1606 dist = TermWin.int_bwidth - ev.xbutton.y;
1518 } 1607 }
1519 else 1608 else
1520 { 1609 {
1521 scroll_selection_dir = DN; 1610 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y -
1523 (TermWin.int_bwidth + TermWin.height); 1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1524 } 1612 }
1613
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1614 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1615 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1;
1527 MIN_IT (scroll_selection_lines, 1617 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1618 SELECTION_SCROLL_MAX_LINES);
1529 } 1619 }
1530 else 1620 else
1531 { 1621 {
1532 /* we are within the text window, so we 1622 /* we are within the text window, so we
1533 * shouldn't be scrolling 1623 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1625 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1537 } 1627 }
1538#endif 1628#endif
1539#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1540
1541 } 1630 }
1542#endif 1631#endif
1543
1544 } 1632 }
1545 } 1633 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1635 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1637 MotionNotify, &ev))
1638 ;
1639
1550 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1643 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1644 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1646 scrollbar_size ());
1557 scr_refresh (refresh_type); 1647 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1648 refresh_limit = 0;
… …
1574 case PropertyNotify: 1664 case PropertyNotify:
1575 /* 1665 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1666 * 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. 1667 * use the property to determine the pixmap. We use it later on.
1578 */ 1668 */
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]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1671 return;
1584 1672
1585 /* FALLTHROUGH */ 1673 /* FALLTHROUGH */
1586 case ReparentNotify: 1674 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1676 want_refresh = want_full_refresh = 1;
1589 break; 1677 break;
1590 } 1678 }
1591} 1679}
1592#endif 1680#endif
… …
1596{ 1684{
1597 int reportmode = 0, clickintime; 1685 int reportmode = 0, clickintime;
1598 1686
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1687 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1688 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1689 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690
1602 /* 1691 /*
1603 * VT window processing of button press 1692 * VT window processing of button press
1604 */ 1693 */
1605 if (ev.window == TermWin.vt) 1694 if (ev.window == TermWin.vt)
1606 { 1695 {
1696#if ISO_14755
1697 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 {
1700 iso14755_54 (ev.x, ev.y);
1701 return;
1702 }
1703#endif
1704
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1705 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1706
1608 if (reportmode) 1707 if (reportmode)
1609 { 1708 {
1610 /* mouse report from vt window */ 1709 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1710 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1711 MEvent.state = ev.state;
… …
1641 } 1740 }
1642 else 1741 else
1643 { 1742 {
1644 if (ev.button != MEvent.button) 1743 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1744 MEvent.clicks = 0;
1745
1646 switch (ev.button) 1746 switch (ev.button)
1647 { 1747 {
1648 case Button1: 1748 case Button1:
1749 /* allow meta + click to select rectangular areas */
1750 /* should be done in screen.C */
1751#if ENABLE_FRILLS
1752 selection.rect = !!(ev.state & ModMetaMask);
1753#else
1754 selection.rect = false;
1755#endif
1756
1649 /* allow shift+left click to extend selection */ 1757 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1758 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1759 {
1652 if (MEvent.button == Button1 && clickintime) 1760 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1761 selection_rotate (ev.x, ev.y);
1654 else 1762 else
1655 selection_extend (ev.x, ev.y, 1); 1763 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1778 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1779 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1780 selection_rotate (ev.x, ev.y);
1673 else 1781 else
1674 selection_extend (ev.x, ev.y, 1); 1782 selection_extend (ev.x, ev.y, 1);
1783
1675 MEvent.button = Button3; 1784 MEvent.button = Button3;
1676 break; 1785 break;
1677 } 1786 }
1678 } 1787 }
1788
1679 MEvent.time = ev.time; 1789 MEvent.time = ev.time;
1680 return; 1790 return;
1681 } 1791 }
1682 1792
1683 /* 1793 /*
… …
1836{ 1946{
1837 int reportmode = 0; 1947 int reportmode = 0;
1838 1948
1839 csrO = 0; /* reset csr Offset */ 1949 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 1950 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1951 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 1952
1843 if (scrollbar_isUpDn ()) 1953 if (scrollbar_isUpDn ())
1844 { 1954 {
1845 scrollBar.setIdle (); 1955 scrollBar.setIdle ();
1846 scrollbar_show (0); 1956 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1957#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 1958 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 1959#endif
1850
1851 } 1960 }
1961
1852#ifdef SELECTION_SCROLLING 1962#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 1963 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 1964 sel_scroll_ev.stop();
1855#endif 1965#endif
1966
1856 if (ev.window == TermWin.vt) 1967 if (ev.window == TermWin.vt)
1857 { 1968 {
1969#if ISO_14755
1970 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return;
1973#endif
1858 if (reportmode) 1974 if (reportmode)
1859 { 1975 {
1860 /* mouse report from vt window */ 1976 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 1977 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 1978 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 1992 MEvent.button = AnyButton;
1877 mouse_report (ev); 1993 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1994#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 1995 return;
1880 } 1996 }
1997
1881 /* 1998 /*
1882 * dumb hack to compensate for the failure of click-and-drag 1999 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2000 * when overriding mouse reporting
1884 */ 2001 */
1885 if (PrivateModes & PrivMode_mouse_report 2002 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2003 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2004 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2005 selection_extend (ev.x, ev.y, 0);
1889 2006
1890 switch (ev.button) 2007 switch (ev.button)
… …
1905 2022
1906 v = ev.button == Button4 ? UP : DN; 2023 v = ev.button == Button4 ? UP : DN;
1907 2024
1908 if (ev.state & ShiftMask) 2025 if (ev.state & ShiftMask)
1909 i = 1; 2026 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2027 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2028 i = TermWin.nrow - 1;
1912 else 2029 else
1913 i = 5; 2030 i = 5;
1914 2031
1915# ifdef MOUSE_SLIP_WHEELING 2032# ifdef MOUSE_SLIP_WHEELING
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2084 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2085 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2086 int i;
1970 2087
1971 Visual* visual = display->visual; 2088 Visual *visual = display->visual;
1972 2089
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2091
1975 /* for convenience */ 2092 /* for convenience */
1976 mask_r = visual->red_mask; 2093 mask_r = visual->red_mask;
… …
2197 Atom atype; 2314 Atom atype;
2198 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2316 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
2202 2320
2203 pchanged = 0; 2321 pchanged = 0;
2204 2322
2205 if (!(Options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
2207 2325
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
2210 2328
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2212 2330
2213 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
2214 { 2332 {
2215 if (am_transparent) 2333 if (am_transparent)
2216 { 2334 {
2217 pchanged = 1; 2335 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
2220 } 2338 }
2221 2339
2222 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
2223 } 2341 }
2224 2342
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2343 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2344 XSync (disp, False);
2227 2345
2228 /* 2346 /*
2229 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2349 * windows for each client, so we have to take care about that.
2232 */ 2350 */
2233 i = (xa[XA_XROOTPMAPID] 2351 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2354 &nitems, &bytes_after, &prop) == Success);
2237 2355
2238 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2357 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2360 &nitems, &bytes_after, &prop) == Success);
2243 2361
2244 if (!i || prop == NULL 2362 if (!i || prop == NULL
2245#if TINTING 2363#if TINTING
… …
2264 Window cr; 2382 Window cr;
2265 XImage *image; 2383 XImage *image;
2266 GC gc; 2384 GC gc;
2267 XGCValues gcvalue; 2385 XGCValues gcvalue;
2268 2386
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2391 nx = ny = 0;
2274 2392
… …
2286 sy = 0; 2404 sy = 0;
2287 } 2405 }
2288 2406
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2409
2410 XSync (disp, False);
2291 allowedxerror = -1; 2411 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2413
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2416 allowedxerror = 0;
2297 2417
… …
2300 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
2301 { 2421 {
2302 pchanged = 1; 2422 pchanged = 1;
2303 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
2304 { 2424 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
2306 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
2307 } 2427 }
2308 } 2428 }
2309 2429
2310 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
2311 } 2431 }
2312 else 2432 else
2313 { 2433 {
2314 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2316 2436
2317#if TINTING 2437#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2438 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2439 {
2320 unsigned short rm, gm, bm; 2440 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2441 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2442
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2443 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2444
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2445 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2446 }
2327#endif 2447#endif
2328 2448
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2330 szHint.width, szHint.height, image->depth); 2450 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2453 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2455 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2457 XClearWindow (disp, TermWin.parent[0]);
2338 2458
2339 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2460 pchanged = 1;
2341 2461
2342 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
2343 } 2463 }
2344 } 2464 }
2345 2465
2346 if (!am_pixmap_trans) 2466 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2468 else
2347 { 2469 {
2348 unsigned int n; 2470 unsigned int n;
2349 /* 2471 /*
2350 * InheritPixmap transparency 2472 * InheritPixmap transparency
2351 */ 2473 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 { 2475 {
2355 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2479 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2480
2361 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2362 { 2482 {
2363 if (oldp != None) 2483 if (oldp != None)
2364 pchanged = 1; 2484 pchanged = 1;
… …
2374 2494
2375 if (pchanged) 2495 if (pchanged)
2376 { 2496 {
2377 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2378 { 2498 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, 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) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2501 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break; 2503 break;
2385 } 2504 }
2386 } 2505 }
2387 } 2506 }
2388 2507
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 { 2509 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2512 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2396 } 2514 }
2397 else 2515 else
2398 { 2516 {
2399#if WAIT_FOR_WM 2517#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2518 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2519 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2520 sleep (1);
2403#endif 2521#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2406 { 2523 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2525 XClearWindow (disp, TermWin.parent[n]);
2409 } 2526 }
2410 2527
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2412 am_transparent = 1; 2529 am_transparent = 1;
2413 } 2530 }
2414 2531
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2533 TermWin.parent[i] = None;
2417 } 2534 }
2418 2535
2419 // this is experimental
2420 if (scrollBar.win) 2536 if (scrollBar.win)
2421 { 2537 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2539 scrollBar.setIdle ();
2425 scrollbar_show (0); 2540 scrollbar_show (0);
2541 }
2542
2543 if (am_transparent)
2544 {
2545 want_refresh = want_full_refresh = 1;
2546 if (am_pixmap_trans)
2547 flush ();
2426 } 2548 }
2427 2549
2428 return pchanged; 2550 return pchanged;
2429} 2551}
2430#endif 2552#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2571 if (ch == NOCHAR) // TODO: improve
2450 break; 2572 break;
2451 2573
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2575 {
2576 if (!seen_input)
2577 {
2578 seen_input = 1;
2579 // many badly-written programs (e.g. jed) contain a race condition:
2580 // they first read the screensize and then install a SIGWINCH handler.
2581 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized.
2586 if (seen_resize)
2587 kill (-cmd_pid, SIGWINCH);
2588 }
2589
2454 /* Read a text string from the input buffer */ 2590 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2591 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2592 bool refreshnow = false;
2457 int nlines = 0; 2593 int nlines = 0;
2458 unicode_t *str = buf; 2594 unicode_t *str = buf;
… …
2467 if (ch == C0_LF) 2603 if (ch == C0_LF)
2468 { 2604 {
2469 nlines++; 2605 nlines++;
2470 refresh_count++; 2606 refresh_count++;
2471 2607
2472 if (!(Options & Opt_jumpScroll) 2608 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2610 {
2475 refreshnow = true; 2611 refreshnow = true;
2476 ch = NOCHAR; 2612 ch = NOCHAR;
2477 break; 2613 break;
… …
2504 * the number of pages between refreshes is refresh_limit, which 2640 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2641 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2642 */
2507 if (refreshnow) 2643 if (refreshnow)
2508 { 2644 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2646 refresh_limit++;
2511 else 2647 else
2512 { 2648 {
2513 flag = true; 2649 flag = true;
2514 scr_refresh (refresh_type); 2650 scr_refresh (refresh_type);
… …
2568 if (len == (size_t)-1) 2704 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2706
2571 // assume wchar == unicode 2707 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2708 cmdbuf_ptr += len;
2573 return wc; 2709 return wc & UNICODE_MASK;
2574 } 2710 }
2575 2711
2576 return NOCHAR; 2712 return NOCHAR;
2577} 2713}
2578 2714
… …
2704 process_escape_seq (); 2840 process_escape_seq ();
2705 break; 2841 break;
2706 case C0_ENQ: /* terminal Status */ 2842 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2843 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2846 else
2711 tt_write ((unsigned char *)VT100_ANS, 2847 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2848 (unsigned int)strlen (VT100_ANS));
2713 break; 2849 break;
2714 case C0_BEL: /* bell */ 2850 case C0_BEL: /* bell */
2715 scr_bell (); 2851 scr_bell ();
2716 break; 2852 break;
2717 case C0_BS: /* backspace */ 2853 case C0_BS: /* backspace */
… …
2816void 2952void
2817rxvt_term::process_escape_seq () 2953rxvt_term::process_escape_seq ()
2818{ 2954{
2819 unicode_t ch = cmd_getc (); 2955 unicode_t ch = cmd_getc ();
2820 2956
2821 if (PrivateModes & PrivMode_vt52) 2957 if (priv_modes & PrivMode_vt52)
2822 { 2958 {
2823 process_escape_vt52 (ch); 2959 process_escape_vt52 (ch);
2824 return; 2960 return;
2825 } 2961 }
2826 2962
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2977 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2978 break;
2843 case '+': 2979 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2980 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2981 break;
2846#ifndef NO_FRILLS 2982#if ENABLE_FRILLS
2847 case '6': 2983 case '6':
2848 scr_backindex (); 2984 scr_backindex ();
2849 break; 2985 break;
2850#endif 2986#endif
2851 case '7': 2987 case '7':
2852 scr_cursor (SAVE); 2988 scr_cursor (SAVE);
2853 break; 2989 break;
2854 case '8': 2990 case '8':
2855 scr_cursor (RESTORE); 2991 scr_cursor (RESTORE);
2856 break; 2992 break;
2857#ifndef NO_FRILLS 2993#if ENABLE_FRILLS
2858 case '9': 2994 case '9':
2859 scr_forwardindex (); 2995 scr_forwardindex ();
2860 break; 2996 break;
2861#endif 2997#endif
2862 case '=': 2998 case '=':
… …
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
3162 break; 3298 break;
3163 3299
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3301 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3303 break;
3168 3304
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3306 process_sgr_mode (nargs, arg);
3171 break; 3307 break;
… …
3178 break; 3314 break;
3179 case 6: /* CPR requested */ 3315 case 6: /* CPR requested */
3180 scr_report_position (); 3316 scr_report_position ();
3181 break; 3317 break;
3182 case 7: /* unofficial extension */ 3318 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3319 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3320 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3321 break;
3186 case 8: /* unofficial extension */ 3322 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3324 break;
3189 } 3325 }
… …
3225 break; 3361 break;
3226 3362
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3363 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3364 if (arg[0] == 4)
3229 scr_insert_mode (0); 3365 scr_insert_mode (0);
3366 else if (arg[0] == 20)
3367 priv_modes &= ~PrivMode_LFNL;
3230 break; 3368 break;
3231 3369
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3370 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3371 if (arg[0] == 4)
3234 scr_insert_mode (1); 3372 scr_insert_mode (1);
3373 else if (arg[0] == 20)
3374 priv_modes |= PrivMode_LFNL;
3235 break; 3375 break;
3236 3376
3237 /* 3377 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3378 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3379 */
… …
3251 break; 3391 break;
3252 case CSI_75: 3392 case CSI_75:
3253 scr_cursor (RESTORE); 3393 scr_cursor (RESTORE);
3254 break; 3394 break;
3255 3395
3256#ifndef NO_FRILLS 3396#if ENABLE_FRILLS
3257 case CSI_74: 3397 case CSI_74:
3258 process_window_ops (arg, nargs); 3398 process_window_ops (arg, nargs);
3259 break; 3399 break;
3260#endif 3400#endif
3261 3401
… …
3268 break; 3408 break;
3269 } 3409 }
3270} 3410}
3271/*}}} */ 3411/*}}} */
3272 3412
3273#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
3274/* ARGSUSED */ 3414/* ARGSUSED */
3275void 3415void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3417{
3278 int x, y; 3418 int x, y;
3279 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
3280 Window wdummy; 3420 Window wdummy;
3421 dDisp;
3281 3422
3282 if (nargs == 0) 3423 if (nargs == 0)
3283 return; 3424 return;
3284 3425
3285 switch (args[0]) 3426 switch (args[0])
3286 { 3427 {
3287 /* 3428 /*
3288 * commands 3429 * commands
3289 */ 3430 */
3290 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
3292 break; 3433 break;
3293 case 2: /* iconify window */ 3434 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3436 break;
3297 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3299 break; 3439 break;
3300 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3442 break;
3303 case 5: /* raise window */ 3443 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
3305 break; 3445 break;
3306 case 6: /* lower window */ 3446 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
3308 break; 3448 break;
3309 case 7: /* refresh window */ 3449 case 7: /* refresh window */
3310 scr_touch (true); 3450 scr_touch (true);
3311 break; 3451 break;
3312 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
… …
3324 3464
3325 /* 3465 /*
3326 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
3327 */ 3467 */
3328 case 11: /* report window state */ 3468 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3471 break;
3332 case 13: /* report window position */ 3472 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3478 break;
3339 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3482 break;
3343 case 18: /* report text area size (chars) */ 3483 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3345 break; 3485 break;
… …
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3348 break; 3488 break;
3349 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3350 { 3490 {
3351 char *s; 3491 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3494 XFree (s);
3355 } 3495 }
3356 break; 3496 break;
3357 case 21: /* report window title */ 3497 case 21: /* report window title */
3358 { 3498 {
3359 char *s; 3499 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3502 XFree (s);
3363 } 3503 }
3364 break; 3504 break;
3365 } 3505 }
3366} 3506}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3512 * ends_how is terminator used. returned input must be free()'d
3373 */ 3513 */
3374unsigned char * 3514unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3515rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3516{
3377 unicode_t prev = 0, ch; 3517 unicode_t ch;
3518 bool seen_esc = false;
3378 unsigned int n = 0; 3519 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3520 wchar_t string[STRING_MAX];
3381 3521
3382 while ((ch = cmd_getc ()) != NOCHAR) 3522 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3523 {
3384 if (prev == C0_ESC) 3524 if (seen_esc)
3385 { 3525 {
3386 if (ch == 0x5c) /* 7bit ST */ 3526 if (ch == 0x5c) /* 7bit ST */
3387 break; 3527 break;
3388 else 3528 else
3389 return NULL; 3529 return NULL;
3390 } 3530 }
3531 else if (ch == C0_ESC)
3532 {
3533 seen_esc = true;
3534 continue;
3535 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3536 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3537 break;
3393 else if (ch < 0x20) 3538 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3539 return NULL; /* other control character - exit */
3540
3541 seen_esc = false;
3395 3542
3396 if (n >= sizeof (string) - 1) 3543 if (n >= sizeof (string) - 1)
3397 // stop at some sane length 3544 // stop at some sane length
3398 return NULL; 3545 return NULL;
3399 3546
3400 if (ch == C0_SYN) 3547 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3548 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3549 else
3406 string[n++] = prev = ch; 3550 string[n++] = ch;
3407 } 3551 }
3408 3552
3409 string[n++] = '\0'; 3553 string[n++] = '\0';
3410 3554
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3555 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3556
3416 return s; 3557 return (unsigned char *)rxvt_wcstombs (string);
3417} 3558}
3418 3559
3419/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
3420/* 3561/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3562 * 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) 3607rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3608{
3468 if (str[0] == '?' && !str[1]) 3609 if (str[0] == '?' && !str[1])
3469 { 3610 {
3470 unsigned short r, g, b; 3611 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3612 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3613 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3614 }
3474 else 3615 else
3475 set_window_color (color, str); 3616 set_window_color (color, str);
3476} 3617}
… …
3505{ 3646{
3506 int changed = 0; 3647 int changed = 0;
3507 int color; 3648 int color;
3508 char *buf, *name; 3649 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3650 bool query = str[0] == '?' && !str[1];
3651 int saveop = op;
3652 dDisp;
3510 3653
3511 assert (str != NULL); 3654 assert (str != NULL);
3512 switch (op) 3655 switch (op)
3513 { 3656 {
3514 case XTerm_name: 3657 case XTerm_name:
… …
3521 set_title (str); 3664 set_title (str);
3522 break; 3665 break;
3523 case XTerm_property: 3666 case XTerm_property:
3524 if (str[0] == '?') 3667 if (str[0] == '?')
3525 { 3668 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3669 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3670 Atom actual_type;
3528 int actual_format; 3671 int actual_format;
3529 unsigned long nitems; 3672 unsigned long nitems;
3530 unsigned long bytes_after; 3673 unsigned long bytes_after;
3531 unsigned char *value = 0; 3674 unsigned char *value = 0;
3532 const char *str = ""; 3675 const char *str = "";
3533 3676
3534 if (prop 3677 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3678 && XGetWindowProperty (disp, TermWin.parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3679 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3680 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3681 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3682 && actual_type != None
3540 && actual_format == 8) 3683 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3692 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3693
3551 if (eq) 3694 if (eq)
3552 { 3695 {
3553 *eq = 0; 3696 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3697 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 } 3698 }
3559 else 3699 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3700 XDeleteProperty (disp, TermWin.parent[0],
3561 display->atom (str)); 3701 display->atom (str));
3562 } 3702 }
3563 break; 3703 break;
3564 3704
3565 case XTerm_Color: 3705 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3706 for (buf = (char *)str; buf && *buf;)
3567 { 3707 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3708 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3709 break;
3570 3710
3571 *name++ = '\0'; 3711 *name++ = '\0';
3572 color = atoi (buf); 3712 color = atoi (buf);
3573 3713
3574 if (color < 0 || color >= TOTAL_COLORS) 3714 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3715 break;
3576 3716
3577 if ((buf = STRCHR (name, ';')) != NULL) 3717 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3718 *buf++ = '\0';
3579 3719
3580 if (name[0] == '?' && !name[1]) 3720 if (name[0] == '?' && !name[1])
3581 { 3721 {
3582 unsigned short r, g, b; 3722 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3723 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); 3724 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3725 }
3586 else 3726 else
3587 set_window_color (color + minCOLOR, name); 3727 set_window_color (color + minCOLOR, name);
3588 } 3728 }
… …
3606 break; 3746 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3747#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD: 3748 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break; 3750 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3611 case XTerm_Color_UL: 3754 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3756 break;
3614 case XTerm_Color_RV: 3757 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break;
3760#endif
3761#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3764 check_our_parents ();
3765 if (am_transparent)
3766 want_full_refresh = want_refresh = 1;
3616 break; 3767 break;
3617#endif 3768#endif
3618 3769
3619 case XTerm_Pixmap: 3770 case XTerm_Pixmap:
3620 if (*str != ';') 3771 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3774 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3775 set_bgPixmap (str); /* change pixmap */
3625#endif 3776#endif
3626 scr_touch (true); 3777 scr_touch (true);
3627 } 3778 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3779 while ((str = strchr (str, ';')) != NULL)
3629 { 3780 {
3630 str++; 3781 str++;
3631#if XPM_BACKGROUND 3782#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3783 changed += scale_pixmap (str);
3633#endif 3784#endif
3634
3635 } 3785 }
3786
3636 if (changed) 3787 if (changed)
3637 { 3788 {
3638#ifdef XPM_BACKGROUND 3789#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3790 resize_pixmap ();
3640#endif 3791#endif
… …
3652 case XTerm_logfile: 3803 case XTerm_logfile:
3653 // TODO, when secure mode? 3804 // TODO, when secure mode?
3654 break; 3805 break;
3655 3806
3656 case XTerm_font: 3807 case XTerm_font:
3808 op = URxvt_font;
3809 case URxvt_font:
3810#if ENABLE_STYLES
3811 case URxvt_boldFont:
3812 case URxvt_italicFont:
3813 case URxvt_boldItalicFont:
3814#endif
3657 if (query) 3815 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3816 tt_printf ("\33]%d;%-.250s%c", saveop,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc 3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3660 ? TermWin.fontset->fontdesc : "", 3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3661 resp); 3819 resp);
3662 else 3820 else
3821 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823
3824 res = strdup (str);
3825 allocated.push_back ((void *)res);
3663 change_font (str); 3826 set_fonts ();
3827 }
3664 break; 3828 break;
3665 3829
3666#ifndef NO_FRILLS 3830#if ENABLE_FRILLS
3667 case XTerm_locale: 3831 case XTerm_locale:
3668 if (query) 3832 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); 3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3670 else 3834 else
3671 { 3835 {
3672 set_locale (str); 3836 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8);
3673# ifdef USE_XIM 3838# ifdef USE_XIM
3674 im_cb (); 3839 im_cb ();
3675# endif 3840# endif
3676 } 3841 }
3677 break; 3842 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 3843#endif
3689 3844
3690#ifdef MENUBAR 3845#ifdef MENUBAR
3691 case XTerm_Menu: 3846 case XTerm_Menu:
3692 if (Options & Opt_insecure) 3847 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3849 break;
3695#endif 3850#endif
3696#if 0 3851#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3852 case XTerm_dumpscreen: /* no error notices */
… …
3724{ 3879{
3725 int state; 3880 int state;
3726 3881
3727 if (mode == 's') 3882 if (mode == 's')
3728 { 3883 {
3729 SavedModes |= (PrivateModes & bit); 3884 SavedModes |= (priv_modes & bit);
3730 return -1; 3885 return -1;
3731 } 3886 }
3732 else 3887 else
3733 { 3888 {
3734 if (mode == 'r') 3889 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3890 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3891 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3892 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3893 PrivMode (state, bit);
3739 } 3894 }
3740 3895
3741 return state; 3896 return state;
3742} 3897}
… …
3760 { 3, PrivMode_132 }, 3915 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3916 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3917 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3918 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3919 { 7, PrivMode_Autowrap },
3920 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3921 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3922#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3923 { menuBar_esc, PrivMode_menuBar },
3768#endif 3924#endif
3925 // 18, 19 printing-related
3926 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3927#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3928 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3929#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3930 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3931 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3932 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3933 // 45 margin bell NYI
3779 // 46 start logging 3934 // 46 start logging
… …
3820 3975
3821 /* extra handling for values with state unkept */ 3976 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3977 switch (arg[i])
3823 { 3978 {
3824 case 1048: /* alternative cursor save */ 3979 case 1048: /* alternative cursor save */
3980 case 1049:
3825 if (Options & Opt_secondaryScreen) 3981 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 3982 if (mode == 0)
3827 scr_cursor (RESTORE); 3983 scr_cursor (RESTORE);
3828 else if (mode == 1) 3984 else if (mode == 1)
3829 scr_cursor (SAVE); 3985 scr_cursor (SAVE);
3830 break; 3986 break;
… …
3841 * within VT52 mode 3997 * within VT52 mode
3842 */ 3998 */
3843 PrivMode (1, PrivMode_vt52); 3999 PrivMode (1, PrivMode_vt52);
3844 break; 4000 break;
3845 case 3: /* 80/132 */ 4001 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4002 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3848 break; 4004 break;
3849 case 4: /* smooth scrolling */ 4005 case 4: /* smooth scrolling */
3850 if (state) 4006 if (state)
3851 Options &= ~Opt_jumpScroll; 4007 options &= ~Opt_jumpScroll;
3852 else 4008 else
3853 Options |= Opt_jumpScroll; 4009 options |= Opt_jumpScroll;
3854 break; 4010 break;
3855 case 5: /* reverse video */ 4011 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4012 scr_rvideo_mode (state);
3857 break; 4013 break;
3858 case 6: /* relative/absolute origins */ 4014 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4018 scr_autowrap (state);
3863 break; 4019 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4020 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4021 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4022 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4023 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4024 break;
3869#ifdef menuBar_esc 4025#ifdef menuBar_esc
3870 case menuBar_esc: 4026 case menuBar_esc:
3871#ifdef MENUBAR 4027#ifdef MENUBAR
3872 map_menuBar (state); 4028 map_menuBar (state);
… …
3892 break; 4048 break;
3893 /* case 66: - application key pad */ 4049 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4050 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4051 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4052 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4053 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4054 break;
3899#if 0 4055#if 0
3900 case 1001: 4056 case 1001:
3901 break; /* X11 mouse highlighting */ 4057 break; /* X11 mouse highlighting */
3902#endif 4058#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4059 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4060 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4061 options &= ~Opt_scrollTtyOutput;
3906 else 4062 else
3907 Options |= Opt_scrollTtyOutput; 4063 options |= Opt_scrollTtyOutput;
3908 break; 4064 break;
3909 case 1011: /* scroll to bottom on key press */ 4065 case 1011: /* scroll to bottom on key press */
3910 if (state) 4066 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4067 options |= Opt_scrollTtyKeypress;
3912 else 4068 else
3913 Options &= ~Opt_scrollTtyKeypress; 4069 options &= ~Opt_scrollTtyKeypress;
3914 break; 4070 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4071 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4072 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4073 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4074 scr_erase_screen (2);
3919 scr_change_screen (state); 4075 scr_change_screen (state);
3920 break; 4076 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4077 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4078 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4079 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4080 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4081 scr_erase_screen (2);
3926 break; 4082 break;
3927 default: 4083 default:
3928 break; 4084 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4110 rendset = 0, rendstyle = ~RS_None;
3955 break; 4111 break;
3956 case 1: 4112 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4113 rendset = 1, rendstyle = RS_Bold;
3958 break; 4114 break;
3959 //case 2: // faint or second colour 4115 //case 2: // low intensity
4116 case 3:
4117 rendset = 1, rendstyle = RS_Italic;
4118 break;
3960 case 4: 4119 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4120 rendset = 1, rendstyle = RS_Uline;
3962 break; 4121 break;
3963 case 5: // slowly blinking 4122 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4123 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4135 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4136 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4137 //...
3979 //case 19: // ninth alt font 4138 //case 19: // ninth alt font
3980 //case 20: // gothic 4139 //case 20: // gothic
3981 case 21: // disable bold, faint 4140 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4141 rendset = 0, rendstyle = RS_Bold;
3983 break; 4142 break;
3984 case 22: 4143 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4144 rendset = 0, rendstyle = RS_Bold;
3986 break; 4145 break;
3987 //case 23: disable italic 4146 case 23: // disable italic
4147 rendset = 0, rendstyle = RS_Italic;
4148 break;
3988 case 24: 4149 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4150 rendset = 0, rendstyle = RS_Uline;
3990 break; 4151 break;
3991 case 25: 4152 case 25:
4153 rendset = 0, rendstyle = RS_Blink;
4154 break;
4155 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4156 rendset = 0, rendstyle = RS_Blink;
3993 break; 4157 break;
3994 case 27: 4158 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4159 rendset = 0, rendstyle = RS_RVid;
3996 break; 4160 break;
… …
4014 case 35: 4178 case 35:
4015 case 36: 4179 case 36:
4016 case 37: 4180 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4181 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4182 break;
4019#ifdef TTY_256COLOR 4183 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4184 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4185 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4186 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4187 i += 2;
4025 } 4188 }
4026 break; 4189 break;
4027#endif
4028 case 39: /* default fg */ 4190 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4191 scr_color (Color_fg, Color_fg);
4030 break; 4192 break;
4031 4193
4032 case 40: 4194 case 40:
… …
4037 case 45: 4199 case 45:
4038 case 46: 4200 case 46:
4039 case 47: 4201 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4203 break;
4042#ifdef TTY_256COLOR 4204 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4206 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4208 i += 2;
4048 } 4209 }
4049 break; 4210 break;
4050#endif
4051 case 49: /* default bg */ 4211 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4212 scr_color (Color_bg, Color_bg);
4053 break; 4213 break;
4214
4215 //case 50: // not variable spacing
4054 4216
4055#ifndef NO_BRIGHTCOLOR 4217#ifndef NO_BRIGHTCOLOR
4056 case 90: 4218 case 90:
4057 case 91: /* set bright fg color */ 4219 case 91: /* set bright fg color */
4058 case 92: 4220 case 92:
4059 case 93: 4221 case 93:
4060 case 94: 4222 case 94:
4061 case 95: 4223 case 95:
4062 case 96: 4224 case 96:
4063 case 97: 4225 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4226 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4227 break;
4067 case 100: 4228 case 100:
4068 case 101: /* set bright bg color */ 4229 case 101: /* set bright bg color */
4069 case 102: 4230 case 102:
4070 case 103: 4231 case 103:
4071 case 104: 4232 case 104:
4072 case 105: 4233 case 105:
4073 case 106: 4234 case 106:
4074 case 107: 4235 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4237 break;
4078#endif 4238#endif
4079 4239
4080 } 4240 }
4081 } 4241 }
… …
4088{ 4248{
4089 unicode_t ch, cmd = cmd_getc (); 4249 unicode_t ch, cmd = cmd_getc ();
4090 4250
4091 if (cmd == 'Q') 4251 if (cmd == 'Q')
4092 { /* query graphics */ 4252 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4253 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4254 return;
4095 } 4255 }
4096 /* swallow other graphics sequences until terminating ':' */ 4256 /* swallow other graphics sequences until terminating ':' */
4097 do 4257 do
4098 ch = cmd_getc (); 4258 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4273 unsigned char buf[256];
4114 4274
4115 va_start (arg_ptr, fmt); 4275 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4276 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4277 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4278 tt_write (buf, strlen (buf));
4119} 4279}
4120 4280
4121/* ---------------------------------------------------------------------- */ 4281/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4282/* 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. 4283 * or generated by us in response to a query ESC sequence.
4124 */ 4284 */
4285const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4286
4125void 4287void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4289{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 if (v_buflen == 0)
4291 {
4292 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4129 4293
4130 if (len) 4294 if ((unsigned int)written == len)
4295 return;
4296
4297 data += written;
4298 len -= written;
4131 { 4299 }
4300
4301 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4302
4303 memcpy (v_buffer + v_buflen, data, len);
4304 v_buflen += len;
4305
4306 pty_ev.set (EVENT_READ | EVENT_WRITE);
4307}
4308
4309void rxvt_term::pty_write ()
4310{
4311 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4312
4313 if (written > 0)
4314 {
4315 v_buflen -= written;
4316
4132 if (v_buflen == 0) 4317 if (v_buflen == 0)
4133 { 4318 {
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); 4319 free (v_buffer);
4161 v_buffer = 0; 4320 v_buffer = 0;
4162 v_buflen = 0; 4321 v_buflen = 0;
4163 4322
4164 pty_ev.set (EVENT_READ); 4323 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; 4324 return;
4177 } 4325 }
4326
4327 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4328 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this...
4331 destroy ();
4179} 4332}
4180 4333
4181/*----------------------- end-of-file (C source) -----------------------*/ 4334/*----------------------- end-of-file (C source) -----------------------*/
4182 4335

Diff Legend

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