ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.50 by pcg, Sun Feb 22 08:09:37 2004 UTC vs.
Revision 1.197 by root, Thu Feb 17 15:07:48 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 (0, FONT_UP);
147 return; 362 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, 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 (0, 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 (0, 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
… …
1213 && (ev.xclient.data.l[0] == DndFile 1340 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1341 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1342 || ev.xclient.data.l[0] == DndLink))
1216 { 1343 {
1217 /* Get Dnd data */ 1344 /* Get Dnd data */
1218 Atom ActualType; 1345 Atom ActualType;
1219 int ActualFormat; 1346 int ActualFormat;
1220 unsigned char *data; 1347 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1222 1349
1223 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1224 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1352 0L, 1000000L,
1226 False, AnyPropertyType, 1353 False, AnyPropertyType,
1227 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1228 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1229 &data); 1356 &data);
1230 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1231 XA_CUT_BUFFER0, XA_STRING, 1358 XFree (data);
1232 8, PropModeReplace,
1233 data, STRLEN (data));
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1236 } 1361 }
1237#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1238 break; 1363 break;
1239 1364
1240 case MappingNotify: 1365 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1366 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1367 break;
1243 1368
1244 /* 1369 /*
1245 * XXX: this is not the _current_ arrangement 1370 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1371 * Here's my conclusion:
… …
1271 { 1396 {
1272 TermWin.focus = 1; 1397 TermWin.focus = 1;
1273 want_refresh = 1; 1398 want_refresh = 1;
1274#ifdef USE_XIM 1399#ifdef USE_XIM
1275 if (Input_Context != NULL) 1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1276 XSetICFocus (Input_Context); 1403 XSetICFocus (Input_Context);
1404 }
1277#endif 1405#endif
1278#ifdef CURSOR_BLINK 1406#ifdef CURSOR_BLINK
1279 if (Options & Opt_cursorBlink) 1407 if (options & Opt_cursorBlink)
1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1281#endif 1416#endif
1282 1417
1283 } 1418 }
1284 break; 1419 break;
1285 1420
1286 case FocusOut: 1421 case FocusOut:
1287 if (TermWin.focus) 1422 if (TermWin.focus)
1288 { 1423 {
1289 TermWin.focus = 0; 1424 TermWin.focus = 0;
1290 want_refresh = 1; 1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1291#ifdef USE_XIM 1433#ifdef USE_XIM
1292 if (Input_Context != NULL) 1434 if (Input_Context != NULL)
1293 XUnsetICFocus (Input_Context); 1435 XUnsetICFocus (Input_Context);
1294#endif 1436#endif
1295#ifdef CURSOR_BLINK 1437#ifdef CURSOR_BLINK
1296 if (Options & Opt_cursorBlink) 1438 if (options & Opt_cursorBlink)
1297 cursor_blink_ev.stop (); 1439 cursor_blink_ev.stop ();
1298 hidden_cursor = 0; 1440 hidden_cursor = 0;
1299#endif 1441#endif
1300 1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1301 } 1449 }
1302 break; 1450 break;
1303 1451
1304 case ConfigureNotify: 1452 case ConfigureNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1453 if (ev.xconfigure.window == TermWin.parent[0])
… …
1310 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1311 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1312 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1313 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1314 } 1462 }
1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1316 1464
1317 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1318 { 1466 {
1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1467 seen_resize = 1;
1320 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1321 } 1469 }
1322#ifdef DEBUG_SIZE 1470
1323 else
1324 {
1325 D_SIZE ((stderr, "Size: Not resizing"));
1326 }
1327#endif
1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1329 if (Options & Opt_transparent) 1472 if (options & Opt_transparent)
1330 {
1331 check_our_parents (); 1473 check_our_parents ();
1332 if (am_transparent)
1333 want_full_refresh = 1;
1334 }
1335#endif 1474#endif
1336
1337 } 1475 }
1338 break; 1476 break;
1339 1477
1478 case PropertyNotify:
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1483 break;
1484
1340 case SelectionClear: 1485 case SelectionClear:
1341 display->set_selection_owner (0); 1486 selection_clear ();
1342 break; 1487 break;
1343 1488
1344 case SelectionNotify: 1489 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1492 break;
1349 1493
1350 case SelectionRequest: 1494 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1352 break; 1496 break;
… …
1373 1517
1374 case GraphicsExpose: 1518 case GraphicsExpose:
1375 case Expose: 1519 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1377 { 1521 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1526
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1532
1386 // ev.xexpose.width, TermWin.height, False); 1533 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1534 }
1390 else 1535 else
1391 { 1536 {
1392 XEvent unused_event; 1537 XEvent unused_event;
1393 1538
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1395 Expose, 1540 ;
1396 &unused_event)) ; 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1542 ;
1398 GraphicsExpose, 1543
1399 &unused_event)) ;
1400 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1401 { 1545 {
1402 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1403 scrollbar_show (0); 1547 scrollbar_show (0);
1404 } 1548 }
1405#ifdef MENUBAR 1549#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1551 menubar_expose ();
1408#endif 1552#endif
1553
1554#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1556 XClearWindow (disp, ev.xany.window);
1557#endif
1409 } 1558 }
1410 break; 1559 break;
1411 1560
1412 case MotionNotify: 1561 case MotionNotify:
1413#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1564 pointer_unblank ();
1416#endif 1565#endif
1417#if MENUBAR 1566#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1567 if (isMenuBarWindow (ev.xany.window))
1419 { 1568 {
1420 menubar_control (& (ev.xbutton)); 1569 menubar_control (ev.xbutton);
1421 break; 1570 break;
1422 } 1571 }
1423#endif 1572#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1574 break;
1426 1575
1427 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1428 { 1577 {
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1579 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1432 ; 1581 ;
1433 1582
1434 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1435 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1587 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1591 {
1443#endif 1592#endif
1593#if ISO_14755
1594 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1598 break;
1599 }
1600#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1446#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1449 { 1607 {
1450 int dist; 1608 int dist;
1451 1609
1452 pending_scroll_selection=1;
1453
1454 /* don't clobber the current delay if we are 1610 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1611 * already in the middle of scrolling.
1456 */ 1612 */
1457 if (scroll_selection_delay<=0) 1613 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1615
1460 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1462 */ 1618 */
1463 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1622
1468 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1470 { 1625 {
1471 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1473 } 1628 }
1474 else 1629 else
1475 { 1630 {
1476 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y -
1478 (TermWin.int_bwidth + TermWin.height); 1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1479 } 1633 }
1634
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1482 MIN_IT (scroll_selection_lines, 1638 MIN_IT (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1484 } 1640 }
1485 else 1641 else
1486 { 1642 {
1487 /* we are within the text window, so we 1643 /* we are within the text window, so we
1488 * shouldn't be scrolling 1644 * shouldn't be scrolling
1489 */ 1645 */
1490 pending_scroll_selection = 0; 1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop();
1491 } 1648 }
1492#endif 1649#endif
1493#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1494
1495 } 1651 }
1496#endif 1652#endif
1497
1498 } 1653 }
1499 } 1654 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1656 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1503 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1504 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1505 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1665 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1667 scrollbar_size ());
1511 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1514 } 1671 }
1515 break; 1672 break;
1516 } 1673 }
1517} 1674}
1518 1675
1676#if TRANSPARENT
1519void 1677void
1520rxvt_term::rootwin_cb (XEvent &ev) 1678rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1679{
1522 SET_R (this); 1680 SET_R (this);
1523 SET_LOCALE (locale); 1681 SET_LOCALE (locale);
1524 1682
1525 switch (ev.type) 1683 switch (ev.type)
1526 { 1684 {
1527 case PropertyNotify: 1685 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 /* 1686 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1687 * 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. 1688 * use the property to determine the pixmap. We use it later on.
1540 */ 1689 */
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]) 1690 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1545 return; 1692 return;
1546 }
1547 1693
1548 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1549 case ReparentNotify: 1695 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1697 want_refresh = want_full_refresh = 1;
1553 break; 1698 break;
1554#endif
1555 } 1699 }
1556} 1700}
1701#endif
1557 1702
1558void 1703void
1559rxvt_term::button_press (const XButtonEvent &ev) 1704rxvt_term::button_press (XButtonEvent &ev)
1560{ 1705{
1561 int reportmode = 0, clickintime; 1706 int reportmode = 0, clickintime;
1562 1707
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1709 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1710 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711
1566 /* 1712 /*
1567 * VT window processing of button press 1713 * VT window processing of button press
1568 */ 1714 */
1569 if (ev.window == TermWin.vt) 1715 if (ev.window == TermWin.vt)
1570 { 1716 {
1717#if ISO_14755
1718 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 {
1721 iso14755_54 (ev.x, ev.y);
1722 return;
1723 }
1724#endif
1725
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1572 if (reportmode) 1728 if (reportmode)
1573 { 1729 {
1574 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1605 } 1761 }
1606 else 1762 else
1607 { 1763 {
1608 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1610 switch (ev.button) 1767 switch (ev.button)
1611 { 1768 {
1612 case Button1: 1769 case Button1:
1770 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */
1772#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask);
1774#else
1775 selection.rect = false;
1776#endif
1777
1613 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1615 { 1780 {
1616 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
1618 else 1783 else
1619 selection_extend (ev.x, ev.y, 1); 1784 selection_extend (ev.x, ev.y, 1);
… …
1634 case Button3: 1799 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1800 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1801 selection_rotate (ev.x, ev.y);
1637 else 1802 else
1638 selection_extend (ev.x, ev.y, 1); 1803 selection_extend (ev.x, ev.y, 1);
1804
1639 MEvent.button = Button3; 1805 MEvent.button = Button3;
1640 break; 1806 break;
1641 } 1807 }
1642 } 1808 }
1809
1643 MEvent.time = ev.time; 1810 MEvent.time = ev.time;
1644 return; 1811 return;
1645 } 1812 }
1646 1813
1647 /* 1814 /*
… …
1713 upordown = 1; /* down */ 1880 upordown = 1; /* down */
1714 } 1881 }
1715 if (upordown) 1882 if (upordown)
1716 { 1883 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1884#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1885 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1886#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1887 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1888 {
1722 if (upordown < 0) 1889 if (upordown < 0)
1723 scrollBar.setUp (); 1890 scrollBar.setUp ();
… …
1739 break; 1906 break;
1740 case R_SB_ALIGN_BOTTOM: 1907 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 1908 csrO = scrollBar.bot - scrollBar.top;
1742 break; 1909 break;
1743 } 1910 }
1911
1744 if (scrollBar.style == R_SB_XTERM 1912 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 1913 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 1914 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 1915 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 1916
1749 scrollBar.setMotion (); 1917 scrollBar.setMotion ();
1750 break; 1918 break;
1751 1919
1752 case Button1: 1920 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1921 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1777 scr_page ((ev.button == Button1 ? DN : UP), 1945 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 1946 (TermWin.nrow
1779 * scrollbar_position (ev.y) 1947 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 1948 / scrollbar_size ()));
1781 } 1949 }
1950
1782 break; 1951 break;
1783 } 1952 }
1784 } 1953 }
1785 return; 1954 return;
1786 } 1955 }
… …
1792 menubar_control (ev); 1961 menubar_control (ev);
1793#endif 1962#endif
1794} 1963}
1795 1964
1796void 1965void
1797rxvt_term::button_release (const XButtonEvent &ev) 1966rxvt_term::button_release (XButtonEvent &ev)
1798{ 1967{
1799 int reportmode = 0; 1968 int reportmode = 0;
1800 1969
1801 csrO = 0; /* reset csr Offset */ 1970 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 1971 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1972 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 1973
1805 if (scrollbar_isUpDn ()) 1974 if (scrollbar_isUpDn ())
1806 { 1975 {
1807 scrollBar.setIdle (); 1976 scrollBar.setIdle ();
1808 scrollbar_show (0); 1977 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 1979 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 1980#endif
1812
1813 } 1981 }
1982
1814#ifdef SELECTION_SCROLLING 1983#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 1984 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop();
1816#endif 1986#endif
1987
1817 if (ev.window == TermWin.vt) 1988 if (ev.window == TermWin.vt)
1818 { 1989 {
1990#if ISO_14755
1991 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return;
1994#endif
1819 if (reportmode) 1995 if (reportmode)
1820 { 1996 {
1821 /* mouse report from vt window */ 1997 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 1998 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 1999 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 2013 MEvent.button = AnyButton;
1838 mouse_report (ev); 2014 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 2015#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2016 return;
1841 } 2017 }
2018
1842 /* 2019 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2020 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2021 * when overriding mouse reporting
1845 */ 2022 */
1846 if (PrivateModes & PrivMode_mouse_report 2023 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2024 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2025 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2026 selection_extend (ev.x, ev.y, 0);
1850 2027
1851 switch (ev.button) 2028 switch (ev.button)
… …
1862 case Button5: 2039 case Button5:
1863 { 2040 {
1864 int i; 2041 int i;
1865 page_dirn v; 2042 page_dirn v;
1866 2043
1867 v = (ev.button == Button4) ? UP : DN; 2044 v = ev.button == Button4 ? UP : DN;
2045
1868 if (ev.state & ShiftMask) 2046 if (ev.state & ShiftMask)
1869 i = 1; 2047 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2048 else if (options & Opt_mouseWheelScrollPage)
1871 i = TermWin.nrow - 1; 2049 i = TermWin.nrow - 1;
1872 else 2050 else
1873 i = 5; 2051 i = 5;
2052
1874# ifdef MOUSE_SLIP_WHEELING 2053# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2054 if (ev.state & ControlMask)
1876 { 2055 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2056 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2059
2060 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062
2063 slip_wheel_ev.start ();
1879 } 2064 }
2065 else
2066 {
1880# endif 2067# endif
1881# ifdef JUMP_MOUSE_WHEEL 2068# 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); 2069 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 2070 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 2071 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING
1891 } 2081 }
1892# endif 2082#endif
1893
1894 } 2083 }
1895 break; 2084 break;
1896#endif 2085#endif
1897
1898 } 2086 }
1899 } 2087 }
1900#ifdef MENUBAR 2088#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2089 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2090 menubar_control (ev);
1903#endif 2091#endif
1904} 2092}
1905 2093
1906
1907#ifdef TRANSPARENT 2094#ifdef TRANSPARENT
2095#if TINTING
2096/* taken from aterm-0.4.2 */
2097
2098typedef uint32_t RUINT32T;
2099
2100void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2101{
2102 int sh_r, sh_g, sh_b;
2103 RUINT32T mask_r, mask_g, mask_b;
2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i;
2108
2109 Visual *visual = display->visual;
2110
2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2112
2113 /* for convenience */
2114 mask_r = visual->red_mask;
2115 mask_g = visual->green_mask;
2116 mask_b = visual->blue_mask;
2117
2118 /* boring lookup table pre-initialization */
2119 switch (srcImage->bits_per_pixel) {
2120 case 15:
2121 if ((mask_r != 0x7c00) ||
2122 (mask_g != 0x03e0) ||
2123 (mask_b != 0x001f))
2124 return;
2125 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2126 lookup_r = lookup;
2127 lookup_g = lookup+32;
2128 lookup_b = lookup+32+32;
2129 sh_r = 10;
2130 sh_g = 5;
2131 sh_b = 0;
2132 break;
2133 case 16:
2134 if ((mask_r != 0xf800) ||
2135 (mask_g != 0x07e0) ||
2136 (mask_b != 0x001f))
2137 return;
2138 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2139 lookup_r = lookup;
2140 lookup_g = lookup+32;
2141 lookup_b = lookup+32+64;
2142 sh_r = 11;
2143 sh_g = 5;
2144 sh_b = 0;
2145 break;
2146 case 24:
2147 if ((mask_r != 0xff0000) ||
2148 (mask_g != 0x00ff00) ||
2149 (mask_b != 0x0000ff))
2150 return;
2151 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2152 lookup_r = lookup;
2153 lookup_g = lookup+256;
2154 lookup_b = lookup+256+256;
2155 sh_r = 16;
2156 sh_g = 8;
2157 sh_b = 0;
2158 break;
2159 case 32:
2160 if ((mask_r != 0xff0000) ||
2161 (mask_g != 0x00ff00) ||
2162 (mask_b != 0x0000ff))
2163 return;
2164 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2165 lookup_r = lookup;
2166 lookup_g = lookup+256;
2167 lookup_b = lookup+256+256;
2168 sh_r = 16;
2169 sh_g = 8;
2170 sh_b = 0;
2171 break;
2172 default:
2173 return; /* we do not support this color depth */
2174 }
2175
2176 /* prepare limits for color transformation (each channel is handled separately) */
2177 if (shade < 0) {
2178 shade = -shade;
2179 if (shade < 0) shade = 0;
2180 if (shade > 100) shade = 100;
2181
2182 lower_lim_r = 65535-rm;
2183 lower_lim_g = 65535-gm;
2184 lower_lim_b = 65535-bm;
2185
2186 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2187 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2188 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2189
2190 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2191 } else {
2192 if (shade < 0) shade = 0;
2193 if (shade > 100) shade = 100;
2194
2195 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2196
2197 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2198 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2199 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2200 }
2201
2202 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2203 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2204 {
2205 unsigned int tmp;
2206
2207 tmp = lower_lim_r;
2208 lower_lim_r = lower_lim_b;
2209 lower_lim_b = tmp;
2210
2211 tmp = upper_lim_r;
2212 upper_lim_r = upper_lim_b;
2213 upper_lim_b = tmp;
2214 }
2215
2216 /* fill our lookup tables */
2217 for (i = 0; i <= mask_r>>sh_r; i++)
2218 {
2219 RUINT32T tmp;
2220 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2221 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2222 lookup_r[i] = (tmp/65535)<<sh_r;
2223 }
2224 for (i = 0; i <= mask_g>>sh_g; i++)
2225 {
2226 RUINT32T tmp;
2227 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2228 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2229 lookup_g[i] = (tmp/65535)<<sh_g;
2230 }
2231 for (i = 0; i <= mask_b>>sh_b; i++)
2232 {
2233 RUINT32T tmp;
2234 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2235 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2236 lookup_b[i] = (tmp/65535)<<sh_b;
2237 }
2238
2239 /* apply table to input image (replacing colors by newly calculated ones) */
2240 switch (srcImage->bits_per_pixel)
2241 {
2242 case 15:
2243 {
2244 unsigned short *p1, *pf, *p, *pl;
2245 p1 = (unsigned short *) srcImage->data;
2246 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2247 while (p1 < pf)
2248 {
2249 p = p1;
2250 pl = p1 + srcImage->width;
2251 for (; p < pl; p++)
2252 {
2253 *p = lookup_r[(*p & 0x7c00)>>10] |
2254 lookup_g[(*p & 0x03e0)>> 5] |
2255 lookup_b[(*p & 0x001f)];
2256 }
2257 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2258 }
2259 break;
2260 }
2261 case 16:
2262 {
2263 unsigned short *p1, *pf, *p, *pl;
2264 p1 = (unsigned short *) srcImage->data;
2265 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2266 while (p1 < pf)
2267 {
2268 p = p1;
2269 pl = p1 + srcImage->width;
2270 for (; p < pl; p++)
2271 {
2272 *p = lookup_r[(*p & 0xf800)>>11] |
2273 lookup_g[(*p & 0x07e0)>> 5] |
2274 lookup_b[(*p & 0x001f)];
2275 }
2276 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2277 }
2278 break;
2279 }
2280 case 24:
2281 {
2282 unsigned char *p1, *pf, *p, *pl;
2283 p1 = (unsigned char *) srcImage->data;
2284 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2285 while (p1 < pf)
2286 {
2287 p = p1;
2288 pl = p1 + srcImage->width * 3;
2289 for (; p < pl; p += 3)
2290 {
2291 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2292 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2293 p[2] = lookup_r[(p[2] & 0x0000ff)];
2294 }
2295 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2296 }
2297 break;
2298 }
2299 case 32:
2300 {
2301 RUINT32T *p1, *pf, *p, *pl;
2302 p1 = (RUINT32T *) srcImage->data;
2303 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2304
2305 while (p1 < pf)
2306 {
2307 p = p1;
2308 pl = p1 + srcImage->width;
2309 for (; p < pl; p++)
2310 {
2311 *p = lookup_r[(*p & 0xff0000)>>16] |
2312 lookup_g[(*p & 0x00ff00)>> 8] |
2313 lookup_b[(*p & 0x0000ff)] |
2314 (*p & ~0xffffff);
2315 }
2316 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2317 }
2318 break;
2319 }
2320 }
2321
2322 free (lookup);
2323}
2324#endif
2325
1908/* 2326/*
1909 * Check our parents are still who we think they are. 2327 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2328 * Do transparency updates if required
1911 */ 2329 */
1912int 2330int
1913rxvt_term::check_our_parents () 2331rxvt_term::check_our_parents ()
1914{ 2332{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2333 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2334 unsigned long nitems, bytes_after;
1917 Atom atype; 2335 Atom atype;
1918 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2337 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
1922 2341
1923 pchanged = 0; 2342 pchanged = 0;
1924 2343
1925 if (! (Options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1927 2346
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
1930 2349
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2351
1932 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
1933 { 2353 {
1934 if (am_transparent) 2354 if (am_transparent)
1935 { 2355 {
1936 pchanged = 1; 2356 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
1940 } 2359 }
2360
1941 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
1942 } 2362 }
1943 2363
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2365 XSync (disp, False);
1946 2366
1947 /* 2367 /*
1948 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
1951 */ 2371 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2372 i = (xa[XA_XROOTPMAP_ID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2375 &nitems, &bytes_after, &prop) == Success);
2376
1956 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2378 i = (xa[XA_ESETROOT_PMAP_ID]
2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2381 &nitems, &bytes_after, &prop) == Success);
2382
2383 if (!i || prop == NULL
2384#if TINTING
2385 || !rs[Rs_color + Color_tint]
2386#endif
2387 )
1957 have_pixmap = 0; 2388 have_pixmap = 0;
1958 else 2389 else
1959 { 2390 {
1960 have_pixmap = 1; 2391 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2392 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2393 XFree (prop);
1963 } 2394 }
2395
1964 if (have_pixmap) 2396 if (have_pixmap)
1965 { 2397 {
1966 /* 2398 /*
1967 * Copy display->root pixmap transparency 2399 * Copy display->root pixmap transparency
1968 */ 2400 */
1969 int sx, sy, nx, ny; 2401 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2402 unsigned int nw, nh;
1971 Window cr; 2403 Window cr;
1972 XImage *image; 2404 XImage *image;
1973 GC gc; 2405 GC gc;
1974 XGCValues gcvalue; 2406 XGCValues gcvalue;
1975 2407
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2412 nx = ny = 0;
2413
1981 if (sx < 0) 2414 if (sx < 0)
1982 { 2415 {
1983 nw += sx; 2416 nw += sx;
1984 nx = -sx; 2417 nx = -sx;
1985 sx = 0; 2418 sx = 0;
1986 } 2419 }
2420
1987 if (sy < 0) 2421 if (sy < 0)
1988 { 2422 {
1989 nh += sy; 2423 nh += sy;
1990 ny = -sy; 2424 ny = -sy;
1991 sy = 0; 2425 sy = 0;
1992 } 2426 }
2427
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
1995 allowedxerror = -1; 2432 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2434
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2437 allowedxerror = 0;
2438
2001 if (image == NULL) 2439 if (image == NULL)
2002 { 2440 {
2003 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2004 { 2442 {
2005 pchanged = 1; 2443 pchanged = 1;
2006 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2007 { 2445 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2009 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2010 } 2448 }
2011 } 2449 }
2450
2012 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2013 } 2452 }
2014 else 2453 else
2015 { 2454 {
2016 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2457
2458#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint))
2460 {
2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2463
2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2465
2466 ShadeXImage (display, image, shade, rm, gm, bm);
2467 }
2468#endif
2469
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2471 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2474 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2027 XDestroyImage (image); 2476 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2029 TermWin.pixmap); 2478 XClearWindow (disp, TermWin.parent[0]);
2479
2030 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2481 pchanged = 1;
2482
2032 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2033 } 2484 }
2034 } 2485 }
2486
2035 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2036 { 2490 {
2037 unsigned int n; 2491 unsigned int n;
2038 /* 2492 /*
2039 * InheritPixmap transparency 2493 * InheritPixmap transparency
2040 */ 2494 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2496 {
2045 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2048 XFree (list); 2500 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2501
2050 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2051 { 2503 {
2052 if (oldp != None) 2504 if (oldp != None)
2053 pchanged = 1; 2505 pchanged = 1;
2506
2054 break; 2507 break;
2055 } 2508 }
2509
2056 if (oldp != TermWin.parent[i]) 2510 if (oldp != TermWin.parent[i])
2057 pchanged = 1; 2511 pchanged = 1;
2058 } 2512 }
2513
2059 n = 0; 2514 n = 0;
2515
2060 if (pchanged) 2516 if (pchanged)
2061 { 2517 {
2062 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2063 { 2519 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 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) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2522 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2069 break; 2524 break;
2070 } 2525 }
2071 } 2526 }
2072 } 2527 }
2073 if (n > (int) (sizeof (TermWin.parent) 2528
2074 / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2075 { 2530 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2532 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; 2533 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2083 } 2535 }
2084 else 2536 else
2085 { 2537 {
2538#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2539 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2540 * 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); 2541 sleep (1);
2096# endif 2542#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2544 {
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2100 ParentRelative); 2546 XClearWindow (disp, TermWin.parent[n]);
2547 }
2548
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2102 ParentRelative);
2103 am_transparent = 1; 2550 am_transparent = 1;
2104 } 2551 }
2552
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2107 } 2555 }
2556
2557 if (scrollBar.win)
2558 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle ();
2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2569 }
2570
2108 return pchanged; 2571 return pchanged;
2109} 2572}
2110#endif 2573#endif
2111 2574
2112/*}}} */ 2575/*}}} */
2576
2577bool
2578rxvt_term::cmd_parse ()
2579{
2580 bool flag = false;
2581 unicode_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here
2583
2584 for (;;)
2585 {
2586 if (ch == NOCHAR)
2587 {
2588 seq_begin = cmdbuf_ptr;
2589 ch = next_char ();
2590 }
2591
2592 if (ch == NOCHAR) // TODO: improve
2593 break;
2594
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 {
2597 if (!seen_input)
2598 {
2599 seen_input = 1;
2600 // many badly-written programs (e.g. jed) contain a race condition:
2601 // they first read the screensize and then install a SIGWINCH handler.
2602 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized.
2607 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH);
2609 }
2610
2611 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false;
2614 int nlines = 0;
2615 unicode_t *str = buf;
2616
2617 for (;;)
2618 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break;
2621
2622 *str++ = ch;
2623
2624 if (ch == C0_LF)
2625 {
2626 nlines++;
2627 refresh_count++;
2628
2629 if (!(options & Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2631 {
2632 refreshnow = true;
2633 ch = NOCHAR;
2634 break;
2635 }
2636
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2638 if (nlines >= TermWin.nrow - 1)
2639 {
2640 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0;
2642 str = buf;
2643 }
2644 }
2645
2646 if (str >= buf + UBUFSIZ)
2647 {
2648 ch = NOCHAR;
2649 break;
2650 }
2651
2652 seq_begin = cmdbuf_ptr;
2653 ch = next_char ();
2654 }
2655
2656 scr_add_lines (buf, nlines, str - buf);
2657
2658 /*
2659 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling.
2663 */
2664 if (refreshnow)
2665 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++;
2668 else
2669 {
2670 flag = true;
2671 scr_refresh (refresh_type);
2672 }
2673 }
2674
2675 }
2676 else
2677 {
2678 try
2679 {
2680 process_nonprinting (ch);
2681 }
2682 catch (const class out_of_input &o)
2683 {
2684 // we ran out of input, retry later
2685 cmdbuf_ptr = seq_begin;
2686 break;
2687 }
2688
2689 ch = NOCHAR;
2690 }
2691 }
2692
2693 return flag;
2694}
2695
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character
2706unicode_t
2707rxvt_term::next_char ()
2708{
2709 while (cmdbuf_ptr < cmdbuf_endp)
2710 {
2711 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++;
2714
2715 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717
2718 if (len == (size_t)-2)
2719 {
2720 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp;
2722 break;
2723 }
2724
2725 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727
2728 // assume wchar == unicode
2729 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK;
2731 }
2732
2733 return NOCHAR;
2734}
2735
2736/* rxvt_cmd_getc () - Return next input character */
2737/*
2738 * Return the next input character after first passing any keyboard input
2739 * to the command.
2740 */
2741unicode_t
2742rxvt_term::cmd_getc ()
2743{
2744 unicode_t c = next_char ();
2745
2746 if (c == NOCHAR)
2747 throw out_of_input;
2748
2749 return c;
2750}
2751
2752unicode_t
2753rxvt_term::cmd_get8 ()
2754{
2755 unicode_t c = next_octet ();
2756
2757 if (c == NOCHAR)
2758 throw out_of_input;
2759
2760 return c;
2761}
2113 2762
2114/*{{{ print pipe */ 2763/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2764/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2765#ifdef PRINTPIPE
2117FILE * 2766FILE *
2118rxvt_term::popen_printer () 2767rxvt_term::popen_printer ()
2119{ 2768{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2769 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2770
2122 if (stream == NULL) 2771 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2772 rxvt_warn ("can't open printer pipe, not printing.\n");
2773
2124 return stream; 2774 return stream;
2125} 2775}
2126 2776
2127int 2777int
2128rxvt_term::pclose_printer (FILE *stream) 2778rxvt_term::pclose_printer (FILE *stream)
2129{ 2779{
2130 fflush (stream); 2780 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); 2781 return pclose (stream);
2137# endif
2138} 2782}
2139 2783
2140/* 2784/*
2141 * simulate attached vt100 printer 2785 * simulate attached vt100 printer
2142 */ 2786 */
2143void 2787void
2144rxvt_term::process_print_pipe () 2788rxvt_term::process_print_pipe ()
2145{ 2789{
2146 int done; 2790 int done;
2147 FILE *fd; 2791 FILE *fd;
2148 2792
2149 if ((fd = popen_printer ()) == NULL) 2793 if ((fd = popen_printer ()) == NULL)
2150 return; 2794 return;
2151 2795
2152 /* 2796 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2797 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2798 * is received.
2155 */ 2799 */
2156 for (done = 0; !done;) 2800 for (done = 0; !done;)
2157 { 2801 {
2158 unsigned char buf[8]; 2802 unsigned char buf[8];
2159 unsigned char ch; 2803 unicode_t ch;
2160 unsigned int i, len; 2804 unsigned int i, len;
2161 2805
2162 if ((ch = cmd_getc ()) != C0_ESC) 2806 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2807 {
2164 if (putc (ch, fd) == EOF) 2808 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2809 break; /* done = 1 */
… …
2180 { 2824 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2825 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2826 break; /* done = 1 */
2183 } 2827 }
2184 } 2828 }
2829
2185 for (i = 0; i < len; i++) 2830 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2831 if (putc (buf[i], fd) == EOF)
2187 { 2832 {
2188 done = 1; 2833 done = 1;
2189 break; 2834 break;
2190 } 2835 }
2191 } 2836 }
2192 } 2837 }
2838
2193 pclose_printer (fd); 2839 pclose_printer (fd);
2194} 2840}
2195#endif /* PRINTPIPE */ 2841#endif /* PRINTPIPE */
2196/*}}} */ 2842/*}}} */
2197 2843
2198/* *INDENT-OFF* */ 2844/* *INDENT-OFF* */
2199enum { 2845enum {
2200 C1_40 = 0x40, 2846 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2847 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, 2848 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, 2849 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 2850 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2851};
2206/* *INDENT-ON* */ 2852/* *INDENT-ON* */
2207 2853
2208/*{{{ process non-printing single characters */ 2854/*{{{ process non-printing single characters */
2209void 2855void
2210rxvt_term::process_nonprinting (unsigned char ch) 2856rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2857{
2212 switch (ch) 2858 switch (ch)
2213 { 2859 {
2860 case C0_ESC:
2861 process_escape_seq ();
2862 break;
2214 case C0_ENQ: /* terminal Status */ 2863 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2864 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2219 else 2867 else
2220 tt_write ((unsigned char *)VT100_ANS, 2868 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2869 (unsigned int)strlen (VT100_ANS));
2222 break; 2870 break;
2223 case C0_BEL: /* bell */ 2871 case C0_BEL: /* bell */
2224 scr_bell (); 2872 scr_bell ();
2225 break; 2873 break;
2226 case C0_BS: /* backspace */ 2874 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2889 scr_charset_choose (1);
2242 break; 2890 break;
2243 case C0_SI: /* shift in - acs */ 2891 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2892 scr_charset_choose (0);
2245 break; 2893 break;
2894
2895#ifdef EIGHT_BIT_CONTROLS
2896 // 8-bit controls
2897 case 0x90: /* DCS */
2898 process_dcs_seq ();
2899 break;
2900 case 0x9b: /* CSI */
2901 process_csi_seq ();
2902 break;
2903 case 0x9d: /* CSI */
2904 process_osc_seq ();
2905 break;
2906#endif
2246 } 2907 }
2247} 2908}
2248/*}}} */ 2909/*}}} */
2249 2910
2250 2911
2251/*{{{ process VT52 escape sequences */ 2912/*{{{ process VT52 escape sequences */
2252void 2913void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2914rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2915{
2255 int row, col; 2916 int row, col;
2256 2917
2257 switch (ch) 2918 switch (ch)
2258 { 2919 {
… …
2310 2971
2311/*{{{ process escape sequences */ 2972/*{{{ process escape sequences */
2312void 2973void
2313rxvt_term::process_escape_seq () 2974rxvt_term::process_escape_seq ()
2314{ 2975{
2315 unsigned char ch = cmd_getc (); 2976 unicode_t ch = cmd_getc ();
2316 2977
2317 if (PrivateModes & PrivMode_vt52) 2978 if (priv_modes & PrivMode_vt52)
2318 { 2979 {
2319 process_escape_vt52 (ch); 2980 process_escape_vt52 (ch);
2320 return; 2981 return;
2321 } 2982 }
2322 2983
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2998 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2999 break;
2339 case '+': 3000 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 3001 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 3002 break;
2342#ifdef MULTICHAR_SET 3003#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': 3004 case '6':
2349 scr_backindex (); 3005 scr_backindex ();
2350 break; 3006 break;
2351#endif 3007#endif
2352 case '7': 3008 case '7':
2353 scr_cursor (SAVE); 3009 scr_cursor (SAVE);
2354 break; 3010 break;
2355 case '8': 3011 case '8':
2356 scr_cursor (RESTORE); 3012 scr_cursor (RESTORE);
2357 break; 3013 break;
2358#ifndef NO_FRILLS 3014#if ENABLE_FRILLS
2359 case '9': 3015 case '9':
2360 scr_forwardindex (); 3016 scr_forwardindex ();
2361 break; 3017 break;
2362#endif 3018#endif
2363 case '=': 3019 case '=':
… …
2373 break; 3029 break;
2374 3030
2375 /* 8.3.87: NEXT LINE */ 3031 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3032 case C1_NEL: /* ESC E */
2377 { 3033 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3034 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3035 scr_add_lines (nlcr, 1, 2);
2380 } 3036 }
2381 break; 3037 break;
2382 3038
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3039 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 3050 case C1_RI: /* ESC M */
2395 scr_index (DN); 3051 scr_index (DN);
2396 break; 3052 break;
2397 3053
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3054 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3055 /*case C1_SS2: scr_single_shift (2); break; */
2400 3056
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3057 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3058 /*case C1_SS3: scr_single_shift (3); break; */
2403 3059
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3060 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3061 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3062 process_dcs_seq ();
2407 break; 3063 break;
… …
2422 process_osc_seq (); 3078 process_osc_seq ();
2423 break; 3079 break;
2424 3080
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3081 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3082 case 'c':
3083 mbstate.reset ();
2427 scr_poweron (); 3084 scr_poweron ();
2428 scrollbar_show (1); 3085 scrollbar_show (1);
2429 break; 3086 break;
2430 3087
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3088 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3100
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3101/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3102/* *INDENT-OFF* */
2446enum { 3103enum {
2447 CSI_ICH = 0x40, 3104 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3105 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 , 3106 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, 3107 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, 3108 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, 3109 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, 3110 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, */ 3125 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, [, \, ], ^, _, */ 3126 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, */ 3127 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, */ 3128 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, */ 3129 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, {, |, }, ~, */ 3130 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3131 };
2475/* *INDENT-ON* */ 3132/* *INDENT-ON* */
2476 3133
2477void 3134void
2478rxvt_term::process_csi_seq () 3135rxvt_term::process_csi_seq ()
2479{ 3136{
2480 unsigned char ch, priv, i; 3137 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3138 unsigned int nargs, p;
2482 int n, ndef; 3139 int n, ndef;
2483 int arg[ESC_ARGS]; 3140 int arg[ESC_ARGS];
2484 3141
2485 for (nargs = ESC_ARGS; nargs > 0;) 3142 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3143 arg[--nargs] = 0;
2487 3144
2488 priv = 0; 3145 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3147 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3148 { /* '<' '=' '>' '?' */
2492 priv = ch; 3149 priv = ch;
2493 ch = cmd_getc (); 3150 ch = cmd_getc ();
2494 } 3151 }
3152
2495 /* read any numerical arguments */ 3153 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3154 for (n = -1; ch < CSI_ICH; )
2497 { 3155 {
2498 if (isdigit (ch)) 3156 if (isdigit (ch))
2499 { 3157 {
… …
2506 { 3164 {
2507 if (nargs < ESC_ARGS) 3165 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3166 arg[nargs++] = n;
2509 n = -1; 3167 n = -1;
2510 } 3168 }
2511 else if (ch == '\b') 3169 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); 3170 process_nonprinting (ch);
2523 } 3171
2524 ch = cmd_getc (); 3172 ch = cmd_getc ();
2525 } 3173 }
2526 3174
2527 if (ch > CSI_7F) 3175 if (ch > CSI_7F)
2528 return; 3176 return;
… …
2550 { 3198 {
2551 switch (priv) 3199 switch (priv)
2552 { 3200 {
2553 case '>': 3201 case '>':
2554 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2556 break; 3204 break;
2557 case '?': 3205 case '?':
2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2559 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
2560 break; 3208 break;
… …
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2671 break; 3319 break;
2672 3320
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3322 tt_write ((const unsigned char *)VT100_ANS,
2675 (unsigned int) (sizeof (VT100_ANS) - 1)); 3323 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3324 break;
2677 3325
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3327 process_sgr_mode (nargs, arg);
2680 break; 3328 break;
… …
2686 tt_printf ("\033[0n"); 3334 tt_printf ("\033[0n");
2687 break; 3335 break;
2688 case 6: /* CPR requested */ 3336 case 6: /* CPR requested */
2689 scr_report_position (); 3337 scr_report_position ();
2690 break; 3338 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3339 case 7: /* unofficial extension */
3340 if (options & Opt_insecure)
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3341 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3342 break;
2695#endif
2696 case 8: /* unofficial extension */ 3343 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3345 break;
2699 } 3346 }
2700 break; 3347 break;
2701 3348
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3349 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3382 break;
2736 3383
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3384 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3385 if (arg[0] == 4)
2739 scr_insert_mode (0); 3386 scr_insert_mode (0);
3387 else if (arg[0] == 20)
3388 priv_modes &= ~PrivMode_LFNL;
2740 break; 3389 break;
2741 3390
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3391 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3392 if (arg[0] == 4)
2744 scr_insert_mode (1); 3393 scr_insert_mode (1);
3394 else if (arg[0] == 20)
3395 priv_modes |= PrivMode_LFNL;
2745 break; 3396 break;
2746 3397
2747 /* 3398 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3399 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3400 */
… …
2761 break; 3412 break;
2762 case CSI_75: 3413 case CSI_75:
2763 scr_cursor (RESTORE); 3414 scr_cursor (RESTORE);
2764 break; 3415 break;
2765 3416
2766#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2767 case CSI_74: 3418 case CSI_74:
2768 process_window_ops (arg, nargs); 3419 process_window_ops (arg, nargs);
2769 break; 3420 break;
2770#endif 3421#endif
2771 3422
2772 case CSI_78: /* DECREQTPARM */ 3423 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3424 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3425 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3426 break;
2776 3427
2777 default: 3428 default:
2778 break; 3429 break;
2779 } 3430 }
2780} 3431}
2781/*}}} */ 3432/*}}} */
2782 3433
2783#ifndef NO_FRILLS 3434#if ENABLE_FRILLS
2784/* ARGSUSED */ 3435/* ARGSUSED */
2785void 3436void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3438{
2788 int x, y; 3439 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
2793 Window wdummy; 3441 Window wdummy;
3442 dDisp;
2794 3443
2795 if (nargs == 0) 3444 if (nargs == 0)
2796 return; 3445 return;
3446
2797 switch (args[0]) 3447 switch (args[0])
2798 { 3448 {
2799 /* 3449 /*
2800 * commands 3450 * commands
2801 */ 3451 */
2802 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
2804 break; 3454 break;
2805 case 2: /* iconify window */ 3455 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2807 DefaultScreen (display->display));
2808 break; 3457 break;
2809 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2811 break; 3460 break;
2812 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2814 break; 3463 break;
2815 case 5: /* raise window */ 3464 case 5: /* raise window */
2816 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
2817 break; 3466 break;
2818 case 6: /* lower window */ 3467 case 6: /* lower window */
2819 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
2820 break; 3469 break;
2821 case 7: /* refresh window */ 3470 case 7: /* refresh window */
2822 scr_touch (true); 3471 scr_touch (true);
2823 break; 3472 break;
2824 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3475 (unsigned int) (args[1] * TermWin.fheight));
2827 break; 3476 break;
3477
3478 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3479 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3480 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3481 set_widthheight ((unsigned int)TermWin.width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3482 (unsigned int) (args[1] * TermWin.fheight));
2832 break; 3483 break;
3484
3485
2833 /* 3486 /*
2834 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
2835 */ 3488 */
2836 case 11: /* report window state */ 3489 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3492 break;
2840 case 13: /* report window position */ 3493 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3499 break;
2847 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3503 break;
2851 case 18: /* report window size (chars) */ 3504 case 18: /* report text area size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2853 break; 3506 break;
2854#if 0 /* XXX: currently disabled due to security concerns */ 3507 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3509 break;
2855 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3511 {
3512 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s);
3516 }
2858 break; 3517 break;
2859 case 21: /* report window title */ 3518 case 21: /* report window title */
3519 {
3520 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s);
3524 }
2862 break; 3525 break;
2863#endif
2864
2865 } 3526 }
2866} 3527}
2867#endif 3528#endif
2868 3529
2869/*----------------------------------------------------------------------*/ 3530/*----------------------------------------------------------------------*/
2870/* 3531/*
2871 * get input up until STRING TERMINATOR (or BEL) 3532 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3533 * ends_how is terminator used. returned input must be free()'d
2873 */ 3534 */
2874unsigned char * 3535unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3537{
2877 int seen_esc = 0; /* seen escape? */ 3538 unicode_t ch;
3539 bool seen_esc = false;
2878 unsigned int n = 0; 3540 unsigned int n = 0;
2879 unsigned char *s; 3541 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3542
2882 for (; (ch = cmd_getc ());) 3543 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3544 {
2884 if (ch == C0_BEL 3545 if (seen_esc)
2885 || ch == CHAR_ST 3546 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3547 if (ch == 0x5c) /* 7bit ST */
2887 break; 3548 break;
3549 else
3550 return NULL;
3551 }
2888 if (ch == C0_ESC) 3552 else if (ch == C0_ESC)
2889 { 3553 {
2890 seen_esc = 1; 3554 seen_esc = true;
2891 continue; 3555 continue;
2892 } 3556 }
2893 else if (ch == '\t') 3557 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3558 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3559 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3561
3562 seen_esc = false;
3563
2897 if (n < sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3565 // stop at some sane length
3566 return NULL;
3567
3568 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 ();
3570 else
2898 string[n++] = ch; 3571 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3572 }
3573
2901 string[n++] = '\0'; 3574 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3575
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3577
2906 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
2907} 3579}
2908 3580
2909/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
2910/* 3582/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3584 */
2913void 3585void
2914rxvt_term::process_dcs_seq () 3586rxvt_term::process_dcs_seq ()
2915{ 3587{
2916 unsigned char eh, *s; 3588 unsigned char *s;
3589 unicode_t eh;
3590
2917 /* 3591 /*
2918 * Not handled yet 3592 * Not handled yet
2919 */ 3593 */
2920 s = get_to_st (&eh); 3594 s = get_to_st (eh);
2921 if (s) 3595 if (s)
2922 free (s); 3596 free (s);
3597
2923 return; 3598 return;
2924} 3599}
2925 3600
2926/*----------------------------------------------------------------------*/ 3601/*----------------------------------------------------------------------*/
2927/* 3602/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3603 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3604 */
2930void 3605void
2931rxvt_term::process_osc_seq () 3606rxvt_term::process_osc_seq ()
2932{ 3607{
2933 unsigned char ch, eh, *s; 3608 unicode_t ch, eh;
2934 int arg; 3609 int arg;
2935 3610
2936 ch = cmd_getc (); 3611 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3612 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3613 arg = arg * 10 + (ch - '0');
2939 3614
2940 if (ch == ';') 3615 if (ch == ';')
2941 { 3616 {
2942 s = get_to_st (&eh); 3617 unsigned char *s = get_to_st (eh);
3618
2943 if (s) 3619 if (s)
2944 { 3620 {
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); 3621 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3622 free (s);
2958 } 3623 }
2959 } 3624 }
2960} 3625}
3626
3627void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3629{
3630 if (str[0] == '?' && !str[1])
3631 {
3632 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b);
3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3635 }
3636 else
3637 set_window_color (color, str);
3638}
3639
2961/* 3640/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title 3642 * 0 = change iconName/title
2964 * 1 = change iconName 3643 * 1 = change iconName
2965 * 2 = change title 3644 * 2 = change title
2966 * 4 = change color 3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
2967 * 12 = change text color 3648 * 12 = change text color
2968 * 13 = change mouse foreground color 3649 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour 3650 * 17 = change highlight character colour
2970 * 18 = change bold character color 3651 * 18 = change bold character color
2971 * 19 = change underlined character color 3652 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented) 3653 * 46 = change logfile (not implemented)
2973 * 50 = change font 3654 * 50 = change font
2974 * 3655 *
2975 * rxvt extensions: 3656 * rxvt extensions:
2976 * 10 = menu (may change in future)
2977 * 20 = bg pixmap 3657 * 20 = bg pixmap
2978 * 39 = change default fg color 3658 * 39 = change default fg color
2979 * 49 = change default bg color 3659 * 49 = change default bg color
2980 * 55 = dump scrollback buffer and all of screen 3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
2981 */ 3664 */
2982void 3665void
2983rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2984{ 3667{
2985 int changed = 0; 3668 int changed = 0;
2986 int color; 3669 int color;
2987 char *buf, *name; 3670 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1];
3672 int saveop = op;
3673 dDisp;
2988 3674
2989 assert (str != NULL); 3675 assert (str != NULL);
2990 switch (op) 3676 switch (op)
2991 { 3677 {
2992 case XTerm_name: 3678 case XTerm_name:
2993 set_title (str); 3679 set_title (str);
2994 /* FALLTHROUGH */ 3680 /* FALLTHROUGH */
2995 case XTerm_iconName: 3681 case XTerm_iconName:
2996 set_iconName (str); 3682 set_icon_name (str);
2997 break; 3683 break;
2998 case XTerm_title: 3684 case XTerm_title:
2999 set_title (str); 3685 set_title (str);
3000 break; 3686 break;
3687 case XTerm_property:
3688 if (str[0] == '?')
3689 {
3690 Atom prop = display->atom (str + 1);
3691 Atom actual_type;
3692 int actual_format;
3693 unsigned long nitems;
3694 unsigned long bytes_after;
3695 unsigned char *value = 0;
3696 const char *str = "";
3697
3698 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None
3704 && actual_format == 8)
3705 str = (const char *)(value);
3706
3707 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3708
3709 XFree (value);
3710 }
3711 else
3712 {
3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3714
3715 if (eq)
3716 {
3717 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1);
3719 }
3720 else
3721 XDeleteProperty (disp, TermWin.parent[0],
3722 display->atom (str));
3723 }
3724 break;
3725
3001 case XTerm_Color: 3726 case XTerm_Color:
3002 for (buf = (char *)str; buf && *buf;) 3727 for (buf = (char *)str; buf && *buf;)
3003 { 3728 {
3004 if ((name = STRCHR (buf, ';')) == NULL) 3729 if ((name = strchr (buf, ';')) == NULL)
3005 break; 3730 break;
3731
3006 *name++ = '\0'; 3732 *name++ = '\0';
3007 color = atoi (buf); 3733 color = atoi (buf);
3734
3008 if (color < 0 || color >= TOTAL_COLORS) 3735 if (color < 0 || color >= TOTAL_COLORS)
3009 break; 3736 break;
3737
3010 if ((buf = STRCHR (name, ';')) != NULL) 3738 if ((buf = strchr (name, ';')) != NULL)
3011 *buf++ = '\0'; 3739 *buf++ = '\0';
3740
3741 if (name[0] == '?' && !name[1])
3742 {
3743 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 }
3747 else
3012 set_window_color (color + minCOLOR, name); 3748 set_window_color (color + minCOLOR, name);
3013 } 3749 }
3750 break;
3751 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3753 break;
3754 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3014 break; 3756 break;
3015#ifndef NO_CURSORCOLOR 3757#ifndef NO_CURSORCOLOR
3016 case XTerm_Color_cursor: 3758 case XTerm_Color_cursor:
3017 set_window_color (Color_cursor, str); 3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3018 break; 3760 break;
3019#endif 3761#endif
3020 case XTerm_Color_pointer: 3762 case XTerm_Color_pointer_fg:
3021 set_window_color (Color_pointer, str); 3763 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3764 break;
3765 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3022 break; 3767 break;
3023#ifndef NO_BOLD_UNDERLINE_REVERSE 3768#ifndef NO_BOLD_UNDERLINE_REVERSE
3024 case XTerm_Color_BD: 3769 case XTerm_Color_BD:
3025 set_window_color (Color_BD, str); 3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3026 break; 3774 break;
3027 case XTerm_Color_UL: 3775 case XTerm_Color_UL:
3028 set_window_color (Color_UL, str); 3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3029 break; 3777 break;
3030 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
3031 set_window_color (Color_RV, str); 3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3032 break; 3780 break;
3033#endif 3781#endif
3034 3782#if TRANSPARENT && TINTING
3035 case XTerm_Menu: 3783 case XTerm_Color_tint:
3036 /* 3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3037 * rxvt_menubar_dispatch () violates the constness of the string, 3785 check_our_parents ();
3038 * so DON'T do it here 3786 if (am_transparent)
3039 */ 3787 want_full_refresh = want_refresh = 1;
3040 break; 3788 break;
3789#endif
3790
3041 case XTerm_Pixmap: 3791 case XTerm_Pixmap:
3042 if (*str != ';') 3792 if (*str != ';')
3043 { 3793 {
3044#if XPM_BACKGROUND 3794#if XPM_BACKGROUND
3045 scale_pixmap (""); /* reset to default scaling */ 3795 scale_pixmap (""); /* reset to default scaling */
3046 set_bgPixmap (str); /* change pixmap */ 3796 set_bgPixmap (str); /* change pixmap */
3047#endif 3797#endif
3048 scr_touch (true); 3798 scr_touch (true);
3049 } 3799 }
3050 while ((str = STRCHR (str, ';')) != NULL) 3800 while ((str = strchr (str, ';')) != NULL)
3051 { 3801 {
3052 str++; 3802 str++;
3053#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3054 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3055#endif 3805#endif
3056
3057 } 3806 }
3807
3058 if (changed) 3808 if (changed)
3059 { 3809 {
3060#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3061 resize_pixmap (); 3811 resize_pixmap ();
3062#endif 3812#endif
… …
3068 set_window_color (Color_fg, str); 3818 set_window_color (Color_fg, str);
3069 break; 3819 break;
3070 case XTerm_restoreBG: 3820 case XTerm_restoreBG:
3071 set_window_color (Color_bg, str); 3821 set_window_color (Color_bg, str);
3072 break; 3822 break;
3823
3073 case XTerm_logfile: 3824 case XTerm_logfile:
3825 // TODO, when secure mode?
3074 break; 3826 break;
3827
3075 case XTerm_font: 3828 case XTerm_font:
3076 change_font (0, str); 3829 op = URxvt_font;
3830 case URxvt_font:
3831#if ENABLE_STYLES
3832 case URxvt_boldFont:
3833 case URxvt_italicFont:
3834 case URxvt_boldItalicFont:
3835#endif
3836 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3840 resp);
3841 else
3842 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844
3845 res = strdup (str);
3846 allocated.push_back ((void *)res);
3847 set_fonts ();
3848 }
3849 break;
3850
3851#if ENABLE_FRILLS
3852 case XTerm_locale:
3853 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3855 else
3856 {
3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb ();
3861# endif
3862 }
3863 break;
3864#endif
3865
3866#ifdef MENUBAR
3867 case XTerm_Menu:
3868 if (options & Opt_insecure)
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3077 break; 3870 break;
3871#endif
3078#if 0 3872#if 0
3079 case XTerm_dumpscreen: /* no error notices */ 3873 case XTerm_dumpscreen: /* no error notices */
3080 { 3874 {
3081 int fd; 3875 int fd;
3082 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3083 { 3877 {
3084 scr_dump (fd); 3878 scr_dump (fd);
3085 close (fd); 3879 close (fd);
3086 } 3880 }
3087 } 3881 }
3088 break; 3882 break;
3089#endif 3883#endif
3090
3091 } 3884 }
3092} 3885}
3093/*----------------------------------------------------------------------*/ 3886/*----------------------------------------------------------------------*/
3094 3887
3095/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3888/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3103 * so no need for fancy checking 3896 * so no need for fancy checking
3104 */ 3897 */
3105int 3898int
3106rxvt_term::privcases (int mode, unsigned long bit) 3899rxvt_term::privcases (int mode, unsigned long bit)
3107{ 3900{
3108 int state; 3901 int state;
3109 3902
3110 if (mode == 's') 3903 if (mode == 's')
3111 { 3904 {
3112 SavedModes |= (PrivateModes & bit); 3905 SavedModes |= (priv_modes & bit);
3113 return -1; 3906 return -1;
3114 } 3907 }
3115 else 3908 else
3116 { 3909 {
3117 if (mode == 'r') 3910 if (mode == 'r')
3118 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3911 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3119 else 3912 else
3120 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3913 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3121 PrivMode (state, bit); 3914 PrivMode (state, bit);
3122 } 3915 }
3916
3123 return state; 3917 return state;
3124} 3918}
3125 3919
3126/* we're not using priv _yet_ */ 3920/* we're not using priv _yet_ */
3127void 3921void
3128rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3922rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3129{ 3923{
3130 unsigned int i, j; 3924 unsigned int i, j;
3131 int state; 3925 int state;
3926
3132 static const struct 3927 static const struct
3133 { 3928 {
3134 const int argval; 3929 const int argval;
3135 const unsigned long bit; 3930 const unsigned long bit;
3136 } 3931 }
3932
3137 argtopriv[] = { 3933 argtopriv[] = {
3138 { 1, PrivMode_aplCUR }, 3934 { 1, PrivMode_aplCUR },
3139 { 2, PrivMode_vt52 }, 3935 { 2, PrivMode_vt52 },
3140 { 3, PrivMode_132 }, 3936 { 3, PrivMode_132 },
3141 { 4, PrivMode_smoothScroll }, 3937 { 4, PrivMode_smoothScroll },
3142 { 5, PrivMode_rVideo }, 3938 { 5, PrivMode_rVideo },
3143 { 6, PrivMode_relOrigin }, 3939 { 6, PrivMode_relOrigin },
3144 { 7, PrivMode_Autowrap }, 3940 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode
3145 { 9, PrivMode_MouseX10 }, 3942 { 9, PrivMode_MouseX10 },
3146#ifdef menuBar_esc 3943#ifdef menuBar_esc
3147 { menuBar_esc, PrivMode_menuBar }, 3944 { menuBar_esc, PrivMode_menuBar },
3148#endif 3945#endif
3946 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor },
3149#ifdef scrollBar_esc 3948#ifdef scrollBar_esc
3150 { scrollBar_esc, PrivMode_scrollBar }, 3949 { scrollBar_esc, PrivMode_scrollBar },
3151#endif 3950#endif
3152 { 25, PrivMode_VisibleCursor },
3153 { 35, PrivMode_ShiftKeys }, 3951 { 35, PrivMode_ShiftKeys }, // rxvt extension
3154 { 40, PrivMode_132OK }, 3952 { 40, PrivMode_132OK },
3953 // 41 xterm more fixes NYI
3954 // 45 margin bell NYI
3955 // 46 start logging
3155 { 47, PrivMode_Screen }, 3956 { 47, PrivMode_Screen },
3156 { 66, PrivMode_aplKP }, 3957 { 66, PrivMode_aplKP },
3157#ifndef NO_BACKSPACE_KEY 3958#ifndef NO_BACKSPACE_KEY
3158 { 67, PrivMode_BackSpace }, 3959 { 67, PrivMode_BackSpace },
3159#endif 3960#endif
3160 { 1000, PrivMode_MouseX11 }, 3961 { 1000, PrivMode_MouseX11 },
3962 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3963 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3964 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3161 { 1010, PrivMode_TtyOutputInh }, 3965 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3162 { 1011, PrivMode_Keypress }, 3966 { 1011, PrivMode_Keypress }, // rxvt extension
3967 // 1035 enable modifiers for alt, numlock NYI
3968 // 1036 send ESC for meta keys NYI
3969 // 1037 send DEL for keypad delete NYI
3163 { 1047, PrivMode_Screen }, 3970 { 1047, PrivMode_Screen },
3971 // 1048 save and restore cursor
3164 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3972 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3973 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3165 }; 3974 };
3166 3975
3167 if (nargs == 0) 3976 if (nargs == 0)
3168 return; 3977 return;
3169 3978
… …
3184 state = privcases (mode, argtopriv[j].bit); 3993 state = privcases (mode, argtopriv[j].bit);
3185 break; 3994 break;
3186 } 3995 }
3187 3996
3188 /* extra handling for values with state unkept */ 3997 /* extra handling for values with state unkept */
3189 if (state == -1)
3190 switch (arg[i]) 3998 switch (arg[i])
3191 { 3999 {
3192 case 1048: /* alternative cursor save */ 4000 case 1048: /* alternative cursor save */
4001 case 1049:
4002 if (options & Opt_secondaryScreen)
3193 if (mode == 0) 4003 if (mode == 0)
3194 scr_cursor (RESTORE); 4004 scr_cursor (RESTORE);
3195 else if (mode == 1) 4005 else if (mode == 1)
3196 scr_cursor (SAVE); 4006 scr_cursor (SAVE);
3197 /* FALLTHROUGH */
3198 default:
3199 continue; /* for (;i;) */
3200 }
3201
3202 /* extra handling for values with valid 0 or 1 state */
3203 switch (arg[i])
3204 {
3205 /* case 1: - application cursor keys */
3206 case 2: /* VT52 mode */
3207 /* oddball mode. should be set regardless of set/reset
3208 * parameter. Return from VT52 mode with an ESC < from
3209 * within VT52 mode
3210 */
3211 PrivMode (1, PrivMode_vt52);
3212 break; 4007 break;
4008 }
4009
4010 if (state >= 0)
4011 /* extra handling for values with valid 0 or 1 state */
4012 switch (arg[i])
4013 {
4014 /* case 1: - application cursor keys */
4015 case 2: /* VT52 mode */
4016 /* oddball mode. should be set regardless of set/reset
4017 * parameter. Return from VT52 mode with an ESC < from
4018 * within VT52 mode
4019 */
4020 PrivMode (1, PrivMode_vt52);
4021 break;
3213 case 3: /* 80/132 */ 4022 case 3: /* 80/132 */
3214 if (PrivateModes & PrivMode_132OK) 4023 if (priv_modes & PrivMode_132OK)
3215 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3216 (unsigned int)TermWin.height);
3217 break; 4025 break;
3218 case 4: /* smooth scrolling */ 4026 case 4: /* smooth scrolling */
3219 if (state) 4027 if (state)
3220 Options &= ~Opt_jumpScroll; 4028 options &= ~Opt_jumpScroll;
3221 else 4029 else
3222 Options |= Opt_jumpScroll; 4030 options |= Opt_jumpScroll;
3223 break; 4031 break;
3224 case 5: /* reverse video */ 4032 case 5: /* reverse video */
3225 scr_rvideo_mode (state); 4033 scr_rvideo_mode (state);
3226 break; 4034 break;
3227 case 6: /* relative/absolute origins */ 4035 case 6: /* relative/absolute origins */
3228 scr_relative_origin (state); 4036 scr_relative_origin (state);
3229 break; 4037 break;
3230 case 7: /* autowrap */ 4038 case 7: /* autowrap */
3231 scr_autowrap (state); 4039 scr_autowrap (state);
3232 break; 4040 break;
3233 /* case 8: - auto repeat, can't do on a per window basis */ 4041 /* case 8: - auto repeat, can't do on a per window basis */
3234 case 9: /* X10 mouse reporting */ 4042 case 9: /* X10 mouse reporting */
3235 if (state) /* orthogonal */ 4043 if (state) /* orthogonal */
3236 PrivateModes &= ~ (PrivMode_MouseX11); 4044 priv_modes &= ~PrivMode_MouseX11;
3237 break; 4045 break;
3238#ifdef menuBar_esc 4046#ifdef menuBar_esc
3239 case menuBar_esc: 4047 case menuBar_esc:
3240#ifdef MENUBAR 4048#ifdef MENUBAR
3241 map_menuBar (state); 4049 map_menuBar (state);
3242#endif 4050#endif
3243 break; 4051 break;
3244#endif 4052#endif
3245#ifdef scrollBar_esc 4053#ifdef scrollBar_esc
3246 case scrollBar_esc: 4054 case scrollBar_esc:
3247 if (scrollbar_mapping (state)) 4055 if (scrollbar_mapping (state))
3248 { 4056 {
3249 resize_all_windows (0, 0, 0); 4057 resize_all_windows (0, 0, 0);
3250 scr_touch (true); 4058 scr_touch (true);
3251 } 4059 }
3252 break; 4060 break;
3253#endif 4061#endif
3254 case 25: /* visible/invisible cursor */ 4062 case 25: /* visible/invisible cursor */
3255 scr_cursor_visible (state); 4063 scr_cursor_visible (state);
3256 break; 4064 break;
3257 /* case 35: - shift keys */ 4065 /* case 35: - shift keys */
3258 /* case 40: - 80 <--> 132 mode */ 4066 /* case 40: - 80 <--> 132 mode */
3259 case 47: /* secondary screen */ 4067 case 47: /* secondary screen */
3260 scr_change_screen (state); 4068 scr_change_screen (state);
3261 break; 4069 break;
3262 /* case 66: - application key pad */ 4070 /* case 66: - application key pad */
3263 /* case 67: - backspace key */ 4071 /* case 67: - backspace key */
3264 case 1000: /* X11 mouse reporting */ 4072 case 1000: /* X11 mouse reporting */
3265 if (state) /* orthogonal */ 4073 if (state) /* orthogonal */
3266 PrivateModes &= ~ (PrivMode_MouseX10); 4074 priv_modes &= ~PrivMode_MouseX10;
3267 break; 4075 break;
3268#if 0 4076#if 0
3269 case 1001: 4077 case 1001:
3270 break; /* X11 mouse highlighting */ 4078 break; /* X11 mouse highlighting */
3271#endif 4079#endif
3272 case 1010: /* scroll to bottom on TTY output inhibit */ 4080 case 1010: /* scroll to bottom on TTY output inhibit */
3273 if (state) 4081 if (state)
3274 Options &= ~Opt_scrollTtyOutput; 4082 options &= ~Opt_scrollTtyOutput;
3275 else 4083 else
3276 Options |= Opt_scrollTtyOutput; 4084 options |= Opt_scrollTtyOutput;
3277 break; 4085 break;
3278 case 1011: /* scroll to bottom on key press */ 4086 case 1011: /* scroll to bottom on key press */
3279 if (state) 4087 if (state)
3280 Options |= Opt_scrollTtyKeypress; 4088 options |= Opt_scrollTtyKeypress;
3281 else 4089 else
3282 Options &= ~Opt_scrollTtyKeypress; 4090 options &= ~Opt_scrollTtyKeypress;
3283 break; 4091 break;
3284 case 1047: /* secondary screen w/ clearing */ 4092 case 1047: /* secondary screen w/ clearing last */
3285 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4093 if (options & Opt_secondaryScreen)
3286 if (current_screen != PRIMARY) 4094 if (current_screen != PRIMARY)
3287 scr_erase_screen (2); 4095 scr_erase_screen (2);
3288 scr_change_screen (state); 4096 scr_change_screen (state);
3289 /* FALLTHROUGH */
3290 default:
3291 break; 4097 break;
4098 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen)
4101 if (current_screen != PRIMARY)
4102 scr_erase_screen (2);
4103 break;
4104 default:
4105 break;
3292 } 4106 }
3293 } 4107 }
3294} 4108}
3295/*}}} */ 4109/*}}} */
3296 4110
3297/*{{{ process sgr sequences */ 4111/*{{{ process sgr sequences */
3298void 4112void
3299rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4113rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3300{ 4114{
3301 unsigned int i; 4115 unsigned int i;
3302 short rendset; 4116 short rendset;
3303 int rendstyle; 4117 int rendstyle;
3304 4118
3305 if (nargs == 0) 4119 if (nargs == 0)
3306 { 4120 {
3307 scr_rendition (0, ~RS_None); 4121 scr_rendition (0, ~RS_None);
3308 return; 4122 return;
3309 } 4123 }
4124
3310 for (i = 0; i < nargs; i++) 4125 for (i = 0; i < nargs; i++)
3311 { 4126 {
3312 rendset = -1; 4127 rendset = -1;
3313 switch (arg[i]) 4128 switch (arg[i])
3314 { 4129 {
… …
3316 rendset = 0, rendstyle = ~RS_None; 4131 rendset = 0, rendstyle = ~RS_None;
3317 break; 4132 break;
3318 case 1: 4133 case 1:
3319 rendset = 1, rendstyle = RS_Bold; 4134 rendset = 1, rendstyle = RS_Bold;
3320 break; 4135 break;
4136 //case 2: // low intensity
4137 case 3:
4138 rendset = 1, rendstyle = RS_Italic;
4139 break;
3321 case 4: 4140 case 4:
3322 rendset = 1, rendstyle = RS_Uline; 4141 rendset = 1, rendstyle = RS_Uline;
3323 break; 4142 break;
3324 case 5: 4143 case 5: // slowly blinking
4144 case 6: // rapidly blinking
3325 rendset = 1, rendstyle = RS_Blink; 4145 rendset = 1, rendstyle = RS_Blink;
3326 break; 4146 break;
4147 //case 6: // scoansi light background
3327 case 7: 4148 case 7:
3328 rendset = 1, rendstyle = RS_RVid; 4149 rendset = 1, rendstyle = RS_RVid;
3329 break; 4150 break;
3330 case 22: 4151 case 8:
4152 // invisible. NYI
4153 break;
4154 //case 9: // crossed out
4155 //case 10: // scoansi acs off, primary font
4156 //case 11: // scoansi acs on, first alt font
4157 //case 12: // scoansi acs on, |0x80, second alt font
4158 //...
4159 //case 19: // ninth alt font
4160 //case 20: // gothic
4161 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3331 rendset = 0, rendstyle = RS_Bold; 4162 rendset = 0, rendstyle = RS_Bold;
4163 break;
4164 case 22: // normal intensity
4165 rendset = 0, rendstyle = RS_Bold;
4166 break;
4167 case 23: // disable italic
4168 rendset = 0, rendstyle = RS_Italic;
3332 break; 4169 break;
3333 case 24: 4170 case 24:
3334 rendset = 0, rendstyle = RS_Uline; 4171 rendset = 0, rendstyle = RS_Uline;
3335 break; 4172 break;
3336 case 25: 4173 case 25:
3337 rendset = 0, rendstyle = RS_Blink; 4174 rendset = 0, rendstyle = RS_Blink;
3338 break; 4175 break;
4176 case 26: // variable spacing (iso 8613)
4177 rendset = 0, rendstyle = RS_Blink;
4178 break;
3339 case 27: 4179 case 27:
3340 rendset = 0, rendstyle = RS_RVid; 4180 rendset = 0, rendstyle = RS_RVid;
3341 break; 4181 break;
4182 //case 28: // visible. NYI
4183 //case 29: // not crossed-out
3342 } 4184 }
4185
3343 if (rendset != -1) 4186 if (rendset != -1)
3344 { 4187 {
3345 scr_rendition (rendset, rendstyle); 4188 scr_rendition (rendset, rendstyle);
3346 continue; /* for (;i;) */ 4189 continue; /* for (;i;) */
3347 } 4190 }
… …
3354 case 33: 4197 case 33:
3355 case 34: 4198 case 34:
3356 case 35: 4199 case 35:
3357 case 36: 4200 case 36:
3358 case 37: 4201 case 37:
3359 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3360 Color_fg);
3361 break; 4203 break;
3362#ifdef TTY_256COLOR 4204 case 38: // set fg color, ISO 8613-6
3363 case 38:
3364 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3365 { 4206 {
3366 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3367 Color_fg);
3368 i += 2; 4208 i += 2;
3369 } 4209 }
3370 break; 4210 break;
3371#endif
3372 case 39: /* default fg */ 4211 case 39: /* default fg */
3373 scr_color (Color_fg, Color_fg); 4212 scr_color (Color_fg, Color_fg);
3374 break; 4213 break;
3375 4214
3376 case 40: 4215 case 40:
… …
3379 case 43: 4218 case 43:
3380 case 44: 4219 case 44:
3381 case 45: 4220 case 45:
3382 case 46: 4221 case 46:
3383 case 47: 4222 case 47:
3384 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4223 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3385 Color_bg);
3386 break; 4224 break;
3387#ifdef TTY_256COLOR 4225 case 48: // set bg color, ISO 8613-6
3388 case 48:
3389 if (nargs > i + 2 && arg[i + 1] == 5) 4226 if (nargs > i + 2 && arg[i + 1] == 5)
3390 { 4227 {
3391 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4228 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3392 Color_bg);
3393 i += 2; 4229 i += 2;
3394 } 4230 }
3395 break; 4231 break;
3396#endif
3397 case 49: /* default bg */ 4232 case 49: /* default bg */
3398 scr_color (Color_bg, Color_bg); 4233 scr_color (Color_bg, Color_bg);
3399 break; 4234 break;
4235
4236 //case 50: // not variable spacing
3400 4237
3401#ifndef NO_BRIGHTCOLOR 4238#ifndef NO_BRIGHTCOLOR
3402 case 90: 4239 case 90:
3403 case 91: /* set bright fg color */ 4240 case 91: /* set bright fg color */
3404 case 92: 4241 case 92:
3405 case 93: 4242 case 93:
3406 case 94: 4243 case 94:
3407 case 95: 4244 case 95:
3408 case 96: 4245 case 96:
3409 case 97: 4246 case 97:
3410 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4247 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3411 Color_fg);
3412 break; 4248 break;
3413 case 100: 4249 case 100:
3414 case 101: /* set bright bg color */ 4250 case 101: /* set bright bg color */
3415 case 102: 4251 case 102:
3416 case 103: 4252 case 103:
3417 case 104: 4253 case 104:
3418 case 105: 4254 case 105:
3419 case 106: 4255 case 106:
3420 case 107: 4256 case 107:
3421 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3422 Color_bg);
3423 break; 4258 break;
3424#endif 4259#endif
3425 4260
3426 } 4261 }
3427 } 4262 }
3428} 4263}
3429/*}}} */ 4264/*}}} */
3430 4265
3431/*{{{ process Rob Nation's own graphics mode sequences */ 4266/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3432void 4267void
3433rxvt_term::process_graphics () 4268rxvt_term::process_graphics ()
3434{ 4269{
3435 unsigned char ch, cmd = cmd_getc (); 4270 unicode_t ch, cmd = cmd_getc ();
3436 4271
3437 if (cmd == 'Q') 4272 if (cmd == 'Q')
3438 { /* query graphics */ 4273 { /* query graphics */
3439 tt_printf ("\033G0\n"); /* no graphics */ 4274 tt_printf ("\033G0\012"); /* no graphics */
3440 return; 4275 return;
3441 } 4276 }
3442 /* swallow other graphics sequences until terminating ':' */ 4277 /* swallow other graphics sequences until terminating ':' */
3443 do 4278 do
3444 ch = cmd_getc (); 4279 ch = cmd_getc ();
… …
3459 unsigned char buf[256]; 4294 unsigned char buf[256];
3460 4295
3461 va_start (arg_ptr, fmt); 4296 va_start (arg_ptr, fmt);
3462 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3463 va_end (arg_ptr); 4298 va_end (arg_ptr);
3464 tt_write (buf, STRLEN (buf)); 4299 tt_write (buf, strlen (buf));
3465} 4300}
3466 4301
3467/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
3468/* Write data to the pty as typed by the user, pasted with the mouse, 4303/* Write data to the pty as typed by the user, pasted with the mouse,
3469 * or generated by us in response to a query ESC sequence. 4304 * or generated by us in response to a query ESC sequence.
3470 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
3471void 4308void
3472rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3473{ 4310{
3474 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4311 if (v_buflen == 0)
4312 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3475 4314
3476 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
3477 { 4320 }
4321
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4323
4324 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len;
4326
4327 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328}
4329
4330void rxvt_term::pty_write ()
4331{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333
4334 if (written > 0)
4335 {
4336 v_buflen -= written;
4337
3478 if (v_buflen == 0) 4338 if (v_buflen == 0)
3479 { 4339 {
3480 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3481
3482 if ((unsigned int)written == len)
3483 return;
3484
3485 data += written;
3486 len -= written;
3487 }
3488
3489
3490 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3491
3492 memcpy (v_buffer + v_buflen, data, len);
3493 v_buflen += len;
3494 }
3495
3496 for (;;)
3497 {
3498 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3499
3500 if (written > 0)
3501 {
3502 v_buflen -= written;
3503
3504 if (v_buflen == 0)
3505 {
3506 free (v_buffer); 4340 free (v_buffer);
3507 v_buffer = 0; 4341 v_buffer = 0;
3508 v_buflen = 0; 4342 v_buflen = 0;
3509 4343
3510 pty_ev.set (EVENT_READ); 4344 pty_ev.set (EVENT_READ);
3511 return;
3512 }
3513
3514 memmove (v_buffer, v_buffer + written, v_buflen);
3515 }
3516 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3517 // original code just ignores this...
3518 destroy ();
3519 else
3520 {
3521 pty_ev.set (EVENT_READ | EVENT_WRITE);
3522 return; 4345 return;
3523 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
3524 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
3525} 4353}
3526 4354
3527/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
3528 4356

Diff Legend

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