ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.59 by pcg, Wed Feb 25 15:39:48 2004 UTC vs.
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC

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

Diff Legend

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