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

Diff Legend

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