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

Diff Legend

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