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

Diff Legend

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