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.196 by root, Thu Feb 17 12:23:39 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))
… …
1243 Atom ActualType; 1345 Atom ActualType;
1244 int ActualFormat; 1346 int ActualFormat;
1245 unsigned char *data; 1347 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1247 1349
1248 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1352 0L, 1000000L,
1251 False, AnyPropertyType, 1353 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1254 &data); 1356 &data);
1255 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1358 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1361 }
1263#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1264 break; 1363 break;
1265 1364
1266 case MappingNotify: 1365 case MappingNotify:
… …
1297 { 1396 {
1298 TermWin.focus = 1; 1397 TermWin.focus = 1;
1299 want_refresh = 1; 1398 want_refresh = 1;
1300#ifdef USE_XIM 1399#ifdef USE_XIM
1301 if (Input_Context != NULL) 1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1302 XSetICFocus (Input_Context); 1403 XSetICFocus (Input_Context);
1404 }
1303#endif 1405#endif
1304#ifdef CURSOR_BLINK 1406#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink) 1407 if (options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif 1409#endif
1308#ifdef OFF_FOCUS_FADING 1410#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade]) 1411 if (rs[Rs_fade])
1310 { 1412 {
1311 PixColors = PixColorsFocused; 1413 pix_colors = pix_colors_focused;
1312 set_colorfgbg ();
1313 scr_clear (); 1414 scr_recolour ();
1314 scr_touch (true);
1315 } 1415 }
1316#endif 1416#endif
1317 1417
1318 } 1418 }
1319 break; 1419 break;
… …
1321 case FocusOut: 1421 case FocusOut:
1322 if (TermWin.focus) 1422 if (TermWin.focus)
1323 { 1423 {
1324 TermWin.focus = 0; 1424 TermWin.focus = 0;
1325 want_refresh = 1; 1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1326#ifdef USE_XIM 1433#ifdef USE_XIM
1327 if (Input_Context != NULL) 1434 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context); 1435 XUnsetICFocus (Input_Context);
1329#endif 1436#endif
1330#ifdef CURSOR_BLINK 1437#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink) 1438 if (options & Opt_cursorBlink)
1332 cursor_blink_ev.stop (); 1439 cursor_blink_ev.stop ();
1333 hidden_cursor = 0; 1440 hidden_cursor = 0;
1334#endif 1441#endif
1335#ifdef OFF_FOCUS_FADING 1442#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade]) 1443 if (rs[Rs_fade])
1337 { 1444 {
1338 PixColors = PixColorsUnFocused; 1445 pix_colors = pix_colors_unfocused;
1339 set_colorfgbg ();
1340 scr_clear (); 1446 scr_recolour ();
1341 scr_touch (true);
1342 } 1447 }
1343#endif 1448#endif
1344
1345 } 1449 }
1346 break; 1450 break;
1347 1451
1348 case ConfigureNotify: 1452 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0]) 1453 if (ev.xconfigure.window == TermWin.parent[0])
… …
1354 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 } 1462 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1360 1464
1361 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1466 {
1467 seen_resize = 1;
1362 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1469 }
1363 1470
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1472 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1473 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1474#endif
1372 } 1475 }
1373 break; 1476 break;
1374 1477
1375 case PropertyNotify: 1478 case PropertyNotify:
… …
1383 selection_clear (); 1486 selection_clear ();
1384 break; 1487 break;
1385 1488
1386 case SelectionNotify: 1489 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1492 break;
1391 1493
1392 case SelectionRequest: 1494 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1394 break; 1496 break;
… …
1418 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1419 { 1521 {
1420 do 1522 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1424 1526
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1528
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1430 1532
1431 scr_refresh (refresh_type); 1533 scr_refresh (refresh_type);
1432 } 1534 }
1433 else 1535 else
1434 { 1536 {
1435 XEvent unused_event; 1537 XEvent unused_event;
1436 1538
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1540 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1542 ;
1441 1543
1442 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1443 { 1545 {
1444 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1449 menubar_expose (); 1551 menubar_expose ();
1450#endif 1552#endif
1451 1553
1452#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1556 XClearWindow (disp, ev.xany.window);
1455#endif 1557#endif
1456 } 1558 }
1457 break; 1559 break;
1458 1560
1459 case MotionNotify: 1561 case MotionNotify:
… …
1466 { 1568 {
1467 menubar_control (ev.xbutton); 1569 menubar_control (ev.xbutton);
1468 break; 1570 break;
1469 } 1571 }
1470#endif 1572#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1574 break;
1473 1575
1474 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1475 { 1577 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1579 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1479 ; 1581 ;
1480 1582
1481 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1482 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1587 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1591 {
1490#endif 1592#endif
1593#if ISO_14755
1594 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1598 break;
1599 }
1600#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1493#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1496 { 1607 {
1497 int dist; 1608 int dist;
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1615
1505 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1507 */ 1618 */
1508 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1622
1513 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1515 { 1625 {
1516 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1518 } 1628 }
1519 else 1629 else
1520 { 1630 {
1521 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y -
1523 (TermWin.int_bwidth + TermWin.height); 1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1524 } 1633 }
1634
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1527 MIN_IT (scroll_selection_lines, 1638 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1529 } 1640 }
1530 else 1641 else
1531 { 1642 {
1532 /* we are within the text window, so we 1643 /* we are within the text window, so we
1533 * shouldn't be scrolling 1644 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1646 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1537 } 1648 }
1538#endif 1649#endif
1539#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1540
1541 } 1651 }
1542#endif 1652#endif
1543
1544 } 1653 }
1545 } 1654 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1656 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1550 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1665 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1667 scrollbar_size ());
1557 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1574 case PropertyNotify: 1685 case PropertyNotify:
1575 /* 1686 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1687 * 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. 1688 * use the property to determine the pixmap. We use it later on.
1578 */ 1689 */
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]) 1690 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1692 return;
1584 1693
1585 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1586 case ReparentNotify: 1695 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1697 want_refresh = want_full_refresh = 1;
1589 break; 1698 break;
1590 } 1699 }
1591} 1700}
1592#endif 1701#endif
… …
1596{ 1705{
1597 int reportmode = 0, clickintime; 1706 int reportmode = 0, clickintime;
1598 1707
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1709 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1710 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711
1602 /* 1712 /*
1603 * VT window processing of button press 1713 * VT window processing of button press
1604 */ 1714 */
1605 if (ev.window == TermWin.vt) 1715 if (ev.window == TermWin.vt)
1606 { 1716 {
1717#if ISO_14755
1718 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 {
1721 iso14755_54 (ev.x, ev.y);
1722 return;
1723 }
1724#endif
1725
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1608 if (reportmode) 1728 if (reportmode)
1609 { 1729 {
1610 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1641 } 1761 }
1642 else 1762 else
1643 { 1763 {
1644 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1646 switch (ev.button) 1767 switch (ev.button)
1647 { 1768 {
1648 case Button1: 1769 case Button1:
1770 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */
1772#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask);
1774#else
1775 selection.rect = false;
1776#endif
1777
1649 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1780 {
1652 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
1654 else 1783 else
1655 selection_extend (ev.x, ev.y, 1); 1784 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1799 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1800 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1801 selection_rotate (ev.x, ev.y);
1673 else 1802 else
1674 selection_extend (ev.x, ev.y, 1); 1803 selection_extend (ev.x, ev.y, 1);
1804
1675 MEvent.button = Button3; 1805 MEvent.button = Button3;
1676 break; 1806 break;
1677 } 1807 }
1678 } 1808 }
1809
1679 MEvent.time = ev.time; 1810 MEvent.time = ev.time;
1680 return; 1811 return;
1681 } 1812 }
1682 1813
1683 /* 1814 /*
… …
1836{ 1967{
1837 int reportmode = 0; 1968 int reportmode = 0;
1838 1969
1839 csrO = 0; /* reset csr Offset */ 1970 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 1971 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1972 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 1973
1843 if (scrollbar_isUpDn ()) 1974 if (scrollbar_isUpDn ())
1844 { 1975 {
1845 scrollBar.setIdle (); 1976 scrollBar.setIdle ();
1846 scrollbar_show (0); 1977 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 1979 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 1980#endif
1850
1851 } 1981 }
1982
1852#ifdef SELECTION_SCROLLING 1983#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 1984 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 1985 sel_scroll_ev.stop();
1855#endif 1986#endif
1987
1856 if (ev.window == TermWin.vt) 1988 if (ev.window == TermWin.vt)
1857 { 1989 {
1990#if ISO_14755
1991 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return;
1994#endif
1858 if (reportmode) 1995 if (reportmode)
1859 { 1996 {
1860 /* mouse report from vt window */ 1997 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 1998 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 1999 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2013 MEvent.button = AnyButton;
1877 mouse_report (ev); 2014 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2015#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2016 return;
1880 } 2017 }
2018
1881 /* 2019 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2020 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2021 * when overriding mouse reporting
1884 */ 2022 */
1885 if (PrivateModes & PrivMode_mouse_report 2023 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2024 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2025 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2026 selection_extend (ev.x, ev.y, 0);
1889 2027
1890 switch (ev.button) 2028 switch (ev.button)
… …
1905 2043
1906 v = ev.button == Button4 ? UP : DN; 2044 v = ev.button == Button4 ? UP : DN;
1907 2045
1908 if (ev.state & ShiftMask) 2046 if (ev.state & ShiftMask)
1909 i = 1; 2047 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2048 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2049 i = TermWin.nrow - 1;
1912 else 2050 else
1913 i = 5; 2051 i = 5;
1914 2052
1915# ifdef MOUSE_SLIP_WHEELING 2053# ifdef MOUSE_SLIP_WHEELING
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2107 int i;
1970 2108
1971 Visual* visual = display->visual; 2109 Visual *visual = display->visual;
1972 2110
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2112
1975 /* for convenience */ 2113 /* for convenience */
1976 mask_r = visual->red_mask; 2114 mask_r = visual->red_mask;
… …
2197 Atom atype; 2335 Atom atype;
2198 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2337 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2202 2341
2203 pchanged = 0; 2342 pchanged = 0;
2204 2343
2205 if (!(Options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2207 2346
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
2210 2349
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2212 2351
2213 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
2214 { 2353 {
2215 if (am_transparent) 2354 if (am_transparent)
2216 { 2355 {
2217 pchanged = 1; 2356 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
2220 } 2359 }
2221 2360
2222 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
2223 } 2362 }
2224 2363
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2365 XSync (disp, False);
2227 2366
2228 /* 2367 /*
2229 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
2232 */ 2371 */
2233 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
2237 2376
2238 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
2243 2382
2244 if (!i || prop == NULL 2383 if (!i || prop == NULL
2245#if TINTING 2384#if TINTING
… …
2264 Window cr; 2403 Window cr;
2265 XImage *image; 2404 XImage *image;
2266 GC gc; 2405 GC gc;
2267 XGCValues gcvalue; 2406 XGCValues gcvalue;
2268 2407
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2412 nx = ny = 0;
2274 2413
… …
2286 sy = 0; 2425 sy = 0;
2287 } 2426 }
2288 2427
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
2291 allowedxerror = -1; 2432 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2434
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2437 allowedxerror = 0;
2297 2438
… …
2300 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2301 { 2442 {
2302 pchanged = 1; 2443 pchanged = 1;
2303 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2304 { 2445 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2306 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2307 } 2448 }
2308 } 2449 }
2309 2450
2310 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2311 } 2452 }
2312 else 2453 else
2313 { 2454 {
2314 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2316 2457
2317#if TINTING 2458#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2460 {
2320 unsigned short rm, gm, bm; 2461 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2463
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2465
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2467 }
2327#endif 2468#endif
2328 2469
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2330 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2476 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2478 XClearWindow (disp, TermWin.parent[0]);
2338 2479
2339 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2481 pchanged = 1;
2341 2482
2342 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2343 } 2484 }
2344 } 2485 }
2345 2486
2346 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2347 { 2490 {
2348 unsigned int n; 2491 unsigned int n;
2349 /* 2492 /*
2350 * InheritPixmap transparency 2493 * InheritPixmap transparency
2351 */ 2494 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 { 2496 {
2355 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2500 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2501
2361 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2362 { 2503 {
2363 if (oldp != None) 2504 if (oldp != None)
2364 pchanged = 1; 2505 pchanged = 1;
… …
2374 2515
2375 if (pchanged) 2516 if (pchanged)
2376 { 2517 {
2377 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2378 { 2519 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 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) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2522 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break; 2524 break;
2385 } 2525 }
2386 } 2526 }
2387 } 2527 }
2388 2528
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 { 2530 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2533 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2396 } 2535 }
2397 else 2536 else
2398 { 2537 {
2399#if WAIT_FOR_WM 2538#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2539 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2541 sleep (1);
2403#endif 2542#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2406 { 2544 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2546 XClearWindow (disp, TermWin.parent[n]);
2409 } 2547 }
2410 2548
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2412 am_transparent = 1; 2550 am_transparent = 1;
2413 } 2551 }
2414 2552
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2417 } 2555 }
2418 2556
2419 // this is experimental
2420 if (scrollBar.win) 2557 if (scrollBar.win)
2421 { 2558 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2560 scrollBar.setIdle ();
2425 scrollbar_show (0); 2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2426 } 2569 }
2427 2570
2428 return pchanged; 2571 return pchanged;
2429} 2572}
2430#endif 2573#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2592 if (ch == NOCHAR) // TODO: improve
2450 break; 2593 break;
2451 2594
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2596 {
2597 if (!seen_input)
2598 {
2599 seen_input = 1;
2600 // many badly-written programs (e.g. jed) contain a race condition:
2601 // they first read the screensize and then install a SIGWINCH handler.
2602 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized.
2607 if (seen_resize)
2608 kill (-cmd_pid, SIGWINCH);
2609 }
2610
2454 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2613 bool refreshnow = false;
2457 int nlines = 0; 2614 int nlines = 0;
2458 unicode_t *str = buf; 2615 unicode_t *str = buf;
… …
2467 if (ch == C0_LF) 2624 if (ch == C0_LF)
2468 { 2625 {
2469 nlines++; 2626 nlines++;
2470 refresh_count++; 2627 refresh_count++;
2471 2628
2472 if (!(Options & Opt_jumpScroll) 2629 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2631 {
2475 refreshnow = true; 2632 refreshnow = true;
2476 ch = NOCHAR; 2633 ch = NOCHAR;
2477 break; 2634 break;
… …
2504 * the number of pages between refreshes is refresh_limit, which 2661 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2662 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2663 */
2507 if (refreshnow) 2664 if (refreshnow)
2508 { 2665 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2667 refresh_limit++;
2511 else 2668 else
2512 { 2669 {
2513 flag = true; 2670 flag = true;
2514 scr_refresh (refresh_type); 2671 scr_refresh (refresh_type);
… …
2568 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2727
2571 // assume wchar == unicode 2728 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2573 return wc; 2730 return wc & UNICODE_MASK;
2574 } 2731 }
2575 2732
2576 return NOCHAR; 2733 return NOCHAR;
2577} 2734}
2578 2735
… …
2704 process_escape_seq (); 2861 process_escape_seq ();
2705 break; 2862 break;
2706 case C0_ENQ: /* terminal Status */ 2863 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2864 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2867 else
2711 tt_write ((unsigned char *)VT100_ANS, 2868 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2869 (unsigned int)strlen (VT100_ANS));
2713 break; 2870 break;
2714 case C0_BEL: /* bell */ 2871 case C0_BEL: /* bell */
2715 scr_bell (); 2872 scr_bell ();
2716 break; 2873 break;
2717 case C0_BS: /* backspace */ 2874 case C0_BS: /* backspace */
… …
2816void 2973void
2817rxvt_term::process_escape_seq () 2974rxvt_term::process_escape_seq ()
2818{ 2975{
2819 unicode_t ch = cmd_getc (); 2976 unicode_t ch = cmd_getc ();
2820 2977
2821 if (PrivateModes & PrivMode_vt52) 2978 if (priv_modes & PrivMode_vt52)
2822 { 2979 {
2823 process_escape_vt52 (ch); 2980 process_escape_vt52 (ch);
2824 return; 2981 return;
2825 } 2982 }
2826 2983
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2998 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2999 break;
2843 case '+': 3000 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3001 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3002 break;
2846#ifndef NO_FRILLS 3003#if ENABLE_FRILLS
2847 case '6': 3004 case '6':
2848 scr_backindex (); 3005 scr_backindex ();
2849 break; 3006 break;
2850#endif 3007#endif
2851 case '7': 3008 case '7':
2852 scr_cursor (SAVE); 3009 scr_cursor (SAVE);
2853 break; 3010 break;
2854 case '8': 3011 case '8':
2855 scr_cursor (RESTORE); 3012 scr_cursor (RESTORE);
2856 break; 3013 break;
2857#ifndef NO_FRILLS 3014#if ENABLE_FRILLS
2858 case '9': 3015 case '9':
2859 scr_forwardindex (); 3016 scr_forwardindex ();
2860 break; 3017 break;
2861#endif 3018#endif
2862 case '=': 3019 case '=':
… …
3041 { 3198 {
3042 switch (priv) 3199 switch (priv)
3043 { 3200 {
3044 case '>': 3201 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3204 break;
3048 case '?': 3205 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3208 break;
… …
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
3162 break; 3319 break;
3163 3320
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3322 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3324 break;
3168 3325
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3327 process_sgr_mode (nargs, arg);
3171 break; 3328 break;
… …
3178 break; 3335 break;
3179 case 6: /* CPR requested */ 3336 case 6: /* CPR requested */
3180 scr_report_position (); 3337 scr_report_position ();
3181 break; 3338 break;
3182 case 7: /* unofficial extension */ 3339 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3340 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3341 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3342 break;
3186 case 8: /* unofficial extension */ 3343 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3345 break;
3189 } 3346 }
… …
3225 break; 3382 break;
3226 3383
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3384 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3385 if (arg[0] == 4)
3229 scr_insert_mode (0); 3386 scr_insert_mode (0);
3387 else if (arg[0] == 20)
3388 priv_modes &= ~PrivMode_LFNL;
3230 break; 3389 break;
3231 3390
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3391 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3392 if (arg[0] == 4)
3234 scr_insert_mode (1); 3393 scr_insert_mode (1);
3394 else if (arg[0] == 20)
3395 priv_modes |= PrivMode_LFNL;
3235 break; 3396 break;
3236 3397
3237 /* 3398 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3399 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3400 */
… …
3251 break; 3412 break;
3252 case CSI_75: 3413 case CSI_75:
3253 scr_cursor (RESTORE); 3414 scr_cursor (RESTORE);
3254 break; 3415 break;
3255 3416
3256#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
3257 case CSI_74: 3418 case CSI_74:
3258 process_window_ops (arg, nargs); 3419 process_window_ops (arg, nargs);
3259 break; 3420 break;
3260#endif 3421#endif
3261 3422
… …
3268 break; 3429 break;
3269 } 3430 }
3270} 3431}
3271/*}}} */ 3432/*}}} */
3272 3433
3273#ifndef NO_FRILLS 3434#if ENABLE_FRILLS
3274/* ARGSUSED */ 3435/* ARGSUSED */
3275void 3436void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3438{
3278 int x, y; 3439 int x, y;
3279 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3280 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3281 3443
3282 if (nargs == 0) 3444 if (nargs == 0)
3283 return; 3445 return;
3284 3446
3285 switch (args[0]) 3447 switch (args[0])
3286 { 3448 {
3287 /* 3449 /*
3288 * commands 3450 * commands
3289 */ 3451 */
3290 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3292 break; 3454 break;
3293 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3457 break;
3297 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3299 break; 3460 break;
3300 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3463 break;
3303 case 5: /* raise window */ 3464 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3305 break; 3466 break;
3306 case 6: /* lower window */ 3467 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3308 break; 3469 break;
3309 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3310 scr_touch (true); 3471 scr_touch (true);
3311 break; 3472 break;
3312 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3324 3485
3325 /* 3486 /*
3326 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3327 */ 3488 */
3328 case 11: /* report window state */ 3489 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3492 break;
3332 case 13: /* report window position */ 3493 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3499 break;
3339 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3503 break;
3343 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3345 break; 3506 break;
… …
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3348 break; 3509 break;
3349 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3350 { 3511 {
3351 char *s; 3512 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3515 XFree (s);
3355 } 3516 }
3356 break; 3517 break;
3357 case 21: /* report window title */ 3518 case 21: /* report window title */
3358 { 3519 {
3359 char *s; 3520 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3523 XFree (s);
3363 } 3524 }
3364 break; 3525 break;
3365 } 3526 }
3366} 3527}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3533 * ends_how is terminator used. returned input must be free()'d
3373 */ 3534 */
3374unsigned char * 3535unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3537{
3377 unicode_t prev = 0, ch; 3538 unicode_t ch;
3539 bool seen_esc = false;
3378 unsigned int n = 0; 3540 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3541 wchar_t string[STRING_MAX];
3381 3542
3382 while ((ch = cmd_getc ()) != NOCHAR) 3543 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3544 {
3384 if (prev == C0_ESC) 3545 if (seen_esc)
3385 { 3546 {
3386 if (ch == 0x5c) /* 7bit ST */ 3547 if (ch == 0x5c) /* 7bit ST */
3387 break; 3548 break;
3388 else 3549 else
3389 return NULL; 3550 return NULL;
3390 } 3551 }
3552 else if (ch == C0_ESC)
3553 {
3554 seen_esc = true;
3555 continue;
3556 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3557 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3558 break;
3393 else if (ch < 0x20) 3559 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3561
3562 seen_esc = false;
3395 3563
3396 if (n >= sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3397 // stop at some sane length 3565 // stop at some sane length
3398 return NULL; 3566 return NULL;
3399 3567
3400 if (ch == C0_SYN) 3568 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3569 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3570 else
3406 string[n++] = prev = ch; 3571 string[n++] = ch;
3407 } 3572 }
3408 3573
3409 string[n++] = '\0'; 3574 string[n++] = '\0';
3410 3575
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3577
3416 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
3417} 3579}
3418 3580
3419/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
3420/* 3582/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3583 * 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) 3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3629{
3468 if (str[0] == '?' && !str[1]) 3630 if (str[0] == '?' && !str[1])
3469 { 3631 {
3470 unsigned short r, g, b; 3632 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3633 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3635 }
3474 else 3636 else
3475 set_window_color (color, str); 3637 set_window_color (color, str);
3476} 3638}
… …
3505{ 3667{
3506 int changed = 0; 3668 int changed = 0;
3507 int color; 3669 int color;
3508 char *buf, *name; 3670 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3672 int saveop = op;
3673 dDisp;
3510 3674
3511 assert (str != NULL); 3675 assert (str != NULL);
3512 switch (op) 3676 switch (op)
3513 { 3677 {
3514 case XTerm_name: 3678 case XTerm_name:
… …
3521 set_title (str); 3685 set_title (str);
3522 break; 3686 break;
3523 case XTerm_property: 3687 case XTerm_property:
3524 if (str[0] == '?') 3688 if (str[0] == '?')
3525 { 3689 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3690 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3691 Atom actual_type;
3528 int actual_format; 3692 int actual_format;
3529 unsigned long nitems; 3693 unsigned long nitems;
3530 unsigned long bytes_after; 3694 unsigned long bytes_after;
3531 unsigned char *value = 0; 3695 unsigned char *value = 0;
3532 const char *str = ""; 3696 const char *str = "";
3533 3697
3534 if (prop 3698 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3703 && actual_type != None
3540 && actual_format == 8) 3704 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3714
3551 if (eq) 3715 if (eq)
3552 { 3716 {
3553 *eq = 0; 3717 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3718 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 } 3719 }
3559 else 3720 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3561 display->atom (str)); 3722 display->atom (str));
3562 } 3723 }
3563 break; 3724 break;
3564 3725
3565 case XTerm_Color: 3726 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3727 for (buf = (char *)str; buf && *buf;)
3567 { 3728 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3729 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3730 break;
3570 3731
3571 *name++ = '\0'; 3732 *name++ = '\0';
3572 color = atoi (buf); 3733 color = atoi (buf);
3573 3734
3574 if (color < 0 || color >= TOTAL_COLORS) 3735 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3736 break;
3576 3737
3577 if ((buf = STRCHR (name, ';')) != NULL) 3738 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3739 *buf++ = '\0';
3579 3740
3580 if (name[0] == '?' && !name[1]) 3741 if (name[0] == '?' && !name[1])
3581 { 3742 {
3582 unsigned short r, g, b; 3743 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3744 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); 3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3746 }
3586 else 3747 else
3587 set_window_color (color + minCOLOR, name); 3748 set_window_color (color + minCOLOR, name);
3588 } 3749 }
… …
3606 break; 3767 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3768#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD: 3769 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break; 3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3611 case XTerm_Color_UL: 3775 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3777 break;
3614 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break;
3781#endif
3782#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3785 check_our_parents ();
3786 if (am_transparent)
3787 want_full_refresh = want_refresh = 1;
3616 break; 3788 break;
3617#endif 3789#endif
3618 3790
3619 case XTerm_Pixmap: 3791 case XTerm_Pixmap:
3620 if (*str != ';') 3792 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3795 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3796 set_bgPixmap (str); /* change pixmap */
3625#endif 3797#endif
3626 scr_touch (true); 3798 scr_touch (true);
3627 } 3799 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3800 while ((str = strchr (str, ';')) != NULL)
3629 { 3801 {
3630 str++; 3802 str++;
3631#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3633#endif 3805#endif
3634
3635 } 3806 }
3807
3636 if (changed) 3808 if (changed)
3637 { 3809 {
3638#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3811 resize_pixmap ();
3640#endif 3812#endif
… …
3652 case XTerm_logfile: 3824 case XTerm_logfile:
3653 // TODO, when secure mode? 3825 // TODO, when secure mode?
3654 break; 3826 break;
3655 3827
3656 case XTerm_font: 3828 case XTerm_font:
3829 op = URxvt_font;
3830 case URxvt_font:
3831#if ENABLE_STYLES
3832 case URxvt_boldFont:
3833 case URxvt_italicFont:
3834 case URxvt_boldItalicFont:
3835#endif
3657 if (query) 3836 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3837 tt_printf ("\33]%d;%-.250s%c", saveop,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc 3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3660 ? TermWin.fontset->fontdesc : "", 3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3661 resp); 3840 resp);
3662 else 3841 else
3842 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844
3845 res = strdup (str);
3846 allocated.push_back ((void *)res);
3663 change_font (str); 3847 set_fonts ();
3848 }
3664 break; 3849 break;
3665 3850
3666#ifndef NO_FRILLS 3851#if ENABLE_FRILLS
3667 case XTerm_locale: 3852 case XTerm_locale:
3668 if (query) 3853 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); 3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3670 else 3855 else
3671 { 3856 {
3672 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3673# ifdef USE_XIM 3859# ifdef USE_XIM
3674 im_cb (); 3860 im_cb ();
3675# endif 3861# endif
3676 } 3862 }
3677 break; 3863 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif 3864#endif
3689 3865
3690#ifdef MENUBAR 3866#ifdef MENUBAR
3691 case XTerm_Menu: 3867 case XTerm_Menu:
3692 if (Options & Opt_insecure) 3868 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3870 break;
3695#endif 3871#endif
3696#if 0 3872#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3873 case XTerm_dumpscreen: /* no error notices */
… …
3724{ 3900{
3725 int state; 3901 int state;
3726 3902
3727 if (mode == 's') 3903 if (mode == 's')
3728 { 3904 {
3729 SavedModes |= (PrivateModes & bit); 3905 SavedModes |= (priv_modes & bit);
3730 return -1; 3906 return -1;
3731 } 3907 }
3732 else 3908 else
3733 { 3909 {
3734 if (mode == 'r') 3910 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3911 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3912 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3913 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3914 PrivMode (state, bit);
3739 } 3915 }
3740 3916
3741 return state; 3917 return state;
3742} 3918}
… …
3760 { 3, PrivMode_132 }, 3936 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3937 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3938 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3939 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3940 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3942 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3943#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3944 { menuBar_esc, PrivMode_menuBar },
3768#endif 3945#endif
3946 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3948#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3949 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3950#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3951 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3952 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3953 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3954 // 45 margin bell NYI
3779 // 46 start logging 3955 // 46 start logging
… …
3820 3996
3821 /* extra handling for values with state unkept */ 3997 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3998 switch (arg[i])
3823 { 3999 {
3824 case 1048: /* alternative cursor save */ 4000 case 1048: /* alternative cursor save */
4001 case 1049:
3825 if (Options & Opt_secondaryScreen) 4002 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 4003 if (mode == 0)
3827 scr_cursor (RESTORE); 4004 scr_cursor (RESTORE);
3828 else if (mode == 1) 4005 else if (mode == 1)
3829 scr_cursor (SAVE); 4006 scr_cursor (SAVE);
3830 break; 4007 break;
… …
3841 * within VT52 mode 4018 * within VT52 mode
3842 */ 4019 */
3843 PrivMode (1, PrivMode_vt52); 4020 PrivMode (1, PrivMode_vt52);
3844 break; 4021 break;
3845 case 3: /* 80/132 */ 4022 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4023 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3848 break; 4025 break;
3849 case 4: /* smooth scrolling */ 4026 case 4: /* smooth scrolling */
3850 if (state) 4027 if (state)
3851 Options &= ~Opt_jumpScroll; 4028 options &= ~Opt_jumpScroll;
3852 else 4029 else
3853 Options |= Opt_jumpScroll; 4030 options |= Opt_jumpScroll;
3854 break; 4031 break;
3855 case 5: /* reverse video */ 4032 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4033 scr_rvideo_mode (state);
3857 break; 4034 break;
3858 case 6: /* relative/absolute origins */ 4035 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4039 scr_autowrap (state);
3863 break; 4040 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4041 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4042 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4043 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4044 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4045 break;
3869#ifdef menuBar_esc 4046#ifdef menuBar_esc
3870 case menuBar_esc: 4047 case menuBar_esc:
3871#ifdef MENUBAR 4048#ifdef MENUBAR
3872 map_menuBar (state); 4049 map_menuBar (state);
… …
3892 break; 4069 break;
3893 /* case 66: - application key pad */ 4070 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4071 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4072 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4073 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4074 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4075 break;
3899#if 0 4076#if 0
3900 case 1001: 4077 case 1001:
3901 break; /* X11 mouse highlighting */ 4078 break; /* X11 mouse highlighting */
3902#endif 4079#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4080 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4081 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4082 options &= ~Opt_scrollTtyOutput;
3906 else 4083 else
3907 Options |= Opt_scrollTtyOutput; 4084 options |= Opt_scrollTtyOutput;
3908 break; 4085 break;
3909 case 1011: /* scroll to bottom on key press */ 4086 case 1011: /* scroll to bottom on key press */
3910 if (state) 4087 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4088 options |= Opt_scrollTtyKeypress;
3912 else 4089 else
3913 Options &= ~Opt_scrollTtyKeypress; 4090 options &= ~Opt_scrollTtyKeypress;
3914 break; 4091 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4092 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4093 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4094 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4095 scr_erase_screen (2);
3919 scr_change_screen (state); 4096 scr_change_screen (state);
3920 break; 4097 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4098 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4099 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4100 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4101 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4102 scr_erase_screen (2);
3926 break; 4103 break;
3927 default: 4104 default:
3928 break; 4105 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4131 rendset = 0, rendstyle = ~RS_None;
3955 break; 4132 break;
3956 case 1: 4133 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4134 rendset = 1, rendstyle = RS_Bold;
3958 break; 4135 break;
3959 //case 2: // faint or second colour 4136 //case 2: // low intensity
4137 case 3:
4138 rendset = 1, rendstyle = RS_Italic;
4139 break;
3960 case 4: 4140 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4141 rendset = 1, rendstyle = RS_Uline;
3962 break; 4142 break;
3963 case 5: // slowly blinking 4143 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4144 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4156 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4157 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4158 //...
3979 //case 19: // ninth alt font 4159 //case 19: // ninth alt font
3980 //case 20: // gothic 4160 //case 20: // gothic
3981 case 21: // disable bold, faint 4161 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4162 rendset = 0, rendstyle = RS_Bold;
3983 break; 4163 break;
3984 case 22: 4164 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4165 rendset = 0, rendstyle = RS_Bold;
3986 break; 4166 break;
3987 //case 23: disable italic 4167 case 23: // disable italic
4168 rendset = 0, rendstyle = RS_Italic;
4169 break;
3988 case 24: 4170 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4171 rendset = 0, rendstyle = RS_Uline;
3990 break; 4172 break;
3991 case 25: 4173 case 25:
4174 rendset = 0, rendstyle = RS_Blink;
4175 break;
4176 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4177 rendset = 0, rendstyle = RS_Blink;
3993 break; 4178 break;
3994 case 27: 4179 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4180 rendset = 0, rendstyle = RS_RVid;
3996 break; 4181 break;
… …
4014 case 35: 4199 case 35:
4015 case 36: 4200 case 36:
4016 case 37: 4201 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4203 break;
4019#ifdef TTY_256COLOR 4204 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4206 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4208 i += 2;
4025 } 4209 }
4026 break; 4210 break;
4027#endif
4028 case 39: /* default fg */ 4211 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4212 scr_color (Color_fg, Color_fg);
4030 break; 4213 break;
4031 4214
4032 case 40: 4215 case 40:
… …
4037 case 45: 4220 case 45:
4038 case 46: 4221 case 46:
4039 case 47: 4222 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4223 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4224 break;
4042#ifdef TTY_256COLOR 4225 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4226 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4227 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4228 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4229 i += 2;
4048 } 4230 }
4049 break; 4231 break;
4050#endif
4051 case 49: /* default bg */ 4232 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4233 scr_color (Color_bg, Color_bg);
4053 break; 4234 break;
4235
4236 //case 50: // not variable spacing
4054 4237
4055#ifndef NO_BRIGHTCOLOR 4238#ifndef NO_BRIGHTCOLOR
4056 case 90: 4239 case 90:
4057 case 91: /* set bright fg color */ 4240 case 91: /* set bright fg color */
4058 case 92: 4241 case 92:
4059 case 93: 4242 case 93:
4060 case 94: 4243 case 94:
4061 case 95: 4244 case 95:
4062 case 96: 4245 case 96:
4063 case 97: 4246 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4247 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4248 break;
4067 case 100: 4249 case 100:
4068 case 101: /* set bright bg color */ 4250 case 101: /* set bright bg color */
4069 case 102: 4251 case 102:
4070 case 103: 4252 case 103:
4071 case 104: 4253 case 104:
4072 case 105: 4254 case 105:
4073 case 106: 4255 case 106:
4074 case 107: 4256 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4258 break;
4078#endif 4259#endif
4079 4260
4080 } 4261 }
4081 } 4262 }
… …
4088{ 4269{
4089 unicode_t ch, cmd = cmd_getc (); 4270 unicode_t ch, cmd = cmd_getc ();
4090 4271
4091 if (cmd == 'Q') 4272 if (cmd == 'Q')
4092 { /* query graphics */ 4273 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4274 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4275 return;
4095 } 4276 }
4096 /* swallow other graphics sequences until terminating ':' */ 4277 /* swallow other graphics sequences until terminating ':' */
4097 do 4278 do
4098 ch = cmd_getc (); 4279 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4294 unsigned char buf[256];
4114 4295
4115 va_start (arg_ptr, fmt); 4296 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4298 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4299 tt_write (buf, strlen (buf));
4119} 4300}
4120 4301
4121/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4303/* 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. 4304 * or generated by us in response to a query ESC sequence.
4124 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
4125void 4308void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4310{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4311 if (v_buflen == 0)
4312 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4129 4314
4130 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
4131 { 4320 }
4321
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4323
4324 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len;
4326
4327 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328}
4329
4330void rxvt_term::pty_write ()
4331{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333
4334 if (written > 0)
4335 {
4336 v_buflen -= written;
4337
4132 if (v_buflen == 0) 4338 if (v_buflen == 0)
4133 { 4339 {
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); 4340 free (v_buffer);
4161 v_buffer = 0; 4341 v_buffer = 0;
4162 v_buflen = 0; 4342 v_buflen = 0;
4163 4343
4164 pty_ev.set (EVENT_READ); 4344 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; 4345 return;
4177 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
4179} 4353}
4180 4354
4181/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
4182 4356

Diff Legend

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