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

Diff Legend

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