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

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

Diff Legend

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