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

Diff Legend

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