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

Diff Legend

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