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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= TermWin.ncol
141 || y < 0 || y >= TermWin.nrow)
142 return;
143
144 for (;;)
145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54;
153 break;
154 }
155
156 x--;
157 }
158
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2;
169 int len;
170
171#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch))
173 {
174 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr);
177 }
178 else
179#endif
180 {
181 ch2 = ch;
182
183 alloc = 0;
184 chr = &ch2;
185 len = 1;
186 }
187
188 int width = strlen (f->name);
189
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193
194 for (int y = 0; y < len; y++)
195 {
196 char buf[9];
197
198 ch = *chr++;
199
200 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '=');
203#if !UNICODE3
204 if (ch >= 0x10000)
205 ch = 0xfffd;
206#endif
207 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r);
209 }
210
211 scr_overlay_set (0, len, f->name);
212
213#if ENABLE_COMBINING
214 if (alloc)
215 delete [] alloc;
216#endif
217}
218#endif
219
220void
221rxvt_term::commit_iso14755 ()
222{
223 wchar_t ch[2];
224
225 ch[0] = iso14755buf & ISO_14755_MASK;
226 ch[1] = 0;
227
228 if (iso14755buf & ISO_14755_51)
229 {
230 char mb[16];
231 int len;
232
233 // allow verbatim 0-bytes and control-bytes to be entered
234 if (ch[0] >= 0x20)
235 len = wcstombs (mb, ch, 16);
236 else
237 {
238 mb[0] = ch[0];
239 len = 1;
240 }
241
242 if (len > 0)
243 tt_write ((unsigned char *)mb, len);
244 else
245 scr_bell ();
246 }
247
248 iso14755buf = 0;
249}
250
251int
252rxvt_term::hex_keyval (XKeyEvent &ev)
253{
254 // check wether this event corresponds to a hex digit
255 // if the modifiers had not been pressed.
256 for (int index = 0; index < 8; index++)
257 {
258 KeySym k = XLookupKeysym (&ev, index);
259
260 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
261 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
262 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
263 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
264 }
265
266 return -1;
267}
268#endif
61 269
62/*{{{ Convert the keypress event into a string */ 270/*{{{ Convert the keypress event into a string */
63void 271void
64rxvt_term::lookup_key (XKeyEvent &ev) 272rxvt_term::lookup_key (XKeyEvent &ev)
65{ 273{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
78 * 286 *
79 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
80 */ 288 */
81 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
84 292
85 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
86 { 294 {
87 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 316
109 // the XOpenIM manpage lies about hardcoding the locale 317 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 318 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 319 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 320 SET_LOCALE (rs[Rs_imLocale]);
321
113 // assume wchar_t == unicode or better 322 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 323 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 324 KBUFSZ, &keysym, &status_return);
325
116 if (rs[Rs_imLocale]) 326 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 327 SET_LOCALE (locale);
118 328
119 if (status_return == XLookupChars 329 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 330 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 357 valid_keysym = keysym != NoSymbol;
148 } 358 }
149 359
150 if (valid_keysym) 360 if (valid_keysym)
151 { 361 {
362#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state))
364 return;
365#endif
366
152 if (TermWin.saveLines) 367 if (TermWin.saveLines)
153 { 368 {
154#ifdef UNSHIFTED_SCROLLKEYS 369#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 370 if (!ctrl && !meta)
156 {
157#else 371#else
158 if (IS_SCROLL_MOD) 372 if (IS_SCROLL_MOD)
373#endif
159 { 374 {
160#endif
161 int lnsppg; 375 int lnsppg;
162 376
163#ifdef PAGING_CONTEXT_LINES 377#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 379#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 428 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 429 {
216 keysym += (XK_F11 - XK_F1); 430 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 431 shft = 0; /* turn off Shift */
218 } 432 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 433 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 434 {
221 switch (keysym) 435 switch (keysym)
222 { 436 {
223 /* normal XTerm key bindings */ 437 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 438 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 439 selection_request (ev.time, 0, 0);
226 return; 440 return;
441#if TODO
227 /* rxvt extras */ 442 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 443 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 444 change_font (FONT_UP);
230 return; 445 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 446 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 447 change_font (FONT_DN);
233 return; 448 return;
449#endif
234 } 450 }
235 } 451 }
236 } 452 }
237#ifdef PRINTPIPE 453
238 if (keysym == XK_Print) 454#if ENABLE_FRILLS || ISO_14755
239 { 455 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 456 if (shft && ctrl)
241 return;
242 } 457 {
243#endif 458 int hv;
244 459
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 460 if (iso14755buf & ISO_14755_51
246 { 461 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 462 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 463 {
250 unsigned int l; 464 commit_iso14755 ();
251 const unsigned char *kbuf0; 465 iso14755buf = ISO_14755_51;
252 466# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 467 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 468# endif
261 ) 469 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 470 }
266 471 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 472 {
473 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
474 | hv | ISO_14755_51;
475# if ISO_14755
476 iso14755_51 (iso14755buf & ISO_14755_MASK);
477# endif
268 return; 478 return;
269 } 479 }
270 else 480 else
481 {
482# if ENABLE_OVERLAY
483 scr_overlay_off ();
271#endif 484# endif
485 iso14755buf = 0;
486 }
487 }
488 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
489 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
490 if (!(iso14755buf & ISO_14755_STARTED))
491 {
492 iso14755buf |= ISO_14755_STARTED;
493# if ENABLE_OVERLAY
494 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
495 scr_overlay_set (0, 0, "ISO 14755 mode");
496# endif
497 }
498#endif
499
500#ifdef PRINTPIPE
501 if (keysym == XK_Print)
502 {
503 scr_printscreen (ctrl | shft);
504 return;
505 }
506#endif
507
508 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
509 {
272 { 510 {
273 newlen = 1; 511 newlen = 1;
274 switch (keysym) 512 switch (keysym)
275 { 513 {
276#ifndef NO_BACKSPACE_KEY 514#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 515 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 516 if (priv_modes & PrivMode_HaveBackSpace)
279 { 517 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 518 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 519 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 520 kbuf[1] = '\0';
283 } 521 }
284 else 522 else
285 STRCPY (kbuf, key_backspace); 523 strcpy (kbuf, key_backspace);
286 break; 524 break;
287#endif 525#endif
288#ifndef NO_DELETE_KEY 526#ifndef NO_DELETE_KEY
527# ifdef XK_KP_Prior
528 case XK_KP_Delete:
529 /* allow shift to override */
530 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 {
532 strcpy (kbuf, "\033On");
533 break;
534 }
535 /* FALLTHROUGH */
536# endif
289 case XK_Delete: 537 case XK_Delete:
290 STRCPY (kbuf, key_delete); 538 strcpy (kbuf, key_delete);
291 break; 539 break;
292#endif 540#endif
293 case XK_Tab: 541 case XK_Tab:
294 if (shft) 542 if (shft)
295 STRCPY (kbuf, "\033[Z"); 543 strcpy (kbuf, "\033[Z");
296 else 544 else
297 { 545 {
298#ifdef CTRL_TAB_MAKES_META 546#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 547 if (ctrl)
300 meta = 1; 548 meta = 1;
… …
306 newlen = 0; 554 newlen = 0;
307 } 555 }
308 break; 556 break;
309 557
310#ifdef XK_KP_Left 558#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 559 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 560 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 561 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 562 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 563 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 564 {
317 STRCPY (kbuf, "\033OZ"); 565 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 566 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 567 break;
320 } 568 }
321 else 569 else
322 /* translate to std. cursor key */ 570 /* translate to std. cursor key */
… …
325#endif 573#endif
326 case XK_Up: /* "\033[A" */ 574 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 575 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 576 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 577 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 578 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 579 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 580 /* do Shift first */
333 if (shft) 581 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 582 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 583 else if (ctrl)
336 { 584 {
337 kbuf[1] = 'O'; 585 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 586 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 587 }
340 else if (PrivateModes & PrivMode_aplCUR) 588 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 589 kbuf[1] = 'O';
342 break; 590 break;
343 591
344#ifndef UNSHIFTED_SCROLLKEYS 592#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 593# ifdef XK_KP_Prior
346 case XK_KP_Prior: 594 case XK_KP_Prior:
347 /* allow shift to override */ 595 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 596 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 597 {
350 STRCPY (kbuf, "\033Oy"); 598 strcpy (kbuf, "\033Oy");
351 break; 599 break;
352 } 600 }
353 /* FALLTHROUGH */ 601 /* FALLTHROUGH */
354# endif 602# endif
355 case XK_Prior: 603 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 604 strcpy (kbuf, "\033[5~");
357 break; 605 break;
358# ifdef XK_KP_Next 606# ifdef XK_KP_Next
359 case XK_KP_Next: 607 case XK_KP_Next:
360 /* allow shift to override */ 608 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 609 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 610 {
363 STRCPY (kbuf, "\033Os"); 611 strcpy (kbuf, "\033Os");
364 break; 612 break;
365 } 613 }
366 /* FALLTHROUGH */ 614 /* FALLTHROUGH */
367# endif 615# endif
368 case XK_Next: 616 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 617 strcpy (kbuf, "\033[6~");
370 break; 618 break;
371#endif 619#endif
372 case XK_KP_Enter: 620 case XK_KP_Enter:
373 /* allow shift to override */ 621 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 623 {
376 STRCPY (kbuf, "\033OM"); 624 strcpy (kbuf, "\033OM");
625 break;
626 }
627
628 /* FALLTHROUGH */
629
630 case XK_Return:
631 if (priv_modes & PrivMode_LFNL)
632 {
633 kbuf[0] = '\015';
634 kbuf[1] = '\012';
635 kbuf[2] = '\0';
377 } 636 }
378 else 637 else
379 { 638 {
380 kbuf[0] = '\r'; 639 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 640 kbuf[1] = '\0';
382 } 641 }
383 break; 642 break;
384 643
385#ifdef XK_KP_Begin 644#ifdef XK_KP_Begin
386 case XK_KP_Begin: 645 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 646 strcpy (kbuf, "\033Ou");
388 break; 647 break;
389 648
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 649#endif
398 case XK_KP_F1: /* "\033OP" */ 650 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 651 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 652 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 653 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 654 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 655 kbuf[2] += (keysym - XK_KP_F1);
404 break; 656 break;
405 657
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 658 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 659 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 670 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 671 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 672 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 673 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 674 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 675 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 676 {
425 STRCPY (kbuf, "\033Oj"); 677 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 678 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 679 }
428 else 680 else
429 { 681 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 682 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 683 kbuf[1] = '\0';
432 } 684 }
433 break; 685 break;
434 686
435 case XK_Find: 687 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 688 strcpy (kbuf, "\033[1~");
437 break; 689 break;
690
691#ifdef XK_KP_End
692 case XK_KP_Insert:
693 /* allow shift to override */
694 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
695 {
696 strcpy (kbuf, "\033Op");
697 break;
698 }
699 /* FALLTHROUGH */
700#endif
438 case XK_Insert: 701 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 702 strcpy (kbuf, "\033[2~");
440 break; 703 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 704#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 705 case DXK_Remove:
443 /* FALLTHROUGH */ 706 /* FALLTHROUGH */
444#endif 707#endif
445 case XK_Execute: 708 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 709 strcpy (kbuf, "\033[3~");
447 break; 710 break;
448 case XK_Select: 711 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 712 strcpy (kbuf, "\033[4~");
450 break; 713 break;
451#ifdef XK_KP_End 714#ifdef XK_KP_End
452 case XK_KP_End: 715 case XK_KP_End:
453 /* allow shift to override */ 716 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 718 {
456 STRCPY (kbuf, "\033Oq"); 719 strcpy (kbuf, "\033Oq");
457 break; 720 break;
458 } 721 }
459 /* FALLTHROUGH */ 722 /* FALLTHROUGH */
460#endif 723#endif
461 case XK_End: 724 case XK_End:
462 STRCPY (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
463 break; 726 break;
464#ifdef XK_KP_Home 727#ifdef XK_KP_Home
465 case XK_KP_Home: 728 case XK_KP_Home:
466 /* allow shift to override */ 729 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 730 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 731 {
469 STRCPY (kbuf, "\033Ow"); 732 strcpy (kbuf, "\033Ow");
470 break; 733 break;
471 } 734 }
472 /* FALLTHROUGH */ 735 /* FALLTHROUGH */
473#endif 736#endif
474 case XK_Home: 737 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 738 strcpy (kbuf, KS_HOME);
476 break; 739 break;
477 740
478#define FKEY(n, fkey) \ 741#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 742 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 743
… …
532#undef FKEY 795#undef FKEY
533 default: 796 default:
534 newlen = 0; 797 newlen = 0;
535 break; 798 break;
536 } 799 }
800
537 if (newlen) 801 if (newlen)
538 len = STRLEN (kbuf); 802 len = strlen (kbuf);
539 } 803 }
540 804
541 /* 805 /*
542 * Pass meta for all function keys, if 'meta' option set 806 * Pass meta for all function keys, if 'meta' option set
543 */ 807 */
… …
550 else if (ctrl && keysym == XK_minus) 814 else if (ctrl && keysym == XK_minus)
551 { 815 {
552 len = 1; 816 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 817 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 818 }
819 else if (keysym == XK_ISO_Left_Tab)
820 {
821 strcpy (kbuf, "\033[Z");
822 len = 3;
823 }
555 else 824 else
556 { 825 {
557#ifdef META8_OPTION 826#ifdef META8_OPTION
558 /* set 8-bit on */ 827 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 828 if (meta && (meta_char == 0x80))
… …
571 } 840 }
572 841
573 if (len <= 0) 842 if (len <= 0)
574 return; /* not mapped */ 843 return; /* not mapped */
575 844
576 if (Options & Opt_scrollTtyKeypress) 845 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 846 if (TermWin.view_start)
578 { 847 {
579 TermWin.view_start = 0; 848 TermWin.view_start = 0;
580 want_refresh = 1; 849 want_refresh = 1;
581 } 850 }
… …
617#endif /* DEBUG_CMD */ 886#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 887 tt_write (kbuf, (unsigned int)len);
619} 888}
620/*}}} */ 889/*}}} */
621 890
622#if (MENUBAR_MAX) 891#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 892/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 893/* attempt to `write' count to the input buffer */
625unsigned int 894unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 895rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 896{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 899 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 900 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 901
633 if (n > 0 && s < count) 902 if (n > 0 && s < count)
634 { 903 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 904 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 905 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 906 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 907 cmdbuf_endp -= n;
639 s += n; 908 s += n;
640 } 909 }
… …
650 919
651 cmd_parse (); 920 cmd_parse ();
652 921
653 return 0; 922 return 0;
654} 923}
655#endif /* MENUBAR_MAX */ 924#endif
656 925
657void 926void
658rxvt_term::flush () 927rxvt_term::flush ()
659{ 928{
929 flush_ev.stop ();
930
660#ifdef TRANSPARENT 931#ifdef TRANSPARENT
661 if (want_full_refresh) 932 if (want_full_refresh)
662 { 933 {
663 want_full_refresh = 0; 934 want_full_refresh = 0;
664 scr_clear (); 935 scr_clear ();
665 scr_touch (false); 936 scr_touch (false);
666 want_refresh = 1;
667 } 937 }
668#endif 938#endif
669 939
670 if (want_refresh) 940 if (want_refresh)
671 { 941 {
672 scr_refresh (refresh_type); 942 scr_refresh (refresh_type);
673 scrollbar_show (1); 943 scrollbar_show (1);
674#ifdef USE_XIM 944#ifdef USE_XIM
675 IMSendSpot (); 945 IMSendSpot ();
676#endif 946#endif
677
678 } 947 }
679 948
680 display->flush (); 949 display->flush ();
681} 950}
682 951
… …
684rxvt_term::check_cb (check_watcher &w) 953rxvt_term::check_cb (check_watcher &w)
685{ 954{
686 SET_R (this); 955 SET_R (this);
687 SET_LOCALE (locale); 956 SET_LOCALE (locale);
688 957
958 display->flush ();
959
960 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01);
962}
963
964void
965rxvt_term::flush_cb (time_watcher &w)
966{
967 SET_R (this);
968 SET_LOCALE (locale);
969
970 refresh_limit = 1;
971 refresh_count = 0;
689 flush (); 972 flush ();
690} 973}
691 974
692#ifdef CURSOR_BLINK 975#ifdef CURSOR_BLINK
693void 976void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 994 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 995 }
713} 996}
714#endif 997#endif
715 998
999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1000void
1001rxvt_term::cont_scroll_cb (time_watcher &w)
1002{
1003 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1004 scr_page (scrollbar_isUp() ? UP : DN, 1))
1005 {
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 }
1010}
1011#endif
1012
1013#ifdef SELECTION_SCROLLING
1014void
1015rxvt_term::sel_scroll_cb (time_watcher &w)
1016{
1017 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1018 {
1019 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1020 refresh_type |= SMOOTH_REFRESH;
1021 want_refresh = 1;
1022 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1023 }
1024}
1025#endif
1026
1027#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1028void
1029rxvt_term::slip_wheel_cb (time_watcher &w)
1030{
1031 if (mouse_slip_wheel_speed == 0
1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1033 : scr_page (UP, mouse_slip_wheel_speed))
1034 {
1035 if (TermWin.view_start == TermWin.nscrolled ||
1036 TermWin.view_start == 0)
1037 mouse_slip_wheel_speed = 0;
1038
1039 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1042 }
1043}
1044#endif
1045
716bool 1046bool
717rxvt_term::pty_fill () 1047rxvt_term::pty_fill ()
718{ 1048{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1050
1051 if (CBUFSIZ == n)
1052 {
1053 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1054 n = 0;
1055 }
720 1056
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1057 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1058 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1059 cmdbuf_endp = cmdbuf_ptr + n;
724 1060
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1062
727 if (n > 0) 1063 if (n > 0)
728 { 1064 {
729 cmdbuf_endp += n; 1065 cmdbuf_endp += n;
730 return true; 1066 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1075rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1076{
741 SET_R (this); 1077 SET_R (this);
742 SET_LOCALE (locale); 1078 SET_LOCALE (locale);
743 1079
1080 if (revents & EVENT_READ)
1081 // loop, but don't allow a single term to monopolize us
1082 while (pty_fill ())
1083 if (cmd_parse ())
1084 break;
1085
744 if (revents & EVENT_WRITE) 1086 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1087 pty_write ();
746 else if (revents & EVENT_READ) 1088}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1089
760 if (cmd_parse ()) 1090void
761 break; 1091rxvt_term::pointer_unblank ()
762 } 1092{
763 } 1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1094 recolour_cursor ();
1095
1096#ifdef POINTER_BLANK
1097 hidden_pointer = 0;
1098
1099 if (options & Opt_pointerBlank)
1100 pointer_ev.start (NOW + pointerBlankDelay);
1101#endif
764} 1102}
765 1103
766#ifdef POINTER_BLANK 1104#ifdef POINTER_BLANK
767void 1105void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1106rxvt_term::pointer_blank ()
781{ 1107{
782 if (! (Options & Opt_pointerBlank)) 1108 if (! (options & Opt_pointerBlank))
783 return; 1109 return;
784 1110
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
786 XFlush (display->display); 1112 XFlush (display->display);
787 1113
788 hidden_pointer = 1; 1114 hidden_pointer = 1;
789} 1115}
790 1116
… …
807 x = ev.x; 1133 x = ev.x;
808 y = ev.y; 1134 y = ev.y;
809 pixel_position (&x, &y); 1135 pixel_position (&x, &y);
810 1136
811 if (MEvent.button == AnyButton) 1137 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1138 button_number = 3;
814 }
815 else 1139 else
816 { 1140 {
817 button_number = MEvent.button - Button1; 1141 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1142 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1143 if (button_number >= 3)
820 button_number += (64 - 3); 1144 button_number += (64 - 3);
821 } 1145 }
822 1146
823 if (PrivateModes & PrivMode_MouseX10) 1147 if (priv_modes & PrivMode_MouseX10)
824 { 1148 {
825 /* 1149 /*
826 * do not report ButtonRelease 1150 * do not report ButtonRelease
827 * no state info allowed 1151 * no state info allowed
828 */ 1152 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1167 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1168 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1169#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1170 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1171#endif
848
849 } 1172 }
850 1173
851#ifdef DEBUG_MOUSEREPORT 1174#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1175 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1176 if (key_state & 16)
854 fputc ('C', stderr); 1177 fputc ('C', stderr);
855 if (key_state & 4) 1178 if (key_state & 4)
856 fputc ('S', stderr); 1179 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1183 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1184 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1185 button_number,
863 x + 1, 1186 x + 1,
864 y + 1); 1187 y + 1);
865#else 1188#endif
1189
866 tt_printf ("\033[M%c%c%c", 1190 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1191 (32 + button_number + key_state),
868 (32 + x + 1), 1192 (32 + x + 1),
869 (32 + y + 1)); 1193 (32 + y + 1));
870#endif
871} 1194}
872 1195
873#ifdef USING_W11LIB 1196#ifdef USING_W11LIB
874void 1197void
875rxvt_W11_process_x_event (XEvent *ev) 1198rxvt_W11_process_x_event (XEvent *ev)
… …
882 1205
883/*{{{ process an X event */ 1206/*{{{ process an X event */
884void 1207void
885rxvt_term::x_cb (XEvent &ev) 1208rxvt_term::x_cb (XEvent &ev)
886{ 1209{
1210 dDisp;
1211
887 SET_R (this); 1212 SET_R (this);
888 SET_LOCALE (locale); 1213 SET_LOCALE (locale);
889 1214
890#if defined(CURSOR_BLINK) 1215#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1217 {
893 if (hidden_cursor) 1218 if (hidden_cursor)
894 { 1219 {
895 hidden_cursor = 0; 1220 hidden_cursor = 0;
896 want_refresh = 1; 1221 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1225 }
901#endif 1226#endif
902 1227
903#if defined(POINTER_BLANK) 1228#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1230 {
906 if (ev.type == MotionNotify 1231 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1232 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1233 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1234 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1237 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1238 pointer_blank ();
914 } 1239 }
915#endif 1240#endif
916 1241
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1242 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1243 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1244 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1245
975 switch (ev.type) 1246 switch (ev.type)
976 { 1247 {
977 case KeyPress: 1248 case KeyPress:
1249#if ISO_14755
1250 if (!(iso14755buf & ISO_14755_52))
1251#endif
978 lookup_key (ev.xkey); 1252 lookup_key (ev.xkey);
1253
1254 break;
1255
1256 case KeyRelease:
1257 {
1258#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1259 KeySym ks;
1260
1261 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1262#endif
1263
1264#if ENABLE_FRILLS || ISO_14755
1265 // ISO 14755 support
1266 if (iso14755buf)
1267 if (iso14755buf & ISO_14755_52)
1268 {
1269# if ENABLE_OVERLAY
1270 scr_overlay_off ();
1271# endif
1272# if ISO_14755
1273 // iso14755 part 5.2 handling: release time
1274 // first: controls
1275 if ((ev.xkey.state & ControlMask)
1276 && ((ks >= 0x40 && ks <= 0x5f)
1277 || (ks >= 0x61 && ks <= 0x7f)))
1278 {
1279 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1280 commit_iso14755 ();
1281 return; // case-break;
1282 }
1283
1284 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1285 if (i[0] == ks)
1286 {
1287 iso14755buf = ISO_14755_51 | i[1];
1288 commit_iso14755 ();
1289 return; // case-break;
1290 }
1291
1292 scr_bell ();
1293# endif
1294 iso14755buf = 0;
979 break; 1295 break;
1296 }
1297 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1298 {
1299# if ENABLE_OVERLAY
1300 scr_overlay_off ();
1301# endif
1302 if (iso14755buf & ISO_14755_51)
1303 commit_iso14755 ();
1304#if ISO_14755
1305 else if (iso14755buf & ISO_14755_STARTED)
1306 {
1307 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1308
1309 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1310 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1311 }
1312# endif
1313 else
1314 iso14755buf = 0;
1315 }
1316#endif
980 1317
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1318#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1319 if (!(ev.xkey.state & ControlMask))
1320 slip_wheel_ev.stop ();
1321 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1322 mouse_slip_wheel_speed = 0;
986 else 1323#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1324 break;
995 } 1325 }
996#endif
997 1326
998 case ButtonPress: 1327 case ButtonPress:
999 button_press (ev.xbutton); 1328 button_press (ev.xbutton);
1000 break; 1329 break;
1001 1330
… …
1003 button_release (ev.xbutton); 1332 button_release (ev.xbutton);
1004 break; 1333 break;
1005 1334
1006 case ClientMessage: 1335 case ClientMessage:
1007 if (ev.xclient.format == 32 1336 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1338 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1340 destroy ();
1341#if ENABLE_EWMH
1342 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1343 XSendEvent (disp, ev.xclient.window = display->root,
1344 False, SubstructureRedirectMask | SubstructureNotifyMask,
1345 &ev);
1346#endif
1347 }
1348#if ENABLE_XEMBED
1349 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1350 {
1351 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1352 focus_in ();
1353 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1354 focus_out ();
1355 }
1356#endif
1010#ifdef OFFIX_DND 1357#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1358 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1359 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1360 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1361 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1362 || ev.xclient.data.l[0] == DndLink))
1016 { 1363 {
1017 /* Get Dnd data */ 1364 /* Get Dnd data */
1018 Atom ActualType; 1365 Atom ActualType;
1019 int ActualFormat; 1366 int ActualFormat;
1020 unsigned char *data; 1367 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1368 unsigned long Size, RemainingBytes;
1022 1369
1023 XGetWindowProperty (display->display, display->root, 1370 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1371 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1372 0L, 1000000L,
1026 False, AnyPropertyType, 1373 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1374 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1375 &Size, &RemainingBytes,
1029 &data); 1376 &data);
1030 XChangeProperty (display->display, display->root, 1377 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1378 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1379 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1380 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1381 }
1037#endif /* OFFIX_DND */ 1382#endif /* OFFIX_DND */
1038 break; 1383 break;
1039 1384
1040 case MappingNotify: 1385 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1386 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1387 break;
1043 1388
1044 /* 1389 /*
1045 * XXX: this is not the _current_ arrangement 1390 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1391 * Here's my conclusion:
… …
1065 break; 1410 break;
1066 } 1411 }
1067 break; 1412 break;
1068 1413
1069 case FocusIn: 1414 case FocusIn:
1070 if (!TermWin.focus) 1415 focus_in ();
1071 {
1072 TermWin.focus = 1;
1073 want_refresh = 1;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082
1083 }
1084 break; 1416 break;
1085 1417
1086 case FocusOut: 1418 case FocusOut:
1087 if (TermWin.focus) 1419 focus_out ();
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break; 1420 break;
1103 1421
1104 case ConfigureNotify: 1422 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1423 if (ev.xconfigure.window == TermWin.parent[0])
1106 { 1424 {
… …
1110 { /* Wrap lots of configures into one */ 1428 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width; 1429 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height; 1430 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1432 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1434
1117 if (szHint.width != width || szHint.height != height) 1435 if (szHint.width != width || szHint.height != height)
1118 { 1436 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1437 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1438 resize_all_windows (width, height, 1);
1121 } 1439 }
1122#ifdef DEBUG_SIZE 1440
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1442 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1443 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1444#endif
1136
1137 } 1445 }
1446 break;
1447
1448 case PropertyNotify:
1449 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1450 && ev.xproperty.state == PropertyNewValue)
1451 selection_property (ev.xproperty.window, ev.xproperty.atom);
1452
1138 break; 1453 break;
1139 1454
1140 case SelectionClear: 1455 case SelectionClear:
1141 selection_clear (); 1456 selection_clear ();
1142 break; 1457 break;
1143 1458
1144 case SelectionNotify: 1459 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1460 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1461 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1462 break;
1149 1463
1150 case SelectionRequest: 1464 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1465 selection_send (ev.xselectionrequest);
1152 break; 1466 break;
… …
1173 1487
1174 case GraphicsExpose: 1488 case GraphicsExpose:
1175 case Expose: 1489 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1490 if (ev.xany.window == TermWin.vt)
1177 { 1491 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1492 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1493 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1494 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1496
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1502
1186 // ev.xexpose.width, TermWin.height, False); 1503 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1504 }
1190 else 1505 else
1191 { 1506 {
1192 XEvent unused_event; 1507 XEvent unused_event;
1193 1508
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1510 ;
1196 &unused_event)) ; 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1512 ;
1198 GraphicsExpose, 1513
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1514 if (isScrollbarWindow (ev.xany.window))
1201 { 1515 {
1202 scrollBar.setIdle (); 1516 scrollBar.setIdle ();
1203 scrollbar_show (0); 1517 scrollbar_show (0);
1204 } 1518 }
1205#ifdef MENUBAR 1519#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1521 menubar_expose ();
1208#endif 1522#endif
1523
1524#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0])
1526 XClearWindow (disp, ev.xany.window);
1527#endif
1209 } 1528 }
1210 break; 1529 break;
1211 1530
1212 case MotionNotify: 1531 case MotionNotify:
1213#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
… …
1219 { 1538 {
1220 menubar_control (ev.xbutton); 1539 menubar_control (ev.xbutton);
1221 break; 1540 break;
1222 } 1541 }
1223#endif 1542#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1544 break;
1226 1545
1227 if (ev.xany.window == TermWin.vt) 1546 if (ev.xany.window == TermWin.vt)
1228 { 1547 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1548 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1549 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1232 ; 1551 ;
1233 1552
1234 XQueryPointer (display->display, TermWin.vt, 1553 XQueryPointer (disp, TermWin.vt,
1235 &unused_root, &unused_child, 1554 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1555 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1556 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1557 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1558#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1559 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1560 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1561 {
1243#endif 1562#endif
1563#if ISO_14755
1564 // 5.4
1565 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1566 {
1567 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1568 break;
1569 }
1570#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1571 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1572 ev.xbutton.state & Button3Mask ? 2 : 0);
1573
1246#ifdef SELECTION_SCROLLING 1574#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1575 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1577 {
1250 int dist; 1578 int dist;
1251 1579
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1580 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1581 * already in the middle of scrolling.
1256 */ 1582 */
1257 if (scroll_selection_delay<=0) 1583 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1584 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1585
1260 /* save the event params so we can highlight 1586 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1587 * the selection in the pending-scroll loop
1262 */ 1588 */
1263 selection_save_x=ev.xbutton.x; 1589 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1590 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1592
1268 /* calc number of lines to scroll */ 1593 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1594 if (ev.xbutton.y < TermWin.int_bwidth)
1270 { 1595 {
1271 scroll_selection_dir = UP; 1596 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1597 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1598 }
1274 else 1599 else
1275 { 1600 {
1276 scroll_selection_dir = DN; 1601 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1603 }
1604
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1605 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1606 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1;
1282 MIN_IT (scroll_selection_lines, 1608 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1609 SELECTION_SCROLL_MAX_LINES);
1284 } 1610 }
1285 else 1611 else
1286 { 1612 {
1287 /* we are within the text window, so we 1613 /* we are within the text window, so we
1288 * shouldn't be scrolling 1614 * shouldn't be scrolling
1289 */ 1615 */
1290 pending_scroll_selection = 0; 1616 if (sel_scroll_ev.active)
1617 sel_scroll_ev.stop();
1291 } 1618 }
1292#endif 1619#endif
1293#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1294
1295 } 1621 }
1296#endif 1622#endif
1297
1298 } 1623 }
1299 } 1624 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1626 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1627 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1628 MotionNotify, &ev))
1629 ;
1630
1304 XQueryPointer (display->display, scrollBar.win, 1631 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1634 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1635 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1637 scrollbar_size ());
1311 scr_refresh (refresh_type); 1638 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1639 refresh_limit = 0;
… …
1315 break; 1642 break;
1316 } 1643 }
1317} 1644}
1318 1645
1319void 1646void
1647rxvt_term::focus_in ()
1648{
1649 if (!TermWin.focus)
1650 {
1651 TermWin.focus = 1;
1652 want_refresh = 1;
1653#ifdef USE_XIM
1654 if (Input_Context != NULL)
1655 {
1656 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context);
1658 }
1659#endif
1660#ifdef CURSOR_BLINK
1661 if (options & Opt_cursorBlink)
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif
1664#ifdef OFF_FOCUS_FADING
1665 if (rs[Rs_fade])
1666 {
1667 pix_colors = pix_colors_focused;
1668 scr_recolour ();
1669 }
1670#endif
1671 }
1672}
1673
1674void
1675rxvt_term::focus_out ()
1676{
1677 if (TermWin.focus)
1678 {
1679 TermWin.focus = 0;
1680 want_refresh = 1;
1681
1682#if ENABLE_FRILLS || ISO_14755
1683 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY
1686 scr_overlay_off ();
1687#endif
1688#ifdef USE_XIM
1689 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context);
1691#endif
1692#ifdef CURSOR_BLINK
1693 if (options & Opt_cursorBlink)
1694 cursor_blink_ev.stop ();
1695 hidden_cursor = 0;
1696#endif
1697#ifdef OFF_FOCUS_FADING
1698 if (rs[Rs_fade])
1699 {
1700 pix_colors = pix_colors_unfocused;
1701 scr_recolour ();
1702 }
1703#endif
1704 }
1705}
1706
1707#if TRANSPARENT
1708void
1320rxvt_term::rootwin_cb (XEvent &ev) 1709rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1710{
1322 SET_R (this); 1711 SET_R (this);
1323 SET_LOCALE (locale); 1712 SET_LOCALE (locale);
1324 1713
1325 switch (ev.type) 1714 switch (ev.type)
1326 { 1715 {
1327 case PropertyNotify: 1716 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1717 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1718 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1719 * use the property to determine the pixmap. We use it later on.
1340 */ 1720 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1721 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1723 return;
1346 }
1347 1724
1348 /* FALLTHROUGH */ 1725 /* FALLTHROUGH */
1349 case ReparentNotify: 1726 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1728 want_refresh = want_full_refresh = 1;
1353 break; 1729 break;
1354#endif
1355 } 1730 }
1356} 1731}
1732#endif
1357 1733
1358void 1734void
1359rxvt_term::button_press (XButtonEvent &ev) 1735rxvt_term::button_press (XButtonEvent &ev)
1360{ 1736{
1361 int reportmode = 0, clickintime; 1737 int reportmode = 0, clickintime;
1362 1738
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1740 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1741 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742
1366 /* 1743 /*
1367 * VT window processing of button press 1744 * VT window processing of button press
1368 */ 1745 */
1369 if (ev.window == TermWin.vt) 1746 if (ev.window == TermWin.vt)
1370 { 1747 {
1748#if ISO_14755
1749 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 {
1752 iso14755_54 (ev.x, ev.y);
1753 return;
1754 }
1755#endif
1756
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1757 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1758
1372 if (reportmode) 1759 if (reportmode)
1373 { 1760 {
1374 /* mouse report from vt window */ 1761 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1762 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1763 MEvent.state = ev.state;
… …
1405 } 1792 }
1406 else 1793 else
1407 { 1794 {
1408 if (ev.button != MEvent.button) 1795 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1796 MEvent.clicks = 0;
1797
1410 switch (ev.button) 1798 switch (ev.button)
1411 { 1799 {
1412 case Button1: 1800 case Button1:
1801 /* allow meta + click to select rectangular areas */
1802 /* should be done in screen.C */
1803#if ENABLE_FRILLS
1804 selection.rect = !!(ev.state & ModMetaMask);
1805#else
1806 selection.rect = false;
1807#endif
1808
1413 /* allow shift+left click to extend selection */ 1809 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1811 {
1416 if (MEvent.button == Button1 && clickintime) 1812 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1813 selection_rotate (ev.x, ev.y);
1418 else 1814 else
1419 selection_extend (ev.x, ev.y, 1); 1815 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1830 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1831 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1832 selection_rotate (ev.x, ev.y);
1437 else 1833 else
1438 selection_extend (ev.x, ev.y, 1); 1834 selection_extend (ev.x, ev.y, 1);
1835
1439 MEvent.button = Button3; 1836 MEvent.button = Button3;
1440 break; 1837 break;
1441 } 1838 }
1442 } 1839 }
1840
1443 MEvent.time = ev.time; 1841 MEvent.time = ev.time;
1444 return; 1842 return;
1445 } 1843 }
1446 1844
1447 /* 1845 /*
… …
1513 upordown = 1; /* down */ 1911 upordown = 1; /* down */
1514 } 1912 }
1515 if (upordown) 1913 if (upordown)
1516 { 1914 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1915#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1916 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1917#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1918 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1919 {
1522 if (upordown < 0) 1920 if (upordown < 0)
1523 scrollBar.setUp (); 1921 scrollBar.setUp ();
… …
1539 break; 1937 break;
1540 case R_SB_ALIGN_BOTTOM: 1938 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1939 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1940 break;
1543 } 1941 }
1942
1544 if (scrollBar.style == R_SB_XTERM 1943 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1944 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1945 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1946 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1947
1549 scrollBar.setMotion (); 1948 scrollBar.setMotion ();
1550 break; 1949 break;
1551 1950
1552 case Button1: 1951 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1952 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1976 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1977 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1978 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1979 / scrollbar_size ()));
1581 } 1980 }
1981
1582 break; 1982 break;
1583 } 1983 }
1584 } 1984 }
1585 return; 1985 return;
1586 } 1986 }
… …
1598{ 1998{
1599 int reportmode = 0; 1999 int reportmode = 0;
1600 2000
1601 csrO = 0; /* reset csr Offset */ 2001 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2002 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2003 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2004
1605 if (scrollbar_isUpDn ()) 2005 if (scrollbar_isUpDn ())
1606 { 2006 {
1607 scrollBar.setIdle (); 2007 scrollBar.setIdle ();
1608 scrollbar_show (0); 2008 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 2010 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 2011#endif
1612
1613 } 2012 }
2013
1614#ifdef SELECTION_SCROLLING 2014#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2015 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop();
1616#endif 2017#endif
2018
1617 if (ev.window == TermWin.vt) 2019 if (ev.window == TermWin.vt)
1618 { 2020 {
2021#if ISO_14755
2022 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return;
2025#endif
1619 if (reportmode) 2026 if (reportmode)
1620 { 2027 {
1621 /* mouse report from vt window */ 2028 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2029 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2030 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2044 MEvent.button = AnyButton;
1638 mouse_report (ev); 2045 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2046#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2047 return;
1641 } 2048 }
2049
1642 /* 2050 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2051 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2052 * when overriding mouse reporting
1645 */ 2053 */
1646 if (PrivateModes & PrivMode_mouse_report 2054 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2055 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2056 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2057 selection_extend (ev.x, ev.y, 0);
1650 2058
1651 switch (ev.button) 2059 switch (ev.button)
… …
1662 case Button5: 2070 case Button5:
1663 { 2071 {
1664 int i; 2072 int i;
1665 page_dirn v; 2073 page_dirn v;
1666 2074
1667 v = (ev.button == Button4) ? UP : DN; 2075 v = ev.button == Button4 ? UP : DN;
2076
1668 if (ev.state & ShiftMask) 2077 if (ev.state & ShiftMask)
1669 i = 1; 2078 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2079 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2080 i = TermWin.nrow - 1;
1672 else 2081 else
1673 i = 5; 2082 i = 5;
2083
1674# ifdef MOUSE_SLIP_WHEELING 2084# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2085 if (ev.state & ControlMask)
1676 { 2086 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2087 mouse_slip_wheel_speed += v ? -1 : 1;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2089 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2090
2091 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093
2094 slip_wheel_ev.start ();
1679 } 2095 }
2096 else
2097 {
1680# endif 2098# endif
1681# ifdef JUMP_MOUSE_WHEEL 2099# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 2100 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2101 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2102 scrollbar_show (1);
2103# else
2104 while (i--)
2105 {
2106 scr_page (v, 1);
2107 scr_refresh (SMOOTH_REFRESH);
2108 scrollbar_show (1);
2109 }
2110# endif
2111# ifdef MOUSE_SLIP_WHEELING
1691 } 2112 }
1692# endif 2113#endif
1693
1694 } 2114 }
1695 break; 2115 break;
1696#endif 2116#endif
1697
1698 } 2117 }
1699 } 2118 }
1700#ifdef MENUBAR 2119#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2120 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2121 menubar_control (ev);
1703#endif 2122#endif
1704} 2123}
1705 2124
1706
1707#ifdef TRANSPARENT 2125#ifdef TRANSPARENT
2126#if TINTING
2127/* taken from aterm-0.4.2 */
2128
2129typedef uint32_t RUINT32T;
2130
2131void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2132{
2133 int sh_r, sh_g, sh_b;
2134 RUINT32T mask_r, mask_g, mask_b;
2135 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2136 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2137 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2138 int i;
2139
2140 Visual *visual = display->visual;
2141
2142 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2143
2144 /* for convenience */
2145 mask_r = visual->red_mask;
2146 mask_g = visual->green_mask;
2147 mask_b = visual->blue_mask;
2148
2149 /* boring lookup table pre-initialization */
2150 switch (srcImage->bits_per_pixel) {
2151 case 15:
2152 if ((mask_r != 0x7c00) ||
2153 (mask_g != 0x03e0) ||
2154 (mask_b != 0x001f))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2157 lookup_r = lookup;
2158 lookup_g = lookup+32;
2159 lookup_b = lookup+32+32;
2160 sh_r = 10;
2161 sh_g = 5;
2162 sh_b = 0;
2163 break;
2164 case 16:
2165 if ((mask_r != 0xf800) ||
2166 (mask_g != 0x07e0) ||
2167 (mask_b != 0x001f))
2168 return;
2169 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2170 lookup_r = lookup;
2171 lookup_g = lookup+32;
2172 lookup_b = lookup+32+64;
2173 sh_r = 11;
2174 sh_g = 5;
2175 sh_b = 0;
2176 break;
2177 case 24:
2178 if ((mask_r != 0xff0000) ||
2179 (mask_g != 0x00ff00) ||
2180 (mask_b != 0x0000ff))
2181 return;
2182 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2183 lookup_r = lookup;
2184 lookup_g = lookup+256;
2185 lookup_b = lookup+256+256;
2186 sh_r = 16;
2187 sh_g = 8;
2188 sh_b = 0;
2189 break;
2190 case 32:
2191 if ((mask_r != 0xff0000) ||
2192 (mask_g != 0x00ff00) ||
2193 (mask_b != 0x0000ff))
2194 return;
2195 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2196 lookup_r = lookup;
2197 lookup_g = lookup+256;
2198 lookup_b = lookup+256+256;
2199 sh_r = 16;
2200 sh_g = 8;
2201 sh_b = 0;
2202 break;
2203 default:
2204 return; /* we do not support this color depth */
2205 }
2206
2207 /* prepare limits for color transformation (each channel is handled separately) */
2208 if (shade < 0) {
2209 shade = -shade;
2210 if (shade < 0) shade = 0;
2211 if (shade > 100) shade = 100;
2212
2213 lower_lim_r = 65535-rm;
2214 lower_lim_g = 65535-gm;
2215 lower_lim_b = 65535-bm;
2216
2217 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2218 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2219 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2220
2221 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2222 } else {
2223 if (shade < 0) shade = 0;
2224 if (shade > 100) shade = 100;
2225
2226 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2227
2228 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2229 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2230 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2231 }
2232
2233 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2234 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2235 {
2236 unsigned int tmp;
2237
2238 tmp = lower_lim_r;
2239 lower_lim_r = lower_lim_b;
2240 lower_lim_b = tmp;
2241
2242 tmp = upper_lim_r;
2243 upper_lim_r = upper_lim_b;
2244 upper_lim_b = tmp;
2245 }
2246
2247 /* fill our lookup tables */
2248 for (i = 0; i <= mask_r>>sh_r; i++)
2249 {
2250 RUINT32T tmp;
2251 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2252 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2253 lookup_r[i] = (tmp/65535)<<sh_r;
2254 }
2255 for (i = 0; i <= mask_g>>sh_g; i++)
2256 {
2257 RUINT32T tmp;
2258 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2259 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2260 lookup_g[i] = (tmp/65535)<<sh_g;
2261 }
2262 for (i = 0; i <= mask_b>>sh_b; i++)
2263 {
2264 RUINT32T tmp;
2265 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2266 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2267 lookup_b[i] = (tmp/65535)<<sh_b;
2268 }
2269
2270 /* apply table to input image (replacing colors by newly calculated ones) */
2271 switch (srcImage->bits_per_pixel)
2272 {
2273 case 15:
2274 {
2275 unsigned short *p1, *pf, *p, *pl;
2276 p1 = (unsigned short *) srcImage->data;
2277 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2278 while (p1 < pf)
2279 {
2280 p = p1;
2281 pl = p1 + srcImage->width;
2282 for (; p < pl; p++)
2283 {
2284 *p = lookup_r[(*p & 0x7c00)>>10] |
2285 lookup_g[(*p & 0x03e0)>> 5] |
2286 lookup_b[(*p & 0x001f)];
2287 }
2288 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2289 }
2290 break;
2291 }
2292 case 16:
2293 {
2294 unsigned short *p1, *pf, *p, *pl;
2295 p1 = (unsigned short *) srcImage->data;
2296 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2297 while (p1 < pf)
2298 {
2299 p = p1;
2300 pl = p1 + srcImage->width;
2301 for (; p < pl; p++)
2302 {
2303 *p = lookup_r[(*p & 0xf800)>>11] |
2304 lookup_g[(*p & 0x07e0)>> 5] |
2305 lookup_b[(*p & 0x001f)];
2306 }
2307 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2308 }
2309 break;
2310 }
2311 case 24:
2312 {
2313 unsigned char *p1, *pf, *p, *pl;
2314 p1 = (unsigned char *) srcImage->data;
2315 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2316 while (p1 < pf)
2317 {
2318 p = p1;
2319 pl = p1 + srcImage->width * 3;
2320 for (; p < pl; p += 3)
2321 {
2322 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2323 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2324 p[2] = lookup_r[(p[2] & 0x0000ff)];
2325 }
2326 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2327 }
2328 break;
2329 }
2330 case 32:
2331 {
2332 RUINT32T *p1, *pf, *p, *pl;
2333 p1 = (RUINT32T *) srcImage->data;
2334 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2335
2336 while (p1 < pf)
2337 {
2338 p = p1;
2339 pl = p1 + srcImage->width;
2340 for (; p < pl; p++)
2341 {
2342 *p = lookup_r[(*p & 0xff0000)>>16] |
2343 lookup_g[(*p & 0x00ff00)>> 8] |
2344 lookup_b[(*p & 0x0000ff)] |
2345 (*p & ~0xffffff);
2346 }
2347 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2348 }
2349 break;
2350 }
2351 }
2352
2353 free (lookup);
2354}
2355#endif
2356
1708/* 2357/*
1709 * Check our parents are still who we think they are. 2358 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2359 * Do transparency updates if required
1711 */ 2360 */
1712int 2361int
1713rxvt_term::check_our_parents () 2362rxvt_term::check_our_parents ()
1714{ 2363{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2364 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2365 unsigned long nitems, bytes_after;
1717 Atom atype; 2366 Atom atype;
1718 unsigned char *prop = NULL; 2367 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2368 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2369 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2370 XWindowAttributes wattr, wrootattr;
2371 dDisp;
1722 2372
1723 pchanged = 0; 2373 pchanged = 0;
1724 2374
1725 if (! (Options & Opt_transparent)) 2375 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2376 return pchanged; /* Don't try any more */
1727 2377
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2378 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2379 rootdepth = wrootattr.depth;
1730 2380
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2382
1732 if (rootdepth != wattr.depth) 2383 if (rootdepth != wattr.depth)
1733 { 2384 {
1734 if (am_transparent) 2385 if (am_transparent)
1735 { 2386 {
1736 pchanged = 1; 2387 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2389 am_transparent = am_pixmap_trans = 0;
1740 } 2390 }
2391
1741 return pchanged; /* Don't try any more */ 2392 return pchanged; /* Don't try any more */
1742 } 2393 }
1743 2394
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2395 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2396 XSync (disp, False);
1746 2397
1747 /* 2398 /*
1748 * Make the frame window set by the window manager have 2399 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2400 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2401 * windows for each client, so we have to take care about that.
1751 */ 2402 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2403 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2404 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2405 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2406 &nitems, &bytes_after, &prop) == Success);
2407
1756 if (!i || prop == NULL) 2408 if (!i || prop == NULL)
2409 i = (xa[XA_ESETROOT_PMAP_ID]
2410 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2411 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2412 &nitems, &bytes_after, &prop) == Success);
2413
2414 if (!i || prop == NULL
2415#if TINTING
2416 || !rs[Rs_color + Color_tint]
2417#endif
2418 )
1757 have_pixmap = 0; 2419 have_pixmap = 0;
1758 else 2420 else
1759 { 2421 {
1760 have_pixmap = 1; 2422 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2423 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2424 XFree (prop);
1763 } 2425 }
2426
1764 if (have_pixmap) 2427 if (have_pixmap)
1765 { 2428 {
1766 /* 2429 /*
1767 * Copy display->root pixmap transparency 2430 * Copy display->root pixmap transparency
1768 */ 2431 */
… …
1771 Window cr; 2434 Window cr;
1772 XImage *image; 2435 XImage *image;
1773 GC gc; 2436 GC gc;
1774 XGCValues gcvalue; 2437 XGCValues gcvalue;
1775 2438
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2440 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2441 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2442 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2443 nx = ny = 0;
1781 2444
1782 if (sx < 0) 2445 if (sx < 0)
… …
1793 sy = 0; 2456 sy = 0;
1794 } 2457 }
1795 2458
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2461
2462 XSync (disp, False);
1798 allowedxerror = -1; 2463 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2465
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2466 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2467 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2468 allowedxerror = 0;
2469
1804 if (image == NULL) 2470 if (image == NULL)
1805 { 2471 {
1806 if (am_transparent && am_pixmap_trans) 2472 if (am_transparent && am_pixmap_trans)
1807 { 2473 {
1808 pchanged = 1; 2474 pchanged = 1;
1809 if (TermWin.pixmap != None) 2475 if (TermWin.pixmap != None)
1810 { 2476 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2477 XFreePixmap (disp, TermWin.pixmap);
1812 TermWin.pixmap = None; 2478 TermWin.pixmap = None;
1813 } 2479 }
1814 } 2480 }
2481
1815 am_pixmap_trans = 0; 2482 am_pixmap_trans = 0;
1816 } 2483 }
1817 else 2484 else
1818 { 2485 {
1819 if (TermWin.pixmap != None) 2486 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2487 XFreePixmap (disp, TermWin.pixmap);
2488
2489#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint))
2491 {
2492 unsigned short rm, gm, bm;
2493 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2494
2495 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2496
2497 ShadeXImage (display, image, shade, rm, gm, bm);
2498 }
2499#endif
2500
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2502 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2505 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2506 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2507 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2509 XClearWindow (disp, TermWin.parent[0]);
2510
1833 if (!am_transparent || !am_pixmap_trans) 2511 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2512 pchanged = 1;
2513
1835 am_transparent = am_pixmap_trans = 1; 2514 am_transparent = am_pixmap_trans = 1;
1836 } 2515 }
1837 } 2516 }
1838 2517
1839 if (!am_pixmap_trans) 2518 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2520 else
1840 { 2521 {
1841 unsigned int n; 2522 unsigned int n;
1842 /* 2523 /*
1843 * InheritPixmap transparency 2524 * InheritPixmap transparency
1844 */ 2525 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2527 {
1849 oldp = TermWin.parent[i]; 2528 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2529 XQueryTree (disp, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2530 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2531 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2532
1854 if (TermWin.parent[i] == display->root) 2533 if (TermWin.parent[i] == display->root)
1855 { 2534 {
1856 if (oldp != None) 2535 if (oldp != None)
1857 pchanged = 1; 2536 pchanged = 1;
2537
1858 break; 2538 break;
1859 } 2539 }
2540
1860 if (oldp != TermWin.parent[i]) 2541 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2542 pchanged = 1;
1862 } 2543 }
1863 2544
1864 n = 0; 2545 n = 0;
1865 2546
1866 if (pchanged) 2547 if (pchanged)
1867 { 2548 {
1868 for (; n < (unsigned int)i; n++) 2549 for (; n < (unsigned int)i; n++)
1869 { 2550 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2553 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2555 break;
1876 } 2556 }
1877 } 2557 }
1878 } 2558 }
1879 2559
1880 if (n > (int) (sizeof (TermWin.parent) 2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2561 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2564 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2565 /* XXX: also turn off Opt_transparent? */
1890 } 2566 }
1891 else 2567 else
1892 { 2568 {
2569#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2570 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2571 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2572 sleep (1);
1903# endif 2573#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2574 for (n = 0; n < (unsigned int)i; n++)
2575 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2577 XClearWindow (disp, TermWin.parent[n]);
2578 }
2579
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2581 am_transparent = 1;
1911 } 2582 }
1912 2583
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2585 TermWin.parent[i] = None;
1915 } 2586 }
2587
2588 if (scrollBar.win)
2589 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2591 scrollBar.setIdle ();
2592 scrollbar_show (0);
2593 }
2594
2595 if (am_transparent)
2596 {
2597 want_refresh = want_full_refresh = 1;
2598 if (am_pixmap_trans)
2599 flush ();
2600 }
2601
1916 return pchanged; 2602 return pchanged;
1917} 2603}
1918#endif 2604#endif
1919 2605
1920/*}}} */ 2606/*}}} */
… …
1935 } 2621 }
1936 2622
1937 if (ch == NOCHAR) // TODO: improve 2623 if (ch == NOCHAR) // TODO: improve
1938 break; 2624 break;
1939 2625
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2626 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2627 {
2628 if (!seen_input)
1941 { 2629 {
2630 seen_input = 1;
2631 // many badly-written programs (e.g. jed) contain a race condition:
2632 // they first read the screensize and then install a SIGWINCH handler.
2633 // some window managers resize the window early, and these programs
2634 // then sometimes get the size wrong.
2635 // unfortunately other programs are even more buggy and dislike
2636 // being sent SIGWINCH, so only do it when we were in fact being
2637 // resized.
2638 if (seen_resize && cmd_pid)
2639 kill (-cmd_pid, SIGWINCH);
2640 }
2641
1942 /* Read a text string from the input buffer */ 2642 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2643 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2644 bool refreshnow = false;
1945 int nlines = 0; 2645 int nlines = 0;
1946 unicode_t *str = buf; 2646 unicode_t *str = buf;
1947 2647
1948 *str++ = ch;
1949
1950 for (;;) 2648 for (;;)
1951 { 2649 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2651 break;
1957 2652
1958 *str++ = ch; 2653 *str++ = ch;
1959 2654
1960 if (ch == '\n') 2655 if (ch == C0_LF)
1961 { 2656 {
1962 nlines++; 2657 nlines++;
1963 refresh_count++; 2658 refresh_count++;
1964 2659
1965 if (! (Options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2662 {
1968 refreshnow = true; 2663 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2664 ch = NOCHAR;
1971 break; 2665 break;
1972 } 2666 }
1973 2667
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= TermWin.nrow - 1)
1976 { 2670 {
1977 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2672 nlines = 0;
1979 str = buf; 2673 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2677 if (str >= buf + UBUFSIZ)
1984 { 2678 {
1985 ch = NOCHAR; 2679 ch = NOCHAR;
1986 break; 2680 break;
1987 } 2681 }
2682
2683 seq_begin = cmdbuf_ptr;
2684 ch = next_char ();
1988 } 2685 }
1989 2686
1990 scr_add_lines (buf, nlines, str - buf); 2687 scr_add_lines (buf, nlines, str - buf);
1991 2688
1992 /* 2689 /*
1993 * If there have been a lot of new lines, then update the screen 2690 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2691 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2692 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2693 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2694 */
2001 if (refreshnow) 2695 if (refreshnow)
2002 { 2696 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2698 refresh_limit++;
2005 2699 else
2700 {
2701 flag = true;
2006 scr_refresh (refresh_type); 2702 scr_refresh (refresh_type);
2703 }
2007 } 2704 }
2008 2705
2009 } 2706 }
2010 else 2707 else
2011 { 2708 {
… …
2025 } 2722 }
2026 2723
2027 return flag; 2724 return flag;
2028} 2725}
2029 2726
2727// read the next octet
2728unicode_t
2729rxvt_term::next_octet ()
2730{
2731 return cmdbuf_ptr < cmdbuf_endp
2732 ? *cmdbuf_ptr++
2733 : NOCHAR;
2734}
2735
2030// read the next character 2736// read the next character
2031unicode_t 2737unicode_t
2032rxvt_term::next_char () 2738rxvt_term::next_char ()
2033{ 2739{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2740 while (cmdbuf_ptr < cmdbuf_endp)
… …
2050 if (len == (size_t)-1) 2756 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2757 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2758
2053 // assume wchar == unicode 2759 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2760 cmdbuf_ptr += len;
2055 return wc; 2761 return wc & UNICODE_MASK;
2056 } 2762 }
2057 2763
2058 return NOCHAR; 2764 return NOCHAR;
2059} 2765}
2060 2766
… …
2065 */ 2771 */
2066unicode_t 2772unicode_t
2067rxvt_term::cmd_getc () 2773rxvt_term::cmd_getc ()
2068{ 2774{
2069 unicode_t c = next_char (); 2775 unicode_t c = next_char ();
2776
2777 if (c == NOCHAR)
2778 throw out_of_input;
2779
2780 return c;
2781}
2782
2783unicode_t
2784rxvt_term::cmd_get8 ()
2785{
2786 unicode_t c = next_octet ();
2070 2787
2071 if (c == NOCHAR) 2788 if (c == NOCHAR)
2072 throw out_of_input; 2789 throw out_of_input;
2073 2790
2074 return c; 2791 return c;
… …
2156/*}}} */ 2873/*}}} */
2157 2874
2158/* *INDENT-OFF* */ 2875/* *INDENT-OFF* */
2159enum { 2876enum {
2160 C1_40 = 0x40, 2877 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2878 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2879 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2880 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2881 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2882};
2166/* *INDENT-ON* */ 2883/* *INDENT-ON* */
2167 2884
2168/*{{{ process non-printing single characters */ 2885/*{{{ process non-printing single characters */
2169void 2886void
… …
2174 case C0_ESC: 2891 case C0_ESC:
2175 process_escape_seq (); 2892 process_escape_seq ();
2176 break; 2893 break;
2177 case C0_ENQ: /* terminal Status */ 2894 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2895 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2898 else
2183 tt_write ((unsigned char *)VT100_ANS, 2899 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2900 (unsigned int)strlen (VT100_ANS));
2185 break; 2901 break;
2186 case C0_BEL: /* bell */ 2902 case C0_BEL: /* bell */
2187 scr_bell (); 2903 scr_bell ();
2188 break; 2904 break;
2189 case C0_BS: /* backspace */ 2905 case C0_BS: /* backspace */
… …
2205 break; 2921 break;
2206 case C0_SI: /* shift in - acs */ 2922 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2923 scr_charset_choose (0);
2208 break; 2924 break;
2209 2925
2926#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2927 // 8-bit controls
2211 case 0x90: /* DCS */ 2928 case 0x90: /* DCS */
2212 process_dcs_seq (); 2929 process_dcs_seq ();
2213 break; 2930 break;
2214 case 0x9b: /* CSI */ 2931 case 0x9b: /* CSI */
2215 process_csi_seq (); 2932 process_csi_seq ();
2216 break; 2933 break;
2217 case 0x9d: /* CSI */ 2934 case 0x9d: /* CSI */
2218 process_osc_seq (); 2935 process_osc_seq ();
2219 break; 2936 break;
2937#endif
2220 } 2938 }
2221} 2939}
2222/*}}} */ 2940/*}}} */
2223 2941
2224 2942
… …
2286void 3004void
2287rxvt_term::process_escape_seq () 3005rxvt_term::process_escape_seq ()
2288{ 3006{
2289 unicode_t ch = cmd_getc (); 3007 unicode_t ch = cmd_getc ();
2290 3008
2291 if (PrivateModes & PrivMode_vt52) 3009 if (priv_modes & PrivMode_vt52)
2292 { 3010 {
2293 process_escape_vt52 (ch); 3011 process_escape_vt52 (ch);
2294 return; 3012 return;
2295 } 3013 }
2296 3014
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3029 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3030 break;
2313 case '+': 3031 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3032 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3033 break;
2316#ifndef NO_FRILLS 3034#if ENABLE_FRILLS
2317 case '6': 3035 case '6':
2318 scr_backindex (); 3036 scr_backindex ();
2319 break; 3037 break;
2320#endif 3038#endif
2321 case '7': 3039 case '7':
2322 scr_cursor (SAVE); 3040 scr_cursor (SAVE);
2323 break; 3041 break;
2324 case '8': 3042 case '8':
2325 scr_cursor (RESTORE); 3043 scr_cursor (RESTORE);
2326 break; 3044 break;
2327#ifndef NO_FRILLS 3045#if ENABLE_FRILLS
2328 case '9': 3046 case '9':
2329 scr_forwardindex (); 3047 scr_forwardindex ();
2330 break; 3048 break;
2331#endif 3049#endif
2332 case '=': 3050 case '=':
… …
2342 break; 3060 break;
2343 3061
2344 /* 8.3.87: NEXT LINE */ 3062 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3063 case C1_NEL: /* ESC E */
2346 { 3064 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3065 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3066 scr_add_lines (nlcr, 1, 2);
2349 } 3067 }
2350 break; 3068 break;
2351 3069
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3070 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3081 case C1_RI: /* ESC M */
2364 scr_index (DN); 3082 scr_index (DN);
2365 break; 3083 break;
2366 3084
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3085 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3086 /*case C1_SS2: scr_single_shift (2); break; */
2369 3087
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3088 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3089 /*case C1_SS3: scr_single_shift (3); break; */
2372 3090
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3091 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3092 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3093 process_dcs_seq ();
2376 break; 3094 break;
… …
2391 process_osc_seq (); 3109 process_osc_seq ();
2392 break; 3110 break;
2393 3111
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3112 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3113 case 'c':
3114 mbstate.reset ();
2396 scr_poweron (); 3115 scr_poweron ();
2397 scrollbar_show (1); 3116 scrollbar_show (1);
2398 break; 3117 break;
2399 3118
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3119 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3131
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3132/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3133/* *INDENT-OFF* */
2415enum { 3134enum {
2416 CSI_ICH = 0x40, 3135 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3136 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3137 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3138 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3139 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3140 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3141 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3156 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3157 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3158 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3159 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3160 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3161 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3162 };
2444/* *INDENT-ON* */ 3163/* *INDENT-ON* */
2445 3164
2446void 3165void
2447rxvt_term::process_csi_seq () 3166rxvt_term::process_csi_seq ()
… …
2510 { 3229 {
2511 switch (priv) 3230 switch (priv)
2512 { 3231 {
2513 case '>': 3232 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3233 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3235 break;
2517 case '?': 3236 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3238 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3239 break;
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3350 break;
2632 3351
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3353 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3354 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3355 break;
2637 3356
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3358 process_sgr_mode (nargs, arg);
2640 break; 3359 break;
… …
2646 tt_printf ("\033[0n"); 3365 tt_printf ("\033[0n");
2647 break; 3366 break;
2648 case 6: /* CPR requested */ 3367 case 6: /* CPR requested */
2649 scr_report_position (); 3368 scr_report_position ();
2650 break; 3369 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3370 case 7: /* unofficial extension */
3371 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3372 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3373 break;
2655#endif
2656 case 8: /* unofficial extension */ 3374 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3376 break;
2659 } 3377 }
2660 break; 3378 break;
2661 3379
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3380 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3413 break;
2696 3414
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3415 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3416 if (arg[0] == 4)
2699 scr_insert_mode (0); 3417 scr_insert_mode (0);
3418 else if (arg[0] == 20)
3419 priv_modes &= ~PrivMode_LFNL;
2700 break; 3420 break;
2701 3421
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3422 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3423 if (arg[0] == 4)
2704 scr_insert_mode (1); 3424 scr_insert_mode (1);
3425 else if (arg[0] == 20)
3426 priv_modes |= PrivMode_LFNL;
2705 break; 3427 break;
2706 3428
2707 /* 3429 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3430 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3431 */
… …
2721 break; 3443 break;
2722 case CSI_75: 3444 case CSI_75:
2723 scr_cursor (RESTORE); 3445 scr_cursor (RESTORE);
2724 break; 3446 break;
2725 3447
2726#ifndef NO_FRILLS 3448#if ENABLE_FRILLS
2727 case CSI_74: 3449 case CSI_74:
2728 process_window_ops (arg, nargs); 3450 process_window_ops (arg, nargs);
2729 break; 3451 break;
2730#endif 3452#endif
2731 3453
… …
2738 break; 3460 break;
2739 } 3461 }
2740} 3462}
2741/*}}} */ 3463/*}}} */
2742 3464
2743#ifndef NO_FRILLS 3465#if ENABLE_FRILLS
2744/* ARGSUSED */ 3466/* ARGSUSED */
2745void 3467void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3468rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3469{
2748 int x, y; 3470 int x, y;
2749 XWindowAttributes wattr; 3471 XWindowAttributes wattr;
2750 Window wdummy; 3472 Window wdummy;
3473 dDisp;
2751 3474
2752 if (nargs == 0) 3475 if (nargs == 0)
2753 return; 3476 return;
2754 3477
2755 switch (args[0]) 3478 switch (args[0])
2756 { 3479 {
2757 /* 3480 /*
2758 * commands 3481 * commands
2759 */ 3482 */
2760 case 1: /* deiconify window */ 3483 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3484 XMapWindow (disp, TermWin.parent[0]);
2762 break; 3485 break;
2763 case 2: /* iconify window */ 3486 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3487 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3488 break;
2767 case 3: /* set position (pixels) */ 3489 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2769 break; 3491 break;
2770 case 4: /* set size (pixels) */ 3492 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3494 break;
2773 case 5: /* raise window */ 3495 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3496 XRaiseWindow (disp, TermWin.parent[0]);
2775 break; 3497 break;
2776 case 6: /* lower window */ 3498 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3499 XLowerWindow (disp, TermWin.parent[0]);
2778 break; 3500 break;
2779 case 7: /* refresh window */ 3501 case 7: /* refresh window */
2780 scr_touch (true); 3502 scr_touch (true);
2781 break; 3503 break;
2782 case 8: /* set size (chars) */ 3504 case 8: /* set size (chars) */
… …
2794 3516
2795 /* 3517 /*
2796 * reports - some output format copied from XTerm 3518 * reports - some output format copied from XTerm
2797 */ 3519 */
2798 case 11: /* report window state */ 3520 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3523 break;
2802 case 13: /* report window position */ 3524 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3527 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3528 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3529 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3530 break;
2809 case 14: /* report window size (pixels) */ 3531 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3534 break;
2813 case 18: /* report text area size (chars) */ 3535 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3537 break;
2816 case 19: /* report window size (chars) */ 3538 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3540 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3541 case 20: /* report icon label */
3542 {
3543 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3544 XGetIconName (disp, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s);
3547 }
2823 break; 3548 break;
2824 case 21: /* report window title */ 3549 case 21: /* report window title */
3550 {
3551 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3552 XFetchName (disp, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s);
3555 }
2827 break; 3556 break;
2828#endif
2829 } 3557 }
2830} 3558}
2831#endif 3559#endif
2832 3560
2833/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
2834/* 3562/*
2835 * get input up until STRING TERMINATOR (or BEL) 3563 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3564 * ends_how is terminator used. returned input must be free()'d
2837 */ 3565 */
2838unsigned char * 3566unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3567rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3568{
2841 int seen_esc = 0; /* seen escape? */ 3569 unicode_t ch;
3570 bool seen_esc = false;
2842 unsigned int n = 0; 3571 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3572 wchar_t string[STRING_MAX];
2846 3573
2847 while ((ch = cmd_getc ())) 3574 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3575 {
2849 if (ch == C0_BEL 3576 if (seen_esc)
2850 || ch == CHAR_ST 3577 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3578 if (ch == 0x5c) /* 7bit ST */
2852 break; 3579 break;
2853 3580 else
3581 return NULL;
3582 }
2854 if (ch == C0_ESC) 3583 else if (ch == C0_ESC)
2855 { 3584 {
2856 seen_esc = 1; 3585 seen_esc = true;
2857 continue; 3586 continue;
2858 } 3587 }
2859 else if (ch == '\t') 3588 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3589 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3590 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3591 return NULL; /* other control character - exit */
2863 3592
2864 if (n < sizeof (string) - 1) 3593 seen_esc = false;
3594
3595 if (n >= STRING_MAX - 1)
3596 // stop at some sane length
3597 return NULL;
3598
3599 if (ch == C0_SYN)
3600 string[n++] = cmd_get8 ();
3601 else
2865 string[n++] = ch; 3602 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3603 }
2869 3604
2870 string[n++] = '\0'; 3605 string[n++] = '\0';
2871 3606
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3607 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3608
2877 return s; 3609 return (unsigned char *)rxvt_wcstombs (string);
2878} 3610}
2879 3611
2880/*----------------------------------------------------------------------*/ 3612/*----------------------------------------------------------------------*/
2881/* 3613/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3614 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
2915 { 3647 {
2916 unsigned char *s = get_to_st (eh); 3648 unsigned char *s = get_to_st (eh);
2917 3649
2918 if (s) 3650 if (s)
2919 { 3651 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3652 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3653 free (s);
2934 } 3654 }
2935 } 3655 }
2936} 3656}
3657
3658void
3659rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3660{
3661 if (str[0] == '?' && !str[1])
3662 {
3663 unsigned short r, g, b;
3664 pix_colors_focused[color].get (display, r, g, b);
3665 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3666 }
3667 else
3668 set_window_color (color, str);
3669}
3670
2937/* 3671/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3673 */
2960void 3674void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3675rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3676{
2963 int changed = 0; 3677 int changed = 0;
2964 int color; 3678 int color;
2965 char *buf, *name; 3679 char *buf, *name;
3680 bool query = str[0] == '?' && !str[1];
3681 int saveop = op;
3682 dDisp;
2966 3683
2967 assert (str != NULL); 3684 assert (str != NULL);
2968 switch (op) 3685 switch (op)
2969 { 3686 {
2970 case XTerm_name: 3687 case XTerm_name:
… …
2974 set_icon_name (str); 3691 set_icon_name (str);
2975 break; 3692 break;
2976 case XTerm_title: 3693 case XTerm_title:
2977 set_title (str); 3694 set_title (str);
2978 break; 3695 break;
3696 case XTerm_property:
3697 if (str[0] == '?')
3698 {
3699 Atom prop = display->atom (str + 1);
3700 Atom actual_type;
3701 int actual_format;
3702 unsigned long nitems;
3703 unsigned long bytes_after;
3704 unsigned char *value = 0;
3705 const char *str = "";
3706
3707 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None
3713 && actual_format == 8)
3714 str = (const char *)(value);
3715
3716 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3717
3718 XFree (value);
3719 }
3720 else
3721 {
3722 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3723
3724 if (eq)
3725 {
3726 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1);
3728 }
3729 else
3730 XDeleteProperty (disp, TermWin.parent[0],
3731 display->atom (str));
3732 }
3733 break;
3734
2979 case XTerm_Color: 3735 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3736 for (buf = (char *)str; buf && *buf;)
2981 { 3737 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3738 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3739 break;
2984 3740
2985 *name++ = '\0'; 3741 *name++ = '\0';
2986 color = atoi (buf); 3742 color = atoi (buf);
2987 3743
2988 if (color < 0 || color >= TOTAL_COLORS) 3744 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3745 break;
2990 3746
2991 if ((buf = STRCHR (name, ';')) != NULL) 3747 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3748 *buf++ = '\0';
2993 3749
3750 if (name[0] == '?' && !name[1])
3751 {
3752 unsigned short r, g, b;
3753 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3754 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3755 }
3756 else
2994 set_window_color (color + minCOLOR, name); 3757 set_window_color (color + minCOLOR, name);
2995 } 3758 }
3759 break;
3760 case XTerm_Color00:
3761 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3762 break;
3763 case XTerm_Color01:
3764 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3765 break;
2997#ifndef NO_CURSORCOLOR 3766#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3767 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3768 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3769 break;
3001#endif 3770#endif
3002 case XTerm_Color_pointer: 3771 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3772 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3773 break;
3774 case XTerm_Color_pointer_bg:
3775 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3776 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3777#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3778 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3779 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3780 break;
3009 case XTerm_Color_UL: 3781 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3782 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3783 break;
3012 case XTerm_Color_RV: 3784 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3785 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3786 break;
3015#endif 3787 case URxvt_Color_IT:
3016 3788 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break; 3789 break;
3790#endif
3791#if TRANSPARENT && TINTING
3792 case URxvt_Color_tint:
3793 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3794 check_our_parents ();
3795 if (am_transparent)
3796 want_full_refresh = want_refresh = 1;
3797 break;
3798#endif
3799
3023 case XTerm_Pixmap: 3800 case XTerm_Pixmap:
3024 if (*str != ';') 3801 if (*str != ';')
3025 { 3802 {
3026#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3804 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3805 set_bgPixmap (str); /* change pixmap */
3029#endif 3806#endif
3030 scr_touch (true); 3807 scr_touch (true);
3031 } 3808 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3809 while ((str = strchr (str, ';')) != NULL)
3033 { 3810 {
3034 str++; 3811 str++;
3035#if XPM_BACKGROUND 3812#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3813 changed += scale_pixmap (str);
3037#endif 3814#endif
3038
3039 } 3815 }
3816
3040 if (changed) 3817 if (changed)
3041 { 3818 {
3042#ifdef XPM_BACKGROUND 3819#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3820 resize_pixmap ();
3044#endif 3821#endif
… …
3050 set_window_color (Color_fg, str); 3827 set_window_color (Color_fg, str);
3051 break; 3828 break;
3052 case XTerm_restoreBG: 3829 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3830 set_window_color (Color_bg, str);
3054 break; 3831 break;
3832
3055 case XTerm_logfile: 3833 case XTerm_logfile:
3056 // TODO, when secure mode? 3834 // TODO, when secure mode?
3057 break; 3835 break;
3058 case XTerm_font: 3836
3059 change_font (str); 3837#ifdef MENUBAR
3838 case URxvt_Menu:
3839 if (options & Opt_insecure)
3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3060 break; 3841 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif 3842#endif
3080#if 0 3843#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3844 case XTerm_dumpscreen: /* no error notices */
3082 { 3845 {
3083 int fd; 3846 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3847 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3848 {
3086 scr_dump (fd); 3849 scr_dump (fd);
3087 close (fd); 3850 close (fd);
3088 } 3851 }
3089 } 3852 }
3853 break;
3854#endif
3855 case XTerm_font:
3856 op = URxvt_font;
3857 case URxvt_font:
3858#if ENABLE_STYLES
3859 case URxvt_boldFont:
3860 case URxvt_italicFont:
3861 case URxvt_boldItalicFont:
3862#endif
3863 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3867 resp);
3868 else
3869 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871
3872 res = strdup (str);
3873 allocated.push_back ((void *)res);
3874 set_fonts ();
3875 }
3876 break;
3877
3878#if ENABLE_FRILLS
3879 case URxvt_locale:
3880 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3882 else
3883 {
3884 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8);
3886 init_xlocale ();
3887 }
3888 break;
3889
3890 case URxvt_view_up:
3891 case URxvt_view_down:
3892 int lines = atoi (str);
3893
3894 if (lines)
3895 scr_page (op == URxvt_view_up ? UP : DN, lines);
3896 else
3897 {
3898 scr_erase_savelines ();
3899 }
3900
3090 break; 3901 break;
3091#endif 3902#endif
3092 } 3903 }
3093} 3904}
3094/*----------------------------------------------------------------------*/ 3905/*----------------------------------------------------------------------*/
… …
3108{ 3919{
3109 int state; 3920 int state;
3110 3921
3111 if (mode == 's') 3922 if (mode == 's')
3112 { 3923 {
3113 SavedModes |= (PrivateModes & bit); 3924 SavedModes |= (priv_modes & bit);
3114 return -1; 3925 return -1;
3115 } 3926 }
3116 else 3927 else
3117 { 3928 {
3118 if (mode == 'r') 3929 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3930 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3931 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3932 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3933 PrivMode (state, bit);
3123 } 3934 }
3124 3935
3125 return state; 3936 return state;
3126} 3937}
… …
3144 { 3, PrivMode_132 }, 3955 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3956 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3957 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3958 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3959 { 7, PrivMode_Autowrap },
3960 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3961 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3962#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3963 { menuBar_esc, PrivMode_menuBar },
3152#endif 3964#endif
3965 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3967#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3968 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3969#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3970 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3971 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3972 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3973 // 45 margin bell NYI
3163 // 46 start logging 3974 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3986 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3987 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3988 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3989 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3990 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3991 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3992 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3993 };
3183 3994
3184 if (nargs == 0) 3995 if (nargs == 0)
3185 return; 3996 return;
… …
3205 /* extra handling for values with state unkept */ 4016 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4017 switch (arg[i])
3207 { 4018 {
3208 case 1048: /* alternative cursor save */ 4019 case 1048: /* alternative cursor save */
3209 case 1049: 4020 case 1049:
4021 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 4022 if (mode == 0)
3211 scr_cursor (RESTORE); 4023 scr_cursor (RESTORE);
3212 else if (mode == 1) 4024 else if (mode == 1)
3213 scr_cursor (SAVE); 4025 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4026 break;
3215 } 4027 }
3216 4028
3217 if (state >= 0) 4029 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4030 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4031 switch (arg[i])
… …
3225 * within VT52 mode 4037 * within VT52 mode
3226 */ 4038 */
3227 PrivMode (1, PrivMode_vt52); 4039 PrivMode (1, PrivMode_vt52);
3228 break; 4040 break;
3229 case 3: /* 80/132 */ 4041 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4042 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4044 break;
3233 case 4: /* smooth scrolling */ 4045 case 4: /* smooth scrolling */
3234 if (state) 4046 if (state)
3235 Options &= ~Opt_jumpScroll; 4047 options &= ~Opt_jumpScroll;
3236 else 4048 else
3237 Options |= Opt_jumpScroll; 4049 options |= Opt_jumpScroll;
3238 break; 4050 break;
3239 case 5: /* reverse video */ 4051 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4052 scr_rvideo_mode (state);
3241 break; 4053 break;
3242 case 6: /* relative/absolute origins */ 4054 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4055 scr_relative_origin (state);
3244 break; 4056 break;
3245 case 7: /* autowrap */ 4057 case 7: /* autowrap */
3246 scr_autowrap (state); 4058 scr_autowrap (state);
3247 break; 4059 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4060 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4061 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4062 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4063 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4064 break;
3253#ifdef menuBar_esc 4065#ifdef menuBar_esc
3254 case menuBar_esc: 4066 case menuBar_esc:
3255#ifdef MENUBAR 4067#ifdef MENUBAR
3256 map_menuBar (state); 4068 map_menuBar (state);
… …
3267 break; 4079 break;
3268#endif 4080#endif
3269 case 25: /* visible/invisible cursor */ 4081 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4082 scr_cursor_visible (state);
3271 break; 4083 break;
3272 /* case 35: - shift keys */ 4084 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4085 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4086 case 47: /* secondary screen */
3275 scr_change_screen (state); 4087 scr_change_screen (state);
3276 break; 4088 break;
3277 /* case 66: - application key pad */ 4089 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4090 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4091 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4092 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4093 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4094 break;
3283#if 0 4095#if 0
3284 case 1001: 4096 case 1001:
3285 break; /* X11 mouse highlighting */ 4097 break; /* X11 mouse highlighting */
3286#endif 4098#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4099 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4100 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4101 options &= ~Opt_scrollTtyOutput;
3290 else 4102 else
3291 Options |= Opt_scrollTtyOutput; 4103 options |= Opt_scrollTtyOutput;
3292 break; 4104 break;
3293 case 1011: /* scroll to bottom on key press */ 4105 case 1011: /* scroll to bottom on key press */
3294 if (state) 4106 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4107 options |= Opt_scrollTtyKeypress;
3296 else 4108 else
3297 Options &= ~Opt_scrollTtyKeypress; 4109 options &= ~Opt_scrollTtyKeypress;
3298 break; 4110 break;
3299 case 1047: /* secondary screen w/ clearing */ 4111 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4112 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4113 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4114 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4115 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4116 break;
4117 case 1049: /* secondary screen w/ clearing first */
4118 scr_change_screen (state);
4119 if (options & Opt_secondaryScreen)
4120 if (current_screen != PRIMARY)
4121 scr_erase_screen (2);
4122 break;
3306 default: 4123 default:
3307 break; 4124 break;
3308 } 4125 }
3309 } 4126 }
3310} 4127}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4150 rendset = 0, rendstyle = ~RS_None;
3334 break; 4151 break;
3335 case 1: 4152 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4153 rendset = 1, rendstyle = RS_Bold;
3337 break; 4154 break;
4155 //case 2: // low intensity
4156 case 3:
4157 rendset = 1, rendstyle = RS_Italic;
4158 break;
3338 case 4: 4159 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4160 rendset = 1, rendstyle = RS_Uline;
3340 break; 4161 break;
3341 case 5: 4162 case 5: // slowly blinking
4163 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4164 rendset = 1, rendstyle = RS_Blink;
3343 break; 4165 break;
4166 //case 6: // scoansi light background
3344 case 7: 4167 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4168 rendset = 1, rendstyle = RS_RVid;
3346 break; 4169 break;
3347 case 8: 4170 case 8:
3348 // invisible. NYI 4171 // invisible. NYI
3349 break; 4172 break;
3350 case 22: 4173 //case 9: // crossed out
4174 //case 10: // scoansi acs off, primary font
4175 //case 11: // scoansi acs on, first alt font
4176 //case 12: // scoansi acs on, |0x80, second alt font
4177 //...
4178 //case 19: // ninth alt font
4179 //case 20: // gothic
4180 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4181 rendset = 0, rendstyle = RS_Bold;
4182 break;
4183 case 22: // normal intensity
4184 rendset = 0, rendstyle = RS_Bold;
4185 break;
4186 case 23: // disable italic
4187 rendset = 0, rendstyle = RS_Italic;
3352 break; 4188 break;
3353 case 24: 4189 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4190 rendset = 0, rendstyle = RS_Uline;
3355 break; 4191 break;
3356 case 25: 4192 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4193 rendset = 0, rendstyle = RS_Blink;
3358 break; 4194 break;
4195 case 26: // variable spacing (iso 8613)
4196 rendset = 0, rendstyle = RS_Blink;
4197 break;
3359 case 27: 4198 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4199 rendset = 0, rendstyle = RS_RVid;
3361 break; 4200 break;
3362 case 28:
3363 // visible. NYI 4201 //case 28: // visible. NYI
3364 break; 4202 //case 29: // not crossed-out
3365 } 4203 }
3366 4204
3367 if (rendset != -1) 4205 if (rendset != -1)
3368 { 4206 {
3369 scr_rendition (rendset, rendstyle); 4207 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4218 case 35:
3381 case 36: 4219 case 36:
3382 case 37: 4220 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4221 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4222 break;
3385#ifdef TTY_256COLOR 4223 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4224 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4225 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4226 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4227 i += 2;
3391 } 4228 }
3392 break; 4229 break;
3393#endif
3394 case 39: /* default fg */ 4230 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4231 scr_color (Color_fg, Color_fg);
3396 break; 4232 break;
3397 4233
3398 case 40: 4234 case 40:
… …
3403 case 45: 4239 case 45:
3404 case 46: 4240 case 46:
3405 case 47: 4241 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4242 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4243 break;
3408#ifdef TTY_256COLOR 4244 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4245 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4246 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4247 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4248 i += 2;
3414 } 4249 }
3415 break; 4250 break;
3416#endif
3417 case 49: /* default bg */ 4251 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4252 scr_color (Color_bg, Color_bg);
3419 break; 4253 break;
4254
4255 //case 50: // not variable spacing
3420 4256
3421#ifndef NO_BRIGHTCOLOR 4257#ifndef NO_BRIGHTCOLOR
3422 case 90: 4258 case 90:
3423 case 91: /* set bright fg color */ 4259 case 91: /* set bright fg color */
3424 case 92: 4260 case 92:
3425 case 93: 4261 case 93:
3426 case 94: 4262 case 94:
3427 case 95: 4263 case 95:
3428 case 96: 4264 case 96:
3429 case 97: 4265 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4266 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4267 break;
3433 case 100: 4268 case 100:
3434 case 101: /* set bright bg color */ 4269 case 101: /* set bright bg color */
3435 case 102: 4270 case 102:
3436 case 103: 4271 case 103:
3437 case 104: 4272 case 104:
3438 case 105: 4273 case 105:
3439 case 106: 4274 case 106:
3440 case 107: 4275 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4277 break;
3444#endif 4278#endif
3445 4279
3446 } 4280 }
3447 } 4281 }
3448} 4282}
3449/*}}} */ 4283/*}}} */
3450 4284
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4285/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4286void
3453rxvt_term::process_graphics () 4287rxvt_term::process_graphics ()
3454{ 4288{
3455 unicode_t ch, cmd = cmd_getc (); 4289 unicode_t ch, cmd = cmd_getc ();
3456 4290
3457 if (cmd == 'Q') 4291 if (cmd == 'Q')
3458 { /* query graphics */ 4292 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4293 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4294 return;
3461 } 4295 }
3462 /* swallow other graphics sequences until terminating ':' */ 4296 /* swallow other graphics sequences until terminating ':' */
3463 do 4297 do
3464 ch = cmd_getc (); 4298 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4313 unsigned char buf[256];
3480 4314
3481 va_start (arg_ptr, fmt); 4315 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4316 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4317 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4318 tt_write (buf, strlen (buf));
3485} 4319}
3486 4320
3487/* ---------------------------------------------------------------------- */ 4321/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4322/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4323 * or generated by us in response to a query ESC sequence.
3490 */ 4324 */
4325const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4326
3491void 4327void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4328rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4329{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4330 if (v_buflen == 0)
4331 {
4332 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3495 4333
3496 if (len) 4334 if ((unsigned int)written == len)
4335 return;
4336
4337 data += written;
4338 len -= written;
3497 { 4339 }
4340
4341 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4342
4343 memcpy (v_buffer + v_buflen, data, len);
4344 v_buflen += len;
4345
4346 pty_ev.set (EVENT_READ | EVENT_WRITE);
4347}
4348
4349void rxvt_term::pty_write ()
4350{
4351 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4352
4353 if (written > 0)
4354 {
4355 v_buflen -= written;
4356
3498 if (v_buflen == 0) 4357 if (v_buflen == 0)
3499 { 4358 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4359 free (v_buffer);
3527 v_buffer = 0; 4360 v_buffer = 0;
3528 v_buflen = 0; 4361 v_buflen = 0;
3529 4362
3530 pty_ev.set (EVENT_READ); 4363 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4364 return;
3543 } 4365 }
4366
4367 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4368 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this...
4371 destroy ();
3545} 4372}
3546 4373
3547/*----------------------- end-of-file (C source) -----------------------*/ 4374/*----------------------- end-of-file (C source) -----------------------*/
3548 4375

Diff Legend

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