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

Diff Legend

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