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.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.212 by root, Wed Dec 21 14:19:19 2005 UTC

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

Diff Legend

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