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.197 by root, Thu Feb 17 15:07:48 2005 UTC

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

Diff Legend

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