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

Diff Legend

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