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.59 by pcg, Wed Feb 25 15:39:48 2004 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

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

Diff Legend

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