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.199 by root, Sun Feb 20 02:00:43 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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,
… …
110 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
111 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
112 XK_Print, 0x2399, 119 XK_Print, 0x2399,
113 120
114 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
115 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
116 0, 131 0,
117}; 132};
118 133
119void 134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= TermWin.ncol
141 || y < 0 || y >= TermWin.nrow)
142 return;
143
144 for (;;)
145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54;
153 break;
154 }
155
156 x--;
157 }
158
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2;
169 int len;
170
171#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch))
173 {
174 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr);
177 }
178 else
179#endif
180 {
181 ch2 = ch;
182
183 alloc = 0;
184 chr = &ch2;
185 len = 1;
186 }
187
188 int width = strlen (f->name);
189
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193
194 for (int y = 0; y < len; y++)
195 {
196 char buf[9];
197
198 ch = *chr++;
199
200 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '=');
203#if !UNICODE3
204 if (ch >= 0x10000)
205 ch = 0xfffd;
206#endif
207 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r);
209 }
210
211 scr_overlay_set (0, len, f->name);
212
213#if ENABLE_COMBINING
214 if (alloc)
215 delete [] alloc;
216#endif
217}
218#endif
219
220void
120rxvt_term::commit_iso14755 () 221rxvt_term::commit_iso14755 ()
121{ 222{
122 wchar_t ch[2]; 223 wchar_t ch[2];
123 224
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 225 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 226 ch[1] = 0;
126 227
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 228 if (iso14755buf & ISO_14755_51)
128 { 229 {
129 char mb[16]; 230 char mb[16];
130 int len; 231 int len;
131 232
132 // allow verbatim 0-bytes and control-bytes to be entered 233 // allow verbatim 0-bytes and control-bytes to be entered
… …
183 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
184 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
185 * 286 *
186 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
187 */ 288 */
188 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
189 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
190 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
191 292
192 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
193 { 294 {
194 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
195 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
254 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
255 } 356 }
256 357
257 if (valid_keysym) 358 if (valid_keysym)
258 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
259 if (TermWin.saveLines) 365 if (TermWin.saveLines)
260 { 366 {
261#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
262 if (!ctrl && !meta) 368 if (!ctrl && !meta)
263#else 369#else
… …
320 if (keysym >= XK_F1 && keysym <= XK_F10) 426 if (keysym >= XK_F1 && keysym <= XK_F10)
321 { 427 {
322 keysym += (XK_F11 - XK_F1); 428 keysym += (XK_F11 - XK_F1);
323 shft = 0; /* turn off Shift */ 429 shft = 0; /* turn off Shift */
324 } 430 }
325 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 431 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
326 { 432 {
327 switch (keysym) 433 switch (keysym)
328 { 434 {
329 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
330 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
331 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
332 return; 438 return;
333#if TODO // TODO 439#if TODO
334 /* rxvt extras */ 440 /* rxvt extras */
335 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
336 change_font (FONT_UP); 442 change_font (FONT_UP);
337 return; 443 return;
338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
341#endif 447#endif
342 } 448 }
343 } 449 }
344 } 450 }
345 451
346#ifndef NO_FRILLS 452#if ENABLE_FRILLS || ISO_14755
347 // ISO 14755 support 453 // ISO 14755 support
348 if (shft && ctrl) 454 if (shft && ctrl)
349 { 455 {
350 int hv; 456 int hv;
351 457
458 if (iso14755buf & ISO_14755_51
352 if (keysym == XK_space || keysym == XK_KP_Space 459 && (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter) 460 || keysym == XK_Return || keysym == XK_KP_Enter))
354 { 461 {
355 commit_iso14755 (); 462 commit_iso14755 ();
463 iso14755buf = ISO_14755_51;
464# if ISO_14755
465 iso14755_51 (0);
466# endif
356 return; 467 return;
357 } 468 }
358 else if ((hv = hex_keyval (ev)) >= 0) 469 else if ((hv = hex_keyval (ev)) >= 0)
359 { 470 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 471 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
472 | hv | ISO_14755_51;
473# if ISO_14755
474 iso14755_51 (iso14755buf & ISO_14755_MASK);
475# endif
361 return; 476 return;
362 } 477 }
363 else 478 else
479 {
480# if ENABLE_OVERLAY
481 scr_overlay_off ();
482# endif
364 iso14755buf = 0; 483 iso14755buf = 0;
484 }
365 } 485 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 486 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 487 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
488 if (!(iso14755buf & ISO_14755_STARTED))
489 {
368 iso14755buf |= ISO_14755_ACTIVE; 490 iso14755buf |= ISO_14755_STARTED;
491# if ENABLE_OVERLAY
492 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
493 scr_overlay_set (0, 0, "ISO 14755 mode");
494# endif
495 }
369#endif 496#endif
370 497
371#ifdef PRINTPIPE 498#ifdef PRINTPIPE
372 if (keysym == XK_Print) 499 if (keysym == XK_Print)
373 { 500 {
… …
376 } 503 }
377#endif 504#endif
378 505
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 506 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 507 {
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 { 508 {
407 newlen = 1; 509 newlen = 1;
408 switch (keysym) 510 switch (keysym)
409 { 511 {
410#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 513 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 514 if (priv_modes & PrivMode_HaveBackSpace)
413 { 515 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 517 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 518 kbuf[1] = '\0';
417 } 519 }
418 else 520 else
419 STRCPY (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
420 break; 522 break;
421#endif 523#endif
422#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
423 case XK_Delete: 535 case XK_Delete:
424 STRCPY (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
425 break; 537 break;
426#endif 538#endif
427 case XK_Tab: 539 case XK_Tab:
428 if (shft) 540 if (shft)
429 STRCPY (kbuf, "\033[Z"); 541 strcpy (kbuf, "\033[Z");
430 else 542 else
431 { 543 {
432#ifdef CTRL_TAB_MAKES_META 544#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 545 if (ctrl)
434 meta = 1; 546 meta = 1;
… …
444#ifdef XK_KP_Left 556#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 557 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 558 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 559 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 560 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 562 {
451 STRCPY (kbuf, "\033OZ"); 563 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 564 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 565 break;
454 } 566 }
455 else 567 else
456 /* translate to std. cursor key */ 568 /* translate to std. cursor key */
… …
459#endif 571#endif
460 case XK_Up: /* "\033[A" */ 572 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 573 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 574 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 575 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 576 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 577 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 578 /* do Shift first */
467 if (shft) 579 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 580 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 581 else if (ctrl)
470 { 582 {
471 kbuf[1] = 'O'; 583 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 584 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 585 }
474 else if (PrivateModes & PrivMode_aplCUR) 586 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 587 kbuf[1] = 'O';
476 break; 588 break;
477 589
478#ifndef UNSHIFTED_SCROLLKEYS 590#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 591# ifdef XK_KP_Prior
480 case XK_KP_Prior: 592 case XK_KP_Prior:
481 /* allow shift to override */ 593 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 595 {
484 STRCPY (kbuf, "\033Oy"); 596 strcpy (kbuf, "\033Oy");
485 break; 597 break;
486 } 598 }
487 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
488# endif 600# endif
489 case XK_Prior: 601 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 602 strcpy (kbuf, "\033[5~");
491 break; 603 break;
492# ifdef XK_KP_Next 604# ifdef XK_KP_Next
493 case XK_KP_Next: 605 case XK_KP_Next:
494 /* allow shift to override */ 606 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 608 {
497 STRCPY (kbuf, "\033Os"); 609 strcpy (kbuf, "\033Os");
498 break; 610 break;
499 } 611 }
500 /* FALLTHROUGH */ 612 /* FALLTHROUGH */
501# endif 613# endif
502 case XK_Next: 614 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 615 strcpy (kbuf, "\033[6~");
504 break; 616 break;
505#endif 617#endif
506 case XK_KP_Enter: 618 case XK_KP_Enter:
507 /* allow shift to override */ 619 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 621 {
510 STRCPY (kbuf, "\033OM"); 622 strcpy (kbuf, "\033OM");
623 break;
624 }
625
626 /* FALLTHROUGH */
627
628 case XK_Return:
629 if (priv_modes & PrivMode_LFNL)
630 {
631 kbuf[0] = '\015';
632 kbuf[1] = '\012';
633 kbuf[2] = '\0';
511 } 634 }
512 else 635 else
513 { 636 {
514 kbuf[0] = '\r'; 637 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 638 kbuf[1] = '\0';
516 } 639 }
517 break; 640 break;
518 641
519#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
520 case XK_KP_Begin: 643 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
522 break; 645 break;
523 646
524 case XK_KP_Insert:
525 STRCPY (kbuf, "\033Op");
526 break;
527
528 case XK_KP_Delete:
529 STRCPY (kbuf, "\033On");
530 break;
531#endif 647#endif
532 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 652 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 653 kbuf[2] += (keysym - XK_KP_F1);
538 break; 654 break;
539 655
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 656 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 657 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 668 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 669 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 670 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 671 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 672 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 673 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 674 {
559 STRCPY (kbuf, "\033Oj"); 675 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 676 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 677 }
562 else 678 else
563 { 679 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 680 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
566 } 682 }
567 break; 683 break;
568 684
569 case XK_Find: 685 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
571 break; 687 break;
688
689#ifdef XK_KP_End
690 case XK_KP_Insert:
691 /* allow shift to override */
692 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
693 {
694 strcpy (kbuf, "\033Op");
695 break;
696 }
697 /* FALLTHROUGH */
698#endif
572 case XK_Insert: 699 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
574 break; 701 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 703 case DXK_Remove:
577 /* FALLTHROUGH */ 704 /* FALLTHROUGH */
578#endif 705#endif
579 case XK_Execute: 706 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 707 strcpy (kbuf, "\033[3~");
581 break; 708 break;
582 case XK_Select: 709 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 710 strcpy (kbuf, "\033[4~");
584 break; 711 break;
585#ifdef XK_KP_End 712#ifdef XK_KP_End
586 case XK_KP_End: 713 case XK_KP_End:
587 /* allow shift to override */ 714 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 715 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 716 {
590 STRCPY (kbuf, "\033Oq"); 717 strcpy (kbuf, "\033Oq");
591 break; 718 break;
592 } 719 }
593 /* FALLTHROUGH */ 720 /* FALLTHROUGH */
594#endif 721#endif
595 case XK_End: 722 case XK_End:
596 STRCPY (kbuf, KS_END); 723 strcpy (kbuf, KS_END);
597 break; 724 break;
598#ifdef XK_KP_Home 725#ifdef XK_KP_Home
599 case XK_KP_Home: 726 case XK_KP_Home:
600 /* allow shift to override */ 727 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 729 {
603 STRCPY (kbuf, "\033Ow"); 730 strcpy (kbuf, "\033Ow");
604 break; 731 break;
605 } 732 }
606 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
607#endif 734#endif
608 case XK_Home: 735 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 736 strcpy (kbuf, KS_HOME);
610 break; 737 break;
611 738
612#define FKEY(n, fkey) \ 739#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 740 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 741
… …
666#undef FKEY 793#undef FKEY
667 default: 794 default:
668 newlen = 0; 795 newlen = 0;
669 break; 796 break;
670 } 797 }
798
671 if (newlen) 799 if (newlen)
672 len = STRLEN (kbuf); 800 len = strlen (kbuf);
673 } 801 }
674 802
675 /* 803 /*
676 * Pass meta for all function keys, if 'meta' option set 804 * Pass meta for all function keys, if 'meta' option set
677 */ 805 */
… …
684 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
685 { 813 {
686 len = 1; 814 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
821 }
689 else 822 else
690 { 823 {
691#ifdef META8_OPTION 824#ifdef META8_OPTION
692 /* set 8-bit on */ 825 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 826 if (meta && (meta_char == 0x80))
… …
705 } 838 }
706 839
707 if (len <= 0) 840 if (len <= 0)
708 return; /* not mapped */ 841 return; /* not mapped */
709 842
710 if (Options & Opt_scrollTtyKeypress) 843 if (options & Opt_scrollTtyKeypress)
711 if (TermWin.view_start) 844 if (TermWin.view_start)
712 { 845 {
713 TermWin.view_start = 0; 846 TermWin.view_start = 0;
714 want_refresh = 1; 847 want_refresh = 1;
715 } 848 }
… …
751#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
752 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
753} 886}
754/*}}} */ 887/*}}} */
755 888
756#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
758/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
759unsigned int 892unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
761{ 894{
… …
764 n = cmdbuf_ptr - cmdbuf_base; 897 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 899
767 if (n > 0 && s < count) 900 if (n > 0 && s < count)
768 { 901 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 902 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 904 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 905 cmdbuf_endp -= n;
773 s += n; 906 s += n;
774 } 907 }
… …
784 917
785 cmd_parse (); 918 cmd_parse ();
786 919
787 return 0; 920 return 0;
788} 921}
789#endif /* MENUBAR_MAX */ 922#endif
790 923
791void 924void
792rxvt_term::flush () 925rxvt_term::flush ()
793{ 926{
927 flush_ev.stop ();
928
794#ifdef TRANSPARENT 929#ifdef TRANSPARENT
795 if (want_full_refresh) 930 if (want_full_refresh)
796 { 931 {
797 want_full_refresh = 0; 932 want_full_refresh = 0;
798 scr_clear (); 933 scr_clear ();
… …
808 IMSendSpot (); 943 IMSendSpot ();
809#endif 944#endif
810 } 945 }
811 946
812 display->flush (); 947 display->flush ();
813
814 flush_ev.stop ();
815} 948}
816 949
817void 950void
818rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
819{ 952{
… …
895{ 1028{
896 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
900 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1; 1038 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1040 }
904} 1041}
… …
917 1054
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
921 1058
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1060
924 if (n > 0) 1061 if (n > 0)
925 { 1062 {
926 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
927 return true; 1064 return true;
… …
936rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1074{
938 SET_R (this); 1075 SET_R (this);
939 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
940 1077
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1080 while (pty_fill ())
946 if (cmd_parse ()) 1081 if (cmd_parse ())
947 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
948} 1086}
949 1087
950void 1088void
951rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
952{ 1090{
… …
954 recolour_cursor (); 1092 recolour_cursor ();
955 1093
956#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1095 hidden_pointer = 0;
958 1096
959 if (Options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
960 pointer_ev.start (NOW + pointerBlankDelay); 1098 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1099#endif
962} 1100}
963 1101
964#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
965void 1103void
966rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
967{ 1105{
968 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
969 return; 1107 return;
970 1108
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
972 XFlush (display->display); 1110 XFlush (display->display);
973 1111
974 hidden_pointer = 1; 1112 hidden_pointer = 1;
975} 1113}
976 1114
… …
993 x = ev.x; 1131 x = ev.x;
994 y = ev.y; 1132 y = ev.y;
995 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
996 1134
997 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1136 button_number = 3;
1000 }
1001 else 1137 else
1002 { 1138 {
1003 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1141 if (button_number >= 3)
1006 button_number += (64 - 3); 1142 button_number += (64 - 3);
1007 } 1143 }
1008 1144
1009 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
1010 { 1146 {
1011 /* 1147 /*
1012 * do not report ButtonRelease 1148 * do not report ButtonRelease
1013 * no state info allowed 1149 * no state info allowed
1014 */ 1150 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1169#endif
1034
1035 } 1170 }
1036 1171
1037#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1174 if (key_state & 16)
1040 fputc ('C', stderr); 1175 fputc ('C', stderr);
1041 if (key_state & 4) 1176 if (key_state & 4)
1042 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1181 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1183 button_number,
1049 x + 1, 1184 x + 1,
1050 y + 1); 1185 y + 1);
1051#else 1186#endif
1187
1052 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
1054 (32 + x + 1), 1190 (32 + x + 1),
1055 (32 + y + 1)); 1191 (32 + y + 1));
1056#endif
1057} 1192}
1058 1193
1059#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
1060void 1195void
1061rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
1068 1203
1069/*{{{ process an X event */ 1204/*{{{ process an X event */
1070void 1205void
1071rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
1072{ 1207{
1208 dDisp;
1209
1073 SET_R (this); 1210 SET_R (this);
1074 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
1075 1212
1076#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1215 {
1079 if (hidden_cursor) 1216 if (hidden_cursor)
1080 { 1217 {
1081 hidden_cursor = 0; 1218 hidden_cursor = 0;
1082 want_refresh = 1; 1219 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1223 }
1087#endif 1224#endif
1088 1225
1089#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1228 {
1092 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1232 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1236 pointer_blank ();
1100 } 1237 }
1101#endif 1238#endif
1102 1239
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1242 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 1243
1161 switch (ev.type) 1244 switch (ev.type)
1162 { 1245 {
1163 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1165 lookup_key (ev.xkey); 1250 lookup_key (ev.xkey);
1166 1251
1167 break; 1252 break;
1168 1253
1169 case KeyRelease: 1254 case KeyRelease:
1170 { 1255 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1257 KeySym ks;
1173 1258
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1260#endif
1176 1261
1177#ifndef NO_FRILLS 1262#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1263 // ISO 14755 support
1179 if (iso14755buf) 1264 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1265 if (iso14755buf & ISO_14755_52)
1181 { 1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1271 // iso14755 part 5.2 handling: release time
1183 // first: controls 1272 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1273 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1274 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1275 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1276 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1278 commit_iso14755 ();
1190 return; // case-break; 1279 return; // case-break;
1191 } 1280 }
1192 1281
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1283 if (i[0] == ks)
1195 { 1284 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1285 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1286 commit_iso14755 ();
1198 return; // case-break; 1287 return; // case-break;
1199 } 1288 }
1200 1289
1290 scr_bell ();
1291# endif
1201 iso14755buf = 0; 1292 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1293 break;
1204 } 1294 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1300 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1301 commit_iso14755 ();
1302#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1211 } 1313 }
1212#endif 1314#endif
1213 1315
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
… …
1228 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1229 break; 1331 break;
1230 1332
1231 case ClientMessage: 1333 case ClientMessage:
1232 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1235#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1241 { 1354 {
1242 /* Get Dnd data */ 1355 /* Get Dnd data */
1243 Atom ActualType; 1356 Atom ActualType;
1244 int ActualFormat; 1357 int ActualFormat;
1245 unsigned char *data; 1358 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1247 1360
1248 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1363 0L, 1000000L,
1251 False, AnyPropertyType, 1364 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1254 &data); 1367 &data);
1255 XChangeProperty (display->display, display->root, 1368 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1369 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1372 }
1263#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1264 break; 1374 break;
1265 1375
1266 case MappingNotify: 1376 case MappingNotify:
… …
1291 break; 1401 break;
1292 } 1402 }
1293 break; 1403 break;
1294 1404
1295 case FocusIn: 1405 case FocusIn:
1296 if (!TermWin.focus) 1406 focus_in ();
1297 {
1298 TermWin.focus = 1;
1299 want_refresh = 1;
1300#ifdef USE_XIM
1301 if (Input_Context != NULL)
1302 XSetICFocus (Input_Context);
1303#endif
1304#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 {
1311 PixColors = PixColorsFocused;
1312 set_colorfgbg ();
1313 scr_clear ();
1314 scr_touch (true);
1315 }
1316#endif
1317
1318 }
1319 break; 1407 break;
1320 1408
1321 case FocusOut: 1409 case FocusOut:
1322 if (TermWin.focus) 1410 focus_out ();
1323 {
1324 TermWin.focus = 0;
1325 want_refresh = 1;
1326#ifdef USE_XIM
1327 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context);
1329#endif
1330#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink)
1332 cursor_blink_ev.stop ();
1333 hidden_cursor = 0;
1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1344
1345 }
1346 break; 1411 break;
1347 1412
1348 case ConfigureNotify: 1413 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1350 { 1415 {
… …
1354 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 } 1423 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1360 1425
1361 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1427 {
1428 seen_resize = 1;
1362 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
1430 }
1363 1431
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1433 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1434 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1435#endif
1372 } 1436 }
1373 break; 1437 break;
1374 1438
1375 case PropertyNotify: 1439 case PropertyNotify:
… …
1383 selection_clear (); 1447 selection_clear ();
1384 break; 1448 break;
1385 1449
1386 case SelectionNotify: 1450 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1451 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1453 break;
1391 1454
1392 case SelectionRequest: 1455 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1456 selection_send (ev.xselectionrequest);
1394 break; 1457 break;
… …
1418 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1419 { 1482 {
1420 do 1483 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1424 1487
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1489
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1430 1493
1431 scr_refresh (refresh_type); 1494 scr_refresh (refresh_type);
1432 } 1495 }
1433 else 1496 else
1434 { 1497 {
1435 XEvent unused_event; 1498 XEvent unused_event;
1436 1499
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1501 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1503 ;
1441 1504
1442 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1443 { 1506 {
1444 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
… …
1449 menubar_expose (); 1512 menubar_expose ();
1450#endif 1513#endif
1451 1514
1452#ifdef TRANSPARENT 1515#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1517 XClearWindow (disp, ev.xany.window);
1455#endif 1518#endif
1456 } 1519 }
1457 break; 1520 break;
1458 1521
1459 case MotionNotify: 1522 case MotionNotify:
… …
1466 { 1529 {
1467 menubar_control (ev.xbutton); 1530 menubar_control (ev.xbutton);
1468 break; 1531 break;
1469 } 1532 }
1470#endif 1533#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1535 break;
1473 1536
1474 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1475 { 1538 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1540 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1479 ; 1542 ;
1480 1543
1481 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1482 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1547 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1548 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1550 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1551 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1552 {
1490#endif 1553#endif
1554#if ISO_14755
1555 // 5.4
1556 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1557 {
1558 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1559 break;
1560 }
1561#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1562 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1563 ev.xbutton.state & Button3Mask ? 2 : 0);
1564
1493#ifdef SELECTION_SCROLLING 1565#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1566 if (ev.xbutton.y < TermWin.int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1496 { 1568 {
1497 int dist; 1569 int dist;
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1576
1505 /* save the event params so we can highlight 1577 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1578 * the selection in the pending-scroll loop
1507 */ 1579 */
1508 selection_save_x=ev.xbutton.x; 1580 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1581 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1583
1513 /* calc number of lines to scroll */ 1584 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1585 if (ev.xbutton.y < TermWin.int_bwidth)
1515 { 1586 {
1516 scroll_selection_dir = UP; 1587 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1588 dist = TermWin.int_bwidth - ev.xbutton.y;
1518 } 1589 }
1519 else 1590 else
1520 { 1591 {
1521 scroll_selection_dir = DN; 1592 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y -
1523 (TermWin.int_bwidth + TermWin.height); 1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1524 } 1594 }
1595
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1596 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1597 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1;
1527 MIN_IT (scroll_selection_lines, 1599 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1600 SELECTION_SCROLL_MAX_LINES);
1529 } 1601 }
1530 else 1602 else
1531 { 1603 {
1532 /* we are within the text window, so we 1604 /* we are within the text window, so we
1533 * shouldn't be scrolling 1605 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1607 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1608 sel_scroll_ev.stop();
1537 } 1609 }
1538#endif 1610#endif
1539#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1540
1541 } 1612 }
1542#endif 1613#endif
1543
1544 } 1614 }
1545 } 1615 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1617 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1619 MotionNotify, &ev))
1620 ;
1621
1550 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1625 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1626 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1628 scrollbar_size ());
1557 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1630 refresh_limit = 0;
… …
1560 } 1632 }
1561 break; 1633 break;
1562 } 1634 }
1563} 1635}
1564 1636
1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1565#if TRANSPARENT 1698#if TRANSPARENT
1566void 1699void
1567rxvt_term::rootwin_cb (XEvent &ev) 1700rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1701{
1569 SET_R (this); 1702 SET_R (this);
… …
1574 case PropertyNotify: 1707 case PropertyNotify:
1575 /* 1708 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1709 * 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. 1710 * use the property to determine the pixmap. We use it later on.
1578 */ 1711 */
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]) 1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1714 return;
1584 1715
1585 /* FALLTHROUGH */ 1716 /* FALLTHROUGH */
1586 case ReparentNotify: 1717 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1719 want_refresh = want_full_refresh = 1;
1589 break; 1720 break;
1590 } 1721 }
1591} 1722}
1592#endif 1723#endif
… …
1596{ 1727{
1597 int reportmode = 0, clickintime; 1728 int reportmode = 0, clickintime;
1598 1729
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1731 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1732 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733
1602 /* 1734 /*
1603 * VT window processing of button press 1735 * VT window processing of button press
1604 */ 1736 */
1605 if (ev.window == TermWin.vt) 1737 if (ev.window == TermWin.vt)
1606 { 1738 {
1739#if ISO_14755
1740 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 {
1743 iso14755_54 (ev.x, ev.y);
1744 return;
1745 }
1746#endif
1747
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1748 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1749
1608 if (reportmode) 1750 if (reportmode)
1609 { 1751 {
1610 /* mouse report from vt window */ 1752 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1753 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1754 MEvent.state = ev.state;
… …
1641 } 1783 }
1642 else 1784 else
1643 { 1785 {
1644 if (ev.button != MEvent.button) 1786 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1788
1646 switch (ev.button) 1789 switch (ev.button)
1647 { 1790 {
1648 case Button1: 1791 case Button1:
1792 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */
1794#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask);
1796#else
1797 selection.rect = false;
1798#endif
1799
1649 /* allow shift+left click to extend selection */ 1800 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1802 {
1652 if (MEvent.button == Button1 && clickintime) 1803 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1804 selection_rotate (ev.x, ev.y);
1654 else 1805 else
1655 selection_extend (ev.x, ev.y, 1); 1806 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1821 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1822 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1823 selection_rotate (ev.x, ev.y);
1673 else 1824 else
1674 selection_extend (ev.x, ev.y, 1); 1825 selection_extend (ev.x, ev.y, 1);
1826
1675 MEvent.button = Button3; 1827 MEvent.button = Button3;
1676 break; 1828 break;
1677 } 1829 }
1678 } 1830 }
1831
1679 MEvent.time = ev.time; 1832 MEvent.time = ev.time;
1680 return; 1833 return;
1681 } 1834 }
1682 1835
1683 /* 1836 /*
… …
1836{ 1989{
1837 int reportmode = 0; 1990 int reportmode = 0;
1838 1991
1839 csrO = 0; /* reset csr Offset */ 1992 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 1993 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1994 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 1995
1843 if (scrollbar_isUpDn ()) 1996 if (scrollbar_isUpDn ())
1844 { 1997 {
1845 scrollBar.setIdle (); 1998 scrollBar.setIdle ();
1846 scrollbar_show (0); 1999 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 2001 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 2002#endif
1850
1851 } 2003 }
2004
1852#ifdef SELECTION_SCROLLING 2005#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2006 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2007 sel_scroll_ev.stop();
1855#endif 2008#endif
2009
1856 if (ev.window == TermWin.vt) 2010 if (ev.window == TermWin.vt)
1857 { 2011 {
2012#if ISO_14755
2013 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return;
2016#endif
1858 if (reportmode) 2017 if (reportmode)
1859 { 2018 {
1860 /* mouse report from vt window */ 2019 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2020 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2021 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2035 MEvent.button = AnyButton;
1877 mouse_report (ev); 2036 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2037#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2038 return;
1880 } 2039 }
2040
1881 /* 2041 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2042 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2043 * when overriding mouse reporting
1884 */ 2044 */
1885 if (PrivateModes & PrivMode_mouse_report 2045 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2046 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2047 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2048 selection_extend (ev.x, ev.y, 0);
1889 2049
1890 switch (ev.button) 2050 switch (ev.button)
… …
1905 2065
1906 v = ev.button == Button4 ? UP : DN; 2066 v = ev.button == Button4 ? UP : DN;
1907 2067
1908 if (ev.state & ShiftMask) 2068 if (ev.state & ShiftMask)
1909 i = 1; 2069 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2070 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2071 i = TermWin.nrow - 1;
1912 else 2072 else
1913 i = 5; 2073 i = 5;
1914 2074
1915# ifdef MOUSE_SLIP_WHEELING 2075# ifdef MOUSE_SLIP_WHEELING
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2129 int i;
1970 2130
1971 Visual* visual = display->visual; 2131 Visual *visual = display->visual;
1972 2132
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2134
1975 /* for convenience */ 2135 /* for convenience */
1976 mask_r = visual->red_mask; 2136 mask_r = visual->red_mask;
… …
2197 Atom atype; 2357 Atom atype;
2198 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2359 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2202 2363
2203 pchanged = 0; 2364 pchanged = 0;
2204 2365
2205 if (!(Options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
2207 2368
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
2210 2371
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2212 2373
2213 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
2214 { 2375 {
2215 if (am_transparent) 2376 if (am_transparent)
2216 { 2377 {
2217 pchanged = 1; 2378 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
2220 } 2381 }
2221 2382
2222 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
2223 } 2384 }
2224 2385
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2387 XSync (disp, False);
2227 2388
2228 /* 2389 /*
2229 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
2232 */ 2393 */
2233 i = (xa[XA_XROOTPMAPID] 2394 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2397 &nitems, &bytes_after, &prop) == Success);
2237 2398
2238 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2400 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2243 2404
2244 if (!i || prop == NULL 2405 if (!i || prop == NULL
2245#if TINTING 2406#if TINTING
… …
2264 Window cr; 2425 Window cr;
2265 XImage *image; 2426 XImage *image;
2266 GC gc; 2427 GC gc;
2267 XGCValues gcvalue; 2428 XGCValues gcvalue;
2268 2429
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2434 nx = ny = 0;
2274 2435
… …
2286 sy = 0; 2447 sy = 0;
2287 } 2448 }
2288 2449
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2291 allowedxerror = -1; 2454 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2456
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2459 allowedxerror = 0;
2297 2460
… …
2300 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
2301 { 2464 {
2302 pchanged = 1; 2465 pchanged = 1;
2303 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
2304 { 2467 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
2306 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
2307 } 2470 }
2308 } 2471 }
2309 2472
2310 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
2311 } 2474 }
2312 else 2475 else
2313 { 2476 {
2314 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2316 2479
2317#if TINTING 2480#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2481 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2482 {
2320 unsigned short rm, gm, bm; 2483 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2485
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2487
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2488 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2489 }
2327#endif 2490#endif
2328 2491
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2330 szHint.width, szHint.height, image->depth); 2493 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2496 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2498 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2500 XClearWindow (disp, TermWin.parent[0]);
2338 2501
2339 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2503 pchanged = 1;
2341 2504
2342 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
2343 } 2506 }
2344 } 2507 }
2345 2508
2346 if (!am_pixmap_trans) 2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2347 { 2512 {
2348 unsigned int n; 2513 unsigned int n;
2349 /* 2514 /*
2350 * InheritPixmap transparency 2515 * InheritPixmap transparency
2351 */ 2516 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 { 2518 {
2355 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2522 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2523
2361 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
2362 { 2525 {
2363 if (oldp != None) 2526 if (oldp != None)
2364 pchanged = 1; 2527 pchanged = 1;
… …
2374 2537
2375 if (pchanged) 2538 if (pchanged)
2376 { 2539 {
2377 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
2378 { 2541 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 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) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2544 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break; 2546 break;
2385 } 2547 }
2386 } 2548 }
2387 } 2549 }
2388 2550
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 { 2552 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2555 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
2396 } 2557 }
2397 else 2558 else
2398 { 2559 {
2399#if WAIT_FOR_WM 2560#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2561 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2562 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2563 sleep (1);
2403#endif 2564#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2406 { 2566 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2568 XClearWindow (disp, TermWin.parent[n]);
2409 } 2569 }
2410 2570
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2412 am_transparent = 1; 2572 am_transparent = 1;
2413 } 2573 }
2414 2574
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
2417 } 2577 }
2418 2578
2419 // this is experimental
2420 if (scrollBar.win) 2579 if (scrollBar.win)
2421 { 2580 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2582 scrollBar.setIdle ();
2425 scrollbar_show (0); 2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2426 } 2591 }
2427 2592
2428 return pchanged; 2593 return pchanged;
2429} 2594}
2430#endif 2595#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2614 if (ch == NOCHAR) // TODO: improve
2450 break; 2615 break;
2451 2616
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2618 {
2619 if (!seen_input)
2620 {
2621 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs
2625 // then sometimes get the size wrong.
2626 // unfortunately other programs are even more buggy and dislike
2627 // being sent SIGWINCH, so only do it when we were in fact being
2628 // resized.
2629 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH);
2631 }
2632
2454 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2635 bool refreshnow = false;
2457 int nlines = 0; 2636 int nlines = 0;
2458 unicode_t *str = buf; 2637 unicode_t *str = buf;
… …
2467 if (ch == C0_LF) 2646 if (ch == C0_LF)
2468 { 2647 {
2469 nlines++; 2648 nlines++;
2470 refresh_count++; 2649 refresh_count++;
2471 2650
2472 if (!(Options & Opt_jumpScroll) 2651 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2653 {
2475 refreshnow = true; 2654 refreshnow = true;
2476 ch = NOCHAR; 2655 ch = NOCHAR;
2477 break; 2656 break;
… …
2504 * the number of pages between refreshes is refresh_limit, which 2683 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2684 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2685 */
2507 if (refreshnow) 2686 if (refreshnow)
2508 { 2687 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2689 refresh_limit++;
2511 else 2690 else
2512 { 2691 {
2513 flag = true; 2692 flag = true;
2514 scr_refresh (refresh_type); 2693 scr_refresh (refresh_type);
… …
2568 if (len == (size_t)-1) 2747 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2749
2571 // assume wchar == unicode 2750 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2751 cmdbuf_ptr += len;
2573 return wc; 2752 return wc & UNICODE_MASK;
2574 } 2753 }
2575 2754
2576 return NOCHAR; 2755 return NOCHAR;
2577} 2756}
2578 2757
… …
2704 process_escape_seq (); 2883 process_escape_seq ();
2705 break; 2884 break;
2706 case C0_ENQ: /* terminal Status */ 2885 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2886 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2889 else
2711 tt_write ((unsigned char *)VT100_ANS, 2890 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2891 (unsigned int)strlen (VT100_ANS));
2713 break; 2892 break;
2714 case C0_BEL: /* bell */ 2893 case C0_BEL: /* bell */
2715 scr_bell (); 2894 scr_bell ();
2716 break; 2895 break;
2717 case C0_BS: /* backspace */ 2896 case C0_BS: /* backspace */
… …
2816void 2995void
2817rxvt_term::process_escape_seq () 2996rxvt_term::process_escape_seq ()
2818{ 2997{
2819 unicode_t ch = cmd_getc (); 2998 unicode_t ch = cmd_getc ();
2820 2999
2821 if (PrivateModes & PrivMode_vt52) 3000 if (priv_modes & PrivMode_vt52)
2822 { 3001 {
2823 process_escape_vt52 (ch); 3002 process_escape_vt52 (ch);
2824 return; 3003 return;
2825 } 3004 }
2826 3005
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3020 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3021 break;
2843 case '+': 3022 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3023 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3024 break;
2846#ifndef NO_FRILLS 3025#if ENABLE_FRILLS
2847 case '6': 3026 case '6':
2848 scr_backindex (); 3027 scr_backindex ();
2849 break; 3028 break;
2850#endif 3029#endif
2851 case '7': 3030 case '7':
2852 scr_cursor (SAVE); 3031 scr_cursor (SAVE);
2853 break; 3032 break;
2854 case '8': 3033 case '8':
2855 scr_cursor (RESTORE); 3034 scr_cursor (RESTORE);
2856 break; 3035 break;
2857#ifndef NO_FRILLS 3036#if ENABLE_FRILLS
2858 case '9': 3037 case '9':
2859 scr_forwardindex (); 3038 scr_forwardindex ();
2860 break; 3039 break;
2861#endif 3040#endif
2862 case '=': 3041 case '=':
… …
3041 { 3220 {
3042 switch (priv) 3221 switch (priv)
3043 { 3222 {
3044 case '>': 3223 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3226 break;
3048 case '?': 3227 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3230 break;
… …
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
3162 break; 3341 break;
3163 3342
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3344 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3346 break;
3168 3347
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3349 process_sgr_mode (nargs, arg);
3171 break; 3350 break;
… …
3178 break; 3357 break;
3179 case 6: /* CPR requested */ 3358 case 6: /* CPR requested */
3180 scr_report_position (); 3359 scr_report_position ();
3181 break; 3360 break;
3182 case 7: /* unofficial extension */ 3361 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3362 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3363 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3364 break;
3186 case 8: /* unofficial extension */ 3365 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3367 break;
3189 } 3368 }
… …
3225 break; 3404 break;
3226 3405
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3406 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3407 if (arg[0] == 4)
3229 scr_insert_mode (0); 3408 scr_insert_mode (0);
3409 else if (arg[0] == 20)
3410 priv_modes &= ~PrivMode_LFNL;
3230 break; 3411 break;
3231 3412
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3413 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3414 if (arg[0] == 4)
3234 scr_insert_mode (1); 3415 scr_insert_mode (1);
3416 else if (arg[0] == 20)
3417 priv_modes |= PrivMode_LFNL;
3235 break; 3418 break;
3236 3419
3237 /* 3420 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3421 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3422 */
… …
3251 break; 3434 break;
3252 case CSI_75: 3435 case CSI_75:
3253 scr_cursor (RESTORE); 3436 scr_cursor (RESTORE);
3254 break; 3437 break;
3255 3438
3256#ifndef NO_FRILLS 3439#if ENABLE_FRILLS
3257 case CSI_74: 3440 case CSI_74:
3258 process_window_ops (arg, nargs); 3441 process_window_ops (arg, nargs);
3259 break; 3442 break;
3260#endif 3443#endif
3261 3444
… …
3268 break; 3451 break;
3269 } 3452 }
3270} 3453}
3271/*}}} */ 3454/*}}} */
3272 3455
3273#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
3274/* ARGSUSED */ 3457/* ARGSUSED */
3275void 3458void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3460{
3278 int x, y; 3461 int x, y;
3279 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
3280 Window wdummy; 3463 Window wdummy;
3464 dDisp;
3281 3465
3282 if (nargs == 0) 3466 if (nargs == 0)
3283 return; 3467 return;
3284 3468
3285 switch (args[0]) 3469 switch (args[0])
3286 { 3470 {
3287 /* 3471 /*
3288 * commands 3472 * commands
3289 */ 3473 */
3290 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
3292 break; 3476 break;
3293 case 2: /* iconify window */ 3477 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3479 break;
3297 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3299 break; 3482 break;
3300 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3485 break;
3303 case 5: /* raise window */ 3486 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
3305 break; 3488 break;
3306 case 6: /* lower window */ 3489 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
3308 break; 3491 break;
3309 case 7: /* refresh window */ 3492 case 7: /* refresh window */
3310 scr_touch (true); 3493 scr_touch (true);
3311 break; 3494 break;
3312 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
3324 3507
3325 /* 3508 /*
3326 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
3327 */ 3510 */
3328 case 11: /* report window state */ 3511 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3514 break;
3332 case 13: /* report window position */ 3515 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3521 break;
3339 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3525 break;
3343 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3345 break; 3528 break;
… …
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3348 break; 3531 break;
3349 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3350 { 3533 {
3351 char *s; 3534 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3537 XFree (s);
3355 } 3538 }
3356 break; 3539 break;
3357 case 21: /* report window title */ 3540 case 21: /* report window title */
3358 { 3541 {
3359 char *s; 3542 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3545 XFree (s);
3363 } 3546 }
3364 break; 3547 break;
3365 } 3548 }
3366} 3549}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3555 * ends_how is terminator used. returned input must be free()'d
3373 */ 3556 */
3374unsigned char * 3557unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3558rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3559{
3377 unicode_t prev = 0, ch; 3560 unicode_t ch;
3561 bool seen_esc = false;
3378 unsigned int n = 0; 3562 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3563 wchar_t string[STRING_MAX];
3381 3564
3382 while ((ch = cmd_getc ()) != NOCHAR) 3565 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3566 {
3384 if (prev == C0_ESC) 3567 if (seen_esc)
3385 { 3568 {
3386 if (ch == 0x5c) /* 7bit ST */ 3569 if (ch == 0x5c) /* 7bit ST */
3387 break; 3570 break;
3388 else 3571 else
3389 return NULL; 3572 return NULL;
3390 } 3573 }
3574 else if (ch == C0_ESC)
3575 {
3576 seen_esc = true;
3577 continue;
3578 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3579 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3580 break;
3393 else if (ch < 0x20) 3581 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3582 return NULL; /* other control character - exit */
3583
3584 seen_esc = false;
3395 3585
3396 if (n >= sizeof (string) - 1) 3586 if (n >= sizeof (string) - 1)
3397 // stop at some sane length 3587 // stop at some sane length
3398 return NULL; 3588 return NULL;
3399 3589
3400 if (ch == C0_SYN) 3590 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3591 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3592 else
3406 string[n++] = prev = ch; 3593 string[n++] = ch;
3407 } 3594 }
3408 3595
3409 string[n++] = '\0'; 3596 string[n++] = '\0';
3410 3597
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3598 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3599
3416 return s; 3600 return (unsigned char *)rxvt_wcstombs (string);
3417} 3601}
3418 3602
3419/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
3420/* 3604/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3605 * 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) 3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3651{
3468 if (str[0] == '?' && !str[1]) 3652 if (str[0] == '?' && !str[1])
3469 { 3653 {
3470 unsigned short r, g, b; 3654 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3655 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3657 }
3474 else 3658 else
3475 set_window_color (color, str); 3659 set_window_color (color, str);
3476} 3660}
… …
3505{ 3689{
3506 int changed = 0; 3690 int changed = 0;
3507 int color; 3691 int color;
3508 char *buf, *name; 3692 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3693 bool query = str[0] == '?' && !str[1];
3694 int saveop = op;
3695 dDisp;
3510 3696
3511 assert (str != NULL); 3697 assert (str != NULL);
3512 switch (op) 3698 switch (op)
3513 { 3699 {
3514 case XTerm_name: 3700 case XTerm_name:
… …
3521 set_title (str); 3707 set_title (str);
3522 break; 3708 break;
3523 case XTerm_property: 3709 case XTerm_property:
3524 if (str[0] == '?') 3710 if (str[0] == '?')
3525 { 3711 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3712 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3713 Atom actual_type;
3528 int actual_format; 3714 int actual_format;
3529 unsigned long nitems; 3715 unsigned long nitems;
3530 unsigned long bytes_after; 3716 unsigned long bytes_after;
3531 unsigned char *value = 0; 3717 unsigned char *value = 0;
3532 const char *str = ""; 3718 const char *str = "";
3533 3719
3534 if (prop 3720 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3721 && XGetWindowProperty (disp, TermWin.parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3722 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3723 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3724 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3725 && actual_type != None
3540 && actual_format == 8) 3726 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3736
3551 if (eq) 3737 if (eq)
3552 { 3738 {
3553 *eq = 0; 3739 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3740 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 } 3741 }
3559 else 3742 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3743 XDeleteProperty (disp, TermWin.parent[0],
3561 display->atom (str)); 3744 display->atom (str));
3562 } 3745 }
3563 break; 3746 break;
3564 3747
3565 case XTerm_Color: 3748 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3749 for (buf = (char *)str; buf && *buf;)
3567 { 3750 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3751 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3752 break;
3570 3753
3571 *name++ = '\0'; 3754 *name++ = '\0';
3572 color = atoi (buf); 3755 color = atoi (buf);
3573 3756
3574 if (color < 0 || color >= TOTAL_COLORS) 3757 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3758 break;
3576 3759
3577 if ((buf = STRCHR (name, ';')) != NULL) 3760 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3761 *buf++ = '\0';
3579 3762
3580 if (name[0] == '?' && !name[1]) 3763 if (name[0] == '?' && !name[1])
3581 { 3764 {
3582 unsigned short r, g, b; 3765 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3766 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); 3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3768 }
3586 else 3769 else
3587 set_window_color (color + minCOLOR, name); 3770 set_window_color (color + minCOLOR, name);
3588 } 3771 }
… …
3606 break; 3789 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD: 3791 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break; 3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3611 case XTerm_Color_UL: 3797 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3799 break;
3614 case XTerm_Color_RV: 3800 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3616 break; 3810 break;
3617#endif 3811#endif
3618 3812
3619 case XTerm_Pixmap: 3813 case XTerm_Pixmap:
3620 if (*str != ';') 3814 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3817 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3818 set_bgPixmap (str); /* change pixmap */
3625#endif 3819#endif
3626 scr_touch (true); 3820 scr_touch (true);
3627 } 3821 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3822 while ((str = strchr (str, ';')) != NULL)
3629 { 3823 {
3630 str++; 3824 str++;
3631#if XPM_BACKGROUND 3825#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3826 changed += scale_pixmap (str);
3633#endif 3827#endif
3634
3635 } 3828 }
3829
3636 if (changed) 3830 if (changed)
3637 { 3831 {
3638#ifdef XPM_BACKGROUND 3832#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3833 resize_pixmap ();
3640#endif 3834#endif
… …
3652 case XTerm_logfile: 3846 case XTerm_logfile:
3653 // TODO, when secure mode? 3847 // TODO, when secure mode?
3654 break; 3848 break;
3655 3849
3656 case XTerm_font: 3850 case XTerm_font:
3851 op = URxvt_font;
3852 case URxvt_font:
3853#if ENABLE_STYLES
3854 case URxvt_boldFont:
3855 case URxvt_italicFont:
3856 case URxvt_boldItalicFont:
3857#endif
3657 if (query) 3858 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3859 tt_printf ("\33]%d;%-.250s%c", saveop,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc 3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3660 ? TermWin.fontset->fontdesc : "", 3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3661 resp); 3862 resp);
3662 else 3863 else
3864 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866
3867 res = strdup (str);
3868 allocated.push_back ((void *)res);
3663 change_font (str); 3869 set_fonts ();
3870 }
3664 break; 3871 break;
3665 3872
3666#ifndef NO_FRILLS 3873#if ENABLE_FRILLS
3667 case XTerm_locale: 3874 case XTerm_locale:
3668 if (query) 3875 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); 3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3670 else 3877 else
3671 { 3878 {
3672 set_locale (str); 3879 set_locale (str);
3673# ifdef USE_XIM 3880 pty.set_utf8_mode (enc_utf8);
3674 im_cb (); 3881 init_xlocale ();
3675# endif
3676 } 3882 }
3677 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; 3883 break;
3688#endif 3884#endif
3689 3885
3690#ifdef MENUBAR 3886#ifdef MENUBAR
3691 case XTerm_Menu: 3887 case XTerm_Menu:
3692 if (Options & Opt_insecure) 3888 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3890 break;
3695#endif 3891#endif
3696#if 0 3892#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3893 case XTerm_dumpscreen: /* no error notices */
… …
3724{ 3920{
3725 int state; 3921 int state;
3726 3922
3727 if (mode == 's') 3923 if (mode == 's')
3728 { 3924 {
3729 SavedModes |= (PrivateModes & bit); 3925 SavedModes |= (priv_modes & bit);
3730 return -1; 3926 return -1;
3731 } 3927 }
3732 else 3928 else
3733 { 3929 {
3734 if (mode == 'r') 3930 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3932 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3933 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3934 PrivMode (state, bit);
3739 } 3935 }
3740 3936
3741 return state; 3937 return state;
3742} 3938}
… …
3760 { 3, PrivMode_132 }, 3956 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3957 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3958 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3959 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3960 { 7, PrivMode_Autowrap },
3961 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3962 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3963#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3964 { menuBar_esc, PrivMode_menuBar },
3768#endif 3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3968#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3969 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3970#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3971 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3972 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3973 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3974 // 45 margin bell NYI
3779 // 46 start logging 3975 // 46 start logging
… …
3820 4016
3821 /* extra handling for values with state unkept */ 4017 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4018 switch (arg[i])
3823 { 4019 {
3824 case 1048: /* alternative cursor save */ 4020 case 1048: /* alternative cursor save */
4021 case 1049:
3825 if (Options & Opt_secondaryScreen) 4022 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 4023 if (mode == 0)
3827 scr_cursor (RESTORE); 4024 scr_cursor (RESTORE);
3828 else if (mode == 1) 4025 else if (mode == 1)
3829 scr_cursor (SAVE); 4026 scr_cursor (SAVE);
3830 break; 4027 break;
… …
3841 * within VT52 mode 4038 * within VT52 mode
3842 */ 4039 */
3843 PrivMode (1, PrivMode_vt52); 4040 PrivMode (1, PrivMode_vt52);
3844 break; 4041 break;
3845 case 3: /* 80/132 */ 4042 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4043 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3848 break; 4045 break;
3849 case 4: /* smooth scrolling */ 4046 case 4: /* smooth scrolling */
3850 if (state) 4047 if (state)
3851 Options &= ~Opt_jumpScroll; 4048 options &= ~Opt_jumpScroll;
3852 else 4049 else
3853 Options |= Opt_jumpScroll; 4050 options |= Opt_jumpScroll;
3854 break; 4051 break;
3855 case 5: /* reverse video */ 4052 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4053 scr_rvideo_mode (state);
3857 break; 4054 break;
3858 case 6: /* relative/absolute origins */ 4055 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4059 scr_autowrap (state);
3863 break; 4060 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4061 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4062 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4063 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4064 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4065 break;
3869#ifdef menuBar_esc 4066#ifdef menuBar_esc
3870 case menuBar_esc: 4067 case menuBar_esc:
3871#ifdef MENUBAR 4068#ifdef MENUBAR
3872 map_menuBar (state); 4069 map_menuBar (state);
… …
3892 break; 4089 break;
3893 /* case 66: - application key pad */ 4090 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4091 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4092 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4093 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4094 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4095 break;
3899#if 0 4096#if 0
3900 case 1001: 4097 case 1001:
3901 break; /* X11 mouse highlighting */ 4098 break; /* X11 mouse highlighting */
3902#endif 4099#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4100 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4101 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4102 options &= ~Opt_scrollTtyOutput;
3906 else 4103 else
3907 Options |= Opt_scrollTtyOutput; 4104 options |= Opt_scrollTtyOutput;
3908 break; 4105 break;
3909 case 1011: /* scroll to bottom on key press */ 4106 case 1011: /* scroll to bottom on key press */
3910 if (state) 4107 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4108 options |= Opt_scrollTtyKeypress;
3912 else 4109 else
3913 Options &= ~Opt_scrollTtyKeypress; 4110 options &= ~Opt_scrollTtyKeypress;
3914 break; 4111 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4112 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4113 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4114 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4115 scr_erase_screen (2);
3919 scr_change_screen (state); 4116 scr_change_screen (state);
3920 break; 4117 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4118 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4119 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4120 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4121 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4122 scr_erase_screen (2);
3926 break; 4123 break;
3927 default: 4124 default:
3928 break; 4125 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4151 rendset = 0, rendstyle = ~RS_None;
3955 break; 4152 break;
3956 case 1: 4153 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4154 rendset = 1, rendstyle = RS_Bold;
3958 break; 4155 break;
3959 //case 2: // faint or second colour 4156 //case 2: // low intensity
4157 case 3:
4158 rendset = 1, rendstyle = RS_Italic;
4159 break;
3960 case 4: 4160 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4161 rendset = 1, rendstyle = RS_Uline;
3962 break; 4162 break;
3963 case 5: // slowly blinking 4163 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4164 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4176 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4177 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4178 //...
3979 //case 19: // ninth alt font 4179 //case 19: // ninth alt font
3980 //case 20: // gothic 4180 //case 20: // gothic
3981 case 21: // disable bold, faint 4181 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4182 rendset = 0, rendstyle = RS_Bold;
3983 break; 4183 break;
3984 case 22: 4184 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4185 rendset = 0, rendstyle = RS_Bold;
3986 break; 4186 break;
3987 //case 23: disable italic 4187 case 23: // disable italic
4188 rendset = 0, rendstyle = RS_Italic;
4189 break;
3988 case 24: 4190 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4191 rendset = 0, rendstyle = RS_Uline;
3990 break; 4192 break;
3991 case 25: 4193 case 25:
4194 rendset = 0, rendstyle = RS_Blink;
4195 break;
4196 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4197 rendset = 0, rendstyle = RS_Blink;
3993 break; 4198 break;
3994 case 27: 4199 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4200 rendset = 0, rendstyle = RS_RVid;
3996 break; 4201 break;
… …
4014 case 35: 4219 case 35:
4015 case 36: 4220 case 36:
4016 case 37: 4221 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4222 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4223 break;
4019#ifdef TTY_256COLOR 4224 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4225 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4226 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4227 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4228 i += 2;
4025 } 4229 }
4026 break; 4230 break;
4027#endif
4028 case 39: /* default fg */ 4231 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4232 scr_color (Color_fg, Color_fg);
4030 break; 4233 break;
4031 4234
4032 case 40: 4235 case 40:
… …
4037 case 45: 4240 case 45:
4038 case 46: 4241 case 46:
4039 case 47: 4242 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4243 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4244 break;
4042#ifdef TTY_256COLOR 4245 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4246 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4247 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4248 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4249 i += 2;
4048 } 4250 }
4049 break; 4251 break;
4050#endif
4051 case 49: /* default bg */ 4252 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4253 scr_color (Color_bg, Color_bg);
4053 break; 4254 break;
4255
4256 //case 50: // not variable spacing
4054 4257
4055#ifndef NO_BRIGHTCOLOR 4258#ifndef NO_BRIGHTCOLOR
4056 case 90: 4259 case 90:
4057 case 91: /* set bright fg color */ 4260 case 91: /* set bright fg color */
4058 case 92: 4261 case 92:
4059 case 93: 4262 case 93:
4060 case 94: 4263 case 94:
4061 case 95: 4264 case 95:
4062 case 96: 4265 case 96:
4063 case 97: 4266 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4267 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4268 break;
4067 case 100: 4269 case 100:
4068 case 101: /* set bright bg color */ 4270 case 101: /* set bright bg color */
4069 case 102: 4271 case 102:
4070 case 103: 4272 case 103:
4071 case 104: 4273 case 104:
4072 case 105: 4274 case 105:
4073 case 106: 4275 case 106:
4074 case 107: 4276 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4278 break;
4078#endif 4279#endif
4079 4280
4080 } 4281 }
4081 } 4282 }
… …
4088{ 4289{
4089 unicode_t ch, cmd = cmd_getc (); 4290 unicode_t ch, cmd = cmd_getc ();
4090 4291
4091 if (cmd == 'Q') 4292 if (cmd == 'Q')
4092 { /* query graphics */ 4293 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4294 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4295 return;
4095 } 4296 }
4096 /* swallow other graphics sequences until terminating ':' */ 4297 /* swallow other graphics sequences until terminating ':' */
4097 do 4298 do
4098 ch = cmd_getc (); 4299 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4314 unsigned char buf[256];
4114 4315
4115 va_start (arg_ptr, fmt); 4316 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4318 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4319 tt_write (buf, strlen (buf));
4119} 4320}
4120 4321
4121/* ---------------------------------------------------------------------- */ 4322/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4323/* 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. 4324 * or generated by us in response to a query ESC sequence.
4124 */ 4325 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327
4125void 4328void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4329rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4330{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4331 if (v_buflen == 0)
4332 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4129 4334
4130 if (len) 4335 if ((unsigned int)written == len)
4336 return;
4337
4338 data += written;
4339 len -= written;
4131 { 4340 }
4341
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4343
4344 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len;
4346
4347 pty_ev.set (EVENT_READ | EVENT_WRITE);
4348}
4349
4350void rxvt_term::pty_write ()
4351{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353
4354 if (written > 0)
4355 {
4356 v_buflen -= written;
4357
4132 if (v_buflen == 0) 4358 if (v_buflen == 0)
4133 { 4359 {
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); 4360 free (v_buffer);
4161 v_buffer = 0; 4361 v_buffer = 0;
4162 v_buflen = 0; 4362 v_buflen = 0;
4163 4363
4164 pty_ev.set (EVENT_READ); 4364 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; 4365 return;
4177 } 4366 }
4367
4368 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4369 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this...
4372 destroy ();
4179} 4373}
4180 4374
4181/*----------------------- end-of-file (C source) -----------------------*/ 4375/*----------------------- end-of-file (C source) -----------------------*/
4182 4376

Diff Legend

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