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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC

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

Diff Legend

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