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

Diff Legend

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