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

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

Diff Legend

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