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

Diff Legend

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