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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC

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

Diff Legend

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