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.58 by pcg, Wed Feb 25 15:06:03 2004 UTC vs.
Revision 1.217 by root, Sat Dec 31 16:30:42 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 GET_FGCOLOR (r), GET_BGCOLOR (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 (options & 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;
699 927
700 if (n > 0 && s < count) 928 if (n > 0 && s < count)
701 { 929 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 930 memmove (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 931 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
704 cmdbuf_ptr = cmdbuf_base; 932 cmdbuf_ptr = cmdbuf_base;
705 cmdbuf_endp -= n; 933 cmdbuf_endp -= n;
706 s += n; 934 s += n;
707 } 935 }
708 936
709 if (count > s) 937 if (count > s)
710 { 938 {
711 rxvt_print_error ("data loss: cmd_write too large"); 939 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 940 count = s;
713 } 941 }
714 942
715 for (; count--;) 943 for (; count--;)
716 *cmdbuf_endp++ = *str++; 944 *cmdbuf_endp++ = *str++;
717 945
718 cmd_parse (); 946 cmd_parse ();
719 947
720 return 0; 948 return 0;
721} 949}
722#endif /* MENUBAR_MAX */ 950#endif
723 951
724void 952void
725rxvt_term::flush () 953rxvt_term::flush ()
726{ 954{
955 flush_ev.stop ();
956
727#ifdef TRANSPARENT 957#ifdef TRANSPARENT
728 if (want_full_refresh) 958 if (want_full_refresh)
729 { 959 {
730 want_full_refresh = 0; 960 want_full_refresh = 0;
731 scr_clear (); 961 scr_clear ();
732 scr_touch (false); 962 scr_touch (false);
733 want_refresh = 1;
734 } 963 }
735#endif 964#endif
736 965
737 if (want_refresh) 966 if (want_refresh)
738 { 967 {
739 scr_refresh (refresh_type); 968 scr_refresh (refresh_type);
740 scrollbar_show (1); 969 scrollbar_show (1);
741#ifdef USE_XIM 970#ifdef USE_XIM
742 IMSendSpot (); 971 IMSendSpot ();
743#endif 972#endif
744
745 } 973 }
746 974
747 display->flush (); 975 display->flush ();
748} 976}
749 977
… …
751rxvt_term::check_cb (check_watcher &w) 979rxvt_term::check_cb (check_watcher &w)
752{ 980{
753 SET_R (this); 981 SET_R (this);
754 SET_LOCALE (locale); 982 SET_LOCALE (locale);
755 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;
756 flush (); 998 flush ();
757} 999}
758 1000
759#ifdef CURSOR_BLINK 1001#ifdef CURSOR_BLINK
760void 1002void
… …
778 w.start (w.at + TEXT_BLINK_INTERVAL); 1020 w.start (w.at + TEXT_BLINK_INTERVAL);
779 } 1021 }
780} 1022}
781#endif 1023#endif
782 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
783bool 1072bool
784rxvt_term::pty_fill () 1073rxvt_term::pty_fill ()
785{ 1074{
786 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 }
787 1082
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 1083 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 1084 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 1085 cmdbuf_endp = cmdbuf_ptr + n;
791 1086
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
793 1088
794 if (n > 0) 1089 if (n > 0)
795 { 1090 {
796 cmdbuf_endp += n; 1091 cmdbuf_endp += n;
797 return true; 1092 return true;
798 } 1093 }
799 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 (!(options & Opt_hold))
800 destroy (); 1099 destroy ();
1100 }
801 1101
802 return false; 1102 return false;
803} 1103}
804 1104
805void 1105void
806rxvt_term::pty_cb (io_watcher &w, short revents) 1106rxvt_term::pty_cb (io_watcher &w, short revents)
807{ 1107{
808 SET_R (this); 1108 SET_R (this);
809 SET_LOCALE (locale); 1109 SET_LOCALE (locale);
810 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
811 if (revents & EVENT_WRITE) 1117 if (revents & EVENT_WRITE)
812 tt_write (0, 0); 1118 pty_write ();
813 else if (revents & EVENT_READ)
814 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ())
820 {
821 if (!seen_input)
822 {
823 seen_input = 1;
824 /* once we know the shell is running, send the screen size. Again! */
825 tt_winch ();
826 }
827
828 if (cmd_parse ())
829 break;
830 }
831 }
832} 1119}
833 1120
834bool 1121void
835rxvt_term::cmd_parse () 1122rxvt_term::pointer_unblank ()
836{ 1123{
837 bool flag = false; 1124 XDefineCursor (display->display, vt, TermWin_cursor);
838 uint32_t ch = NOCHAR; 1125 recolour_cursor ();
839 1126
840 for (;;) 1127#ifdef POINTER_BLANK
841 { 1128 hidden_pointer = 0;
842 if (ch == NOCHAR)
843 ch = next_char ();
844 1129
845 if (ch == NOCHAR) // TODO: improve 1130 if (options & Opt_pointerBlank)
846 break; 1131 pointer_ev.start (NOW + pointerBlankDelay);
847 1132#endif
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938}
939
940// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future
942uint32_t
943rxvt_term::next_char ()
944{
945 while (cmdbuf_ptr < cmdbuf_endp)
946 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949
950 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952
953 if (len == (size_t)-2)
954 return NOCHAR;
955
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 }
987} 1133}
988 1134
989#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
990void 1136void
991rxvt_term::pointer_unblank ()
992{
993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
994 recolour_cursor ();
995
996 hidden_pointer = 0;
997
998 if (Options & Opt_pointerBlank)
999 pointer_ev.start (NOW + pointerBlankDelay);
1000}
1001
1002void
1003rxvt_term::pointer_blank () 1137rxvt_term::pointer_blank ()
1004{ 1138{
1005 if (! (Options & Opt_pointerBlank)) 1139 if (! (options & Opt_pointerBlank))
1006 return; 1140 return;
1007 1141
1008 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1142 XDefineCursor (display->display, vt, display->blank_cursor);
1009 XFlush (display->display); 1143 XFlush (display->display);
1010 1144
1011 hidden_pointer = 1; 1145 hidden_pointer = 1;
1012} 1146}
1013 1147
… …
1030 x = ev.x; 1164 x = ev.x;
1031 y = ev.y; 1165 y = ev.y;
1032 pixel_position (&x, &y); 1166 pixel_position (&x, &y);
1033 1167
1034 if (MEvent.button == AnyButton) 1168 if (MEvent.button == AnyButton)
1035 {
1036 button_number = 3; 1169 button_number = 3;
1037 }
1038 else 1170 else
1039 { 1171 {
1040 button_number = MEvent.button - Button1; 1172 button_number = MEvent.button - Button1;
1041 /* add 0x3D for wheel events, like xterm does */ 1173 /* add 0x3D for wheel events, like xterm does */
1042 if (button_number >= 3) 1174 if (button_number >= 3)
1043 button_number += (64 - 3); 1175 button_number += (64 - 3);
1044 } 1176 }
1045 1177
1046 if (PrivateModes & PrivMode_MouseX10) 1178 if (priv_modes & PrivMode_MouseX10)
1047 { 1179 {
1048 /* 1180 /*
1049 * do not report ButtonRelease 1181 * do not report ButtonRelease
1050 * no state info allowed 1182 * no state info allowed
1051 */ 1183 */
… …
1066 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1198 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1067 + ((MEvent.state & ControlMask) ? 16 : 0); 1199 + ((MEvent.state & ControlMask) ? 16 : 0);
1068#ifdef MOUSE_REPORT_DOUBLECLICK 1200#ifdef MOUSE_REPORT_DOUBLECLICK
1069 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1201 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1070#endif 1202#endif
1071
1072 } 1203 }
1073 1204
1074#ifdef DEBUG_MOUSEREPORT 1205#if DEBUG_MOUSEREPORT
1075 fprintf (stderr, "Mouse ["); 1206 fprintf (stderr, "Mouse [");
1076 if (key_state & 16) 1207 if (key_state & 16)
1077 fputc ('C', stderr); 1208 fputc ('C', stderr);
1078 if (key_state & 4) 1209 if (key_state & 4)
1079 fputc ('S', stderr); 1210 fputc ('S', stderr);
… …
1083 fputc ('2', stderr); 1214 fputc ('2', stderr);
1084 fprintf (stderr, "]: <%d>, %d/%d\n", 1215 fprintf (stderr, "]: <%d>, %d/%d\n",
1085 button_number, 1216 button_number,
1086 x + 1, 1217 x + 1,
1087 y + 1); 1218 y + 1);
1088#else 1219#endif
1220
1089 tt_printf ("\033[M%c%c%c", 1221 tt_printf ("\033[M%c%c%c",
1090 (32 + button_number + key_state), 1222 (32 + button_number + key_state),
1091 (32 + x + 1), 1223 (32 + x + 1),
1092 (32 + y + 1)); 1224 (32 + y + 1));
1093#endif
1094} 1225}
1095 1226
1096#ifdef USING_W11LIB 1227#ifdef USING_W11LIB
1097void 1228void
1098rxvt_W11_process_x_event (XEvent *ev) 1229rxvt_W11_process_x_event (XEvent *ev)
… …
1105 1236
1106/*{{{ process an X event */ 1237/*{{{ process an X event */
1107void 1238void
1108rxvt_term::x_cb (XEvent &ev) 1239rxvt_term::x_cb (XEvent &ev)
1109{ 1240{
1241 dDisp;
1242
1110 SET_R (this); 1243 SET_R (this);
1111 SET_LOCALE (locale); 1244 SET_LOCALE (locale);
1112 1245
1113#if defined(CURSOR_BLINK) 1246#if defined(CURSOR_BLINK)
1114 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1247 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1115 { 1248 {
1116 if (hidden_cursor) 1249 if (hidden_cursor)
1117 { 1250 {
1118 hidden_cursor = 0; 1251 hidden_cursor = 0;
1119 want_refresh = 1; 1252 want_refresh = 1;
… …
1122 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1123 } 1256 }
1124#endif 1257#endif
1125 1258
1126#if defined(POINTER_BLANK) 1259#if defined(POINTER_BLANK)
1127 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1260 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1128 { 1261 {
1129 if (ev.type == MotionNotify 1262 if (ev.type == MotionNotify
1130 || ev.type == ButtonPress 1263 || ev.type == ButtonPress
1131 || ev.type == ButtonRelease) 1264 || ev.type == ButtonRelease)
1132 if (hidden_pointer) 1265 if (hidden_pointer)
… …
1135 if (ev.type == KeyPress && hidden_pointer == 0) 1268 if (ev.type == KeyPress && hidden_pointer == 0)
1136 pointer_blank (); 1269 pointer_blank ();
1137 } 1270 }
1138#endif 1271#endif
1139 1272
1140#ifdef USE_XIM
1141 if (XFilterEvent (&ev, None))
1142 return;
1143#endif
1144
1145 Window unused_root, unused_child; 1273 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1274 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1275 unsigned int unused_mask;
1148
1149#ifdef DEBUG_X
1150 const char *const eventnames[] =
1151 { /* mason - this matches my system */
1152 "",
1153 "",
1154 "KeyPress",
1155 "KeyRelease",
1156 "ButtonPress",
1157 "ButtonRelease",
1158 "MotionNotify",
1159 "EnterNotify",
1160 "LeaveNotify",
1161 "FocusIn",
1162 "FocusOut",
1163 "KeymapNotify",
1164 "Expose",
1165 "GraphicsExpose",
1166 "NoExpose",
1167 "VisibilityNotify",
1168 "CreateNotify",
1169 "DestroyNotify",
1170 "UnmapNotify",
1171 "MapNotify",
1172 "MapRequest",
1173 "ReparentNotify",
1174 "ConfigureNotify",
1175 "ConfigureRequest",
1176 "GravityNotify",
1177 "ResizeRequest",
1178 "CirculateNotify",
1179 "CirculateRequest",
1180 "PropertyNotify",
1181 "SelectionClear",
1182 "SelectionRequest",
1183 "SelectionNotify",
1184 "ColormapNotify",
1185 "ClientMessage",
1186 "MappingNotify"
1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1192 struct tm *ltt;
1193 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime (& (tp.tv_sec));
1195 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1196#endif
1197 1276
1198 switch (ev.type) 1277 switch (ev.type)
1199 { 1278 {
1200 case KeyPress: 1279 case KeyPress:
1280#if ISO_14755
1281 if (!(iso14755buf & ISO_14755_52))
1282#endif
1201 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;
1202 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
1203 1348
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease:
1206 {
1207 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)
1208 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1209 else 1354#endif
1210 {
1211 KeySym ks;
1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break; 1355 break;
1218 } 1356 }
1219#endif
1220 1357
1221 case ButtonPress: 1358 case ButtonPress:
1222 button_press (ev.xbutton); 1359 button_press (ev.xbutton);
1223 break; 1360 break;
1224 1361
… …
1226 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1227 break; 1364 break;
1228 1365
1229 case ClientMessage: 1366 case ClientMessage:
1230 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1369 {
1231 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1232 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
1233#ifdef OFFIX_DND 1388#ifdef OFFIX_DND
1234 /* OffiX Dnd (drag 'n' drop) protocol */ 1389 /* OffiX Dnd (drag 'n' drop) protocol */
1235 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1390 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1236 && (ev.xclient.data.l[0] == DndFile 1391 && (ev.xclient.data.l[0] == DndFile
1237 || ev.xclient.data.l[0] == DndDir 1392 || ev.xclient.data.l[0] == DndDir
1238 || ev.xclient.data.l[0] == DndLink)) 1393 || ev.xclient.data.l[0] == DndLink))
1239 { 1394 {
1240 /* Get Dnd data */ 1395 /* Get Dnd data */
1241 Atom ActualType; 1396 Atom ActualType;
1242 int ActualFormat; 1397 int ActualFormat;
1243 unsigned char *data; 1398 unsigned char *data;
1244 unsigned long Size, RemainingBytes; 1399 unsigned long Size, RemainingBytes;
1245 1400
1246 XGetWindowProperty (display->display, display->root, 1401 XGetWindowProperty (disp, display->root,
1247 xa[XA_DNDSELECTION], 1402 xa[XA_DNDSELECTION],
1248 0L, 1000000L, 1403 0L, 1000000L,
1249 False, AnyPropertyType, 1404 False, AnyPropertyType,
1250 &ActualType, &ActualFormat, 1405 &ActualType, &ActualFormat,
1251 &Size, &RemainingBytes, 1406 &Size, &RemainingBytes,
1252 &data); 1407 &data);
1253 XChangeProperty (display->display, display->root, 1408 set_string_property (XA_CUT_BUFFER0, data);
1254 XA_CUT_BUFFER0, XA_STRING, 1409 XFree (data);
1255 8, PropModeReplace,
1256 data, STRLEN (data));
1257 selection_paste (display->root, XA_CUT_BUFFER0, True); 1410 selection_paste (display->root, XA_CUT_BUFFER0, true);
1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1411 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1259 } 1412 }
1260#endif /* OFFIX_DND */ 1413#endif /* OFFIX_DND */
1261 break; 1414 break;
1262 1415
1263 case MappingNotify: 1416 case MappingNotify:
1264 XRefreshKeyboardMapping (& (ev.xmapping)); 1417 XRefreshKeyboardMapping (&ev.xmapping);
1265 break; 1418 break;
1266 1419
1267 /* 1420 /*
1268 * XXX: this is not the _current_ arrangement 1421 * XXX: this is not the _current_ arrangement
1269 * Here's my conclusion: 1422 * Here's my conclusion:
… …
1288 break; 1441 break;
1289 } 1442 }
1290 break; 1443 break;
1291 1444
1292 case FocusIn: 1445 case FocusIn:
1293 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])
1294 { 1455 {
1295 TermWin.focus = 1; 1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1296 want_refresh = 1; 1457 ;
1297#ifdef USE_XIM 1458
1298 if (Input_Context != NULL) 1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1299 XSetICFocus (Input_Context); 1460 {
1300#endif 1461 seen_resize = 1;
1301#ifdef CURSOR_BLINK 1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1463 }
1464
1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1302 if (Options & Opt_cursorBlink) 1466 if (options & Opt_transparent)
1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1467 check_our_parents ();
1304#endif 1468#endif
1305
1306 } 1469 }
1307 break; 1470 break;
1308 1471
1309 case FocusOut:
1310 if (TermWin.focus)
1311 {
1312 TermWin.focus = 0;
1313 want_refresh = 1;
1314#ifdef USE_XIM
1315 if (Input_Context != NULL)
1316 XUnsetICFocus (Input_Context);
1317#endif
1318#ifdef CURSOR_BLINK
1319 if (Options & Opt_cursorBlink)
1320 cursor_blink_ev.stop ();
1321 hidden_cursor = 0;
1322#endif
1323
1324 }
1325 break;
1326
1327 case ConfigureNotify: 1472 case PropertyNotify:
1328 if (ev.xconfigure.window == TermWin.parent[0]) 1473 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1329 { 1474 && ev.xproperty.state == PropertyNewValue)
1330 int height, width; 1475 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 1476
1332 do
1333 { /* Wrap lots of configures into one */
1334 width = ev.xconfigure.width;
1335 height = ev.xconfigure.height;
1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 }
1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1339
1340 if (szHint.width != width || szHint.height != height)
1341 {
1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1343 resize_all_windows (width, height, 1);
1344 }
1345#ifdef DEBUG_SIZE
1346 else
1347 {
1348 D_SIZE ((stderr, "Size: Not resizing"));
1349 }
1350#endif
1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1352 if (Options & Opt_transparent)
1353 {
1354 check_our_parents ();
1355 if (am_transparent)
1356 want_full_refresh = 1;
1357 }
1358#endif
1359
1360 }
1361 break; 1477 break;
1362 1478
1363 case SelectionClear: 1479 case SelectionClear:
1364 display->set_selection_owner (0); 1480 selection_clear ();
1365 break; 1481 break;
1366 1482
1367 case SelectionNotify: 1483 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1484 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1485 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1370 ev.xselection.property, True);
1371 break; 1486 break;
1372 1487
1373 case SelectionRequest: 1488 case SelectionRequest:
1374 selection_send (ev.xselectionrequest); 1489 selection_send (ev.xselectionrequest);
1375 break; 1490 break;
1376 1491
1377 case UnmapNotify: 1492 case UnmapNotify:
1378 TermWin.mapped = 0; 1493 mapped = 0;
1379#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1380 text_blink_ev.stop (); 1495 text_blink_ev.stop ();
1381#endif 1496#endif
1382 break; 1497 break;
1383 1498
1384 case MapNotify: 1499 case MapNotify:
1385 TermWin.mapped = 1; 1500 mapped = 1;
1386#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1387 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1388#endif 1503#endif
1389 break; 1504 break;
1390 1505
… …
1394 break; 1509 break;
1395#endif /* TRANSPARENT */ 1510#endif /* TRANSPARENT */
1396 1511
1397 case GraphicsExpose: 1512 case GraphicsExpose:
1398 case Expose: 1513 case Expose:
1399 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == vt)
1400 { 1515 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1516 do
1402 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1405 // 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))
1406 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1408 //scr_expose (ev.xexpose.x, 0, 1526
1409 // ev.xexpose.width, TermWin.height, False); 1527 scr_refresh (refresh_type);
1410#endif
1411 want_refresh = 1;
1412 } 1528 }
1413 else 1529 else
1414 { 1530 {
1415 XEvent unused_event; 1531 XEvent unused_event;
1416 1532
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1418 Expose, 1534 ;
1419 &unused_event)) ; 1535 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1536 ;
1421 GraphicsExpose, 1537
1422 &unused_event)) ;
1423 if (isScrollbarWindow (ev.xany.window)) 1538 if (isScrollbarWindow (ev.xany.window))
1424 { 1539 {
1425 scrollBar.setIdle (); 1540 scrollBar.setIdle ();
1426 scrollbar_show (0); 1541 scrollbar_show (0);
1427 } 1542 }
1428#ifdef MENUBAR 1543#ifdef MENUBAR
1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1430 menubar_expose (); 1545 menubar_expose ();
1431#endif 1546#endif
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window);
1551#endif
1432 } 1552 }
1433 break; 1553 break;
1434 1554
1435 case MotionNotify: 1555 case MotionNotify:
1436#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
… …
1442 { 1562 {
1443 menubar_control (ev.xbutton); 1563 menubar_control (ev.xbutton);
1444 break; 1564 break;
1445 } 1565 }
1446#endif 1566#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1448 break; 1568 break;
1449 1569
1450 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1451 { 1571 {
1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1453 { 1573 {
1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1455 ; 1575 ;
1456 1576
1457 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (disp, vt,
1458 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1459 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1460 & (ev.xbutton.x), & (ev.xbutton.y), 1580 &ev.xbutton.x, &ev.xbutton.y,
1461 &unused_mask); 1581 &ev.xbutton.state);
1462#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1463 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1465 { 1585 {
1466#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
1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1468 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1597
1469#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1470 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1472 { 1601 {
1473 int dist; 1602 int dist;
1474
1475 pending_scroll_selection=1;
1476 1603
1477 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1478 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1479 */ 1606 */
1480 if (scroll_selection_delay<=0) 1607 if (!sel_scroll_ev.active)
1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1608 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1482 1609
1483 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1484 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1485 */ 1612 */
1486 selection_save_x=ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1487 selection_save_y=ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1488 selection_save_state=
1489 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1490 1616
1491 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1492 if (ev.xbutton.y<TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1493 { 1619 {
1494 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1495 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1496 } 1622 }
1497 else 1623 else
1498 { 1624 {
1499 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1500 dist = ev.xbutton.y - 1626 dist = ev.xbutton.y - (int_bwidth + height);
1501 (TermWin.int_bwidth + TermWin.height);
1502 } 1627 }
1628
1503 scroll_selection_lines= (Pixel2Height (dist)/ 1629 scroll_selection_lines = Pixel2Height (dist)
1504 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1631 + 1;
1505 MIN_IT (scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1506 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1507 } 1634 }
1508 else 1635 else
1509 { 1636 {
1510 /* we are within the text window, so we 1637 /* we are within the text window, so we
1511 * shouldn't be scrolling 1638 * shouldn't be scrolling
1512 */ 1639 */
1513 pending_scroll_selection = 0; 1640 if (sel_scroll_ev.active)
1641 sel_scroll_ev.stop();
1514 } 1642 }
1515#endif 1643#endif
1516#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1517
1518 } 1645 }
1519#endif 1646#endif
1520
1521 } 1647 }
1522 } 1648 }
1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1524 { 1650 {
1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1651 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1526 MotionNotify, &ev)) ; 1652 MotionNotify, &ev))
1653 ;
1654
1527 XQueryPointer (display->display, scrollBar.win, 1655 XQueryPointer (disp, scrollBar.win,
1528 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1529 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1530 & (ev.xbutton.x), & (ev.xbutton.y), 1658 &ev.xbutton.x, &ev.xbutton.y,
1531 &unused_mask); 1659 &unused_mask);
1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1533 scrollbar_size ()); 1661 scrollbar_size ());
1534 scr_refresh (refresh_type); 1662 scr_refresh (refresh_type);
1535 refresh_limit = 0; 1663 refresh_limit = 0;
… …
1538 break; 1666 break;
1539 } 1667 }
1540} 1668}
1541 1669
1542void 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 (options & 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 (options & 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
1543rxvt_term::rootwin_cb (XEvent &ev) 1733rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1734{
1545 SET_R (this); 1735 SET_R (this);
1546 SET_LOCALE (locale); 1736 SET_LOCALE (locale);
1547 1737
1548 switch (ev.type) 1738 switch (ev.type)
1549 { 1739 {
1550 case PropertyNotify: 1740 case PropertyNotify:
1551 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1552 {
1553 if (ev.xproperty.state == PropertyNewValue)
1554 selection_property (ev.xproperty.window, ev.xproperty.atom);
1555 break;
1556 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /* 1741 /*
1561 * 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,
1562 * 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.
1563 */ 1744 */
1564 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566
1567 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1745 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1568 return; 1747 return;
1569 }
1570 1748
1571 /* FALLTHROUGH */ 1749 /* FALLTHROUGH */
1572 case ReparentNotify: 1750 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1751 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1752 want_refresh = want_full_refresh = 1;
1576 break; 1753 break;
1577#endif
1578 } 1754 }
1579} 1755}
1756#endif
1580 1757
1581void 1758void
1582rxvt_term::button_press (XButtonEvent &ev) 1759rxvt_term::button_press (XButtonEvent &ev)
1583{ 1760{
1584 int reportmode = 0, clickintime; 1761 int reportmode = 0, clickintime;
1585 1762
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1587 if (!bypass_keystate) 1764 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1765 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766
1589 /* 1767 /*
1590 * VT window processing of button press 1768 * VT window processing of button press
1591 */ 1769 */
1592 if (ev.window == TermWin.vt) 1770 if (ev.window == vt)
1593 { 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
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1781 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1782
1595 if (reportmode) 1783 if (reportmode)
1596 { 1784 {
1597 /* mouse report from vt window */ 1785 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */ 1786 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state; 1787 MEvent.state = ev.state;
… …
1628 } 1816 }
1629 else 1817 else
1630 { 1818 {
1631 if (ev.button != MEvent.button) 1819 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0; 1820 MEvent.clicks = 0;
1821
1633 switch (ev.button) 1822 switch (ev.button)
1634 { 1823 {
1635 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
1636 /* allow shift+left click to extend selection */ 1833 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1638 { 1835 {
1639 if (MEvent.button == Button1 && clickintime) 1836 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y); 1837 selection_rotate (ev.x, ev.y);
1641 else 1838 else
1642 selection_extend (ev.x, ev.y, 1); 1839 selection_extend (ev.x, ev.y, 1);
… …
1657 case Button3: 1854 case Button3:
1658 if (MEvent.button == Button3 && clickintime) 1855 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y); 1856 selection_rotate (ev.x, ev.y);
1660 else 1857 else
1661 selection_extend (ev.x, ev.y, 1); 1858 selection_extend (ev.x, ev.y, 1);
1859
1662 MEvent.button = Button3; 1860 MEvent.button = Button3;
1663 break; 1861 break;
1664 } 1862 }
1665 } 1863 }
1864
1666 MEvent.time = ev.time; 1865 MEvent.time = ev.time;
1667 return; 1866 return;
1668 } 1867 }
1669 1868
1670 /* 1869 /*
… …
1736 upordown = 1; /* down */ 1935 upordown = 1; /* down */
1737 } 1936 }
1738 if (upordown) 1937 if (upordown)
1739 { 1938 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1939#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1940 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1742#endif 1941#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 1942 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 1943 {
1745 if (upordown < 0) 1944 if (upordown < 0)
1746 scrollBar.setUp (); 1945 scrollBar.setUp ();
… …
1762 break; 1961 break;
1763 case R_SB_ALIGN_BOTTOM: 1962 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 1963 csrO = scrollBar.bot - scrollBar.top;
1765 break; 1964 break;
1766 } 1965 }
1966
1767 if (scrollBar.style == R_SB_XTERM 1967 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 1968 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 1969 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 1970 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 1971
1772 scrollBar.setMotion (); 1972 scrollBar.setMotion ();
1773 break; 1973 break;
1774 1974
1775 case Button1: 1975 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1976 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1780 case Button3: 1980 case Button3:
1781 if (scrollBar.style != R_SB_XTERM) 1981 if (scrollBar.style != R_SB_XTERM)
1782 { 1982 {
1783 if (scrollbar_above_slider (ev.y)) 1983 if (scrollbar_above_slider (ev.y))
1784# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1785 scr_page (UP, TermWin.nrow - 1); 1985 scr_page (UP, nrow - 1);
1786# else 1986# else
1787 scr_page (UP, TermWin.nrow / 4); 1987 scr_page (UP, nrow / 4);
1788# endif 1988# endif
1789 else if (scrollbar_below_slider (ev.y)) 1989 else if (scrollbar_below_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 1990# ifdef RXVT_SCROLL_FULL
1791 scr_page (DN, TermWin.nrow - 1); 1991 scr_page (DN, nrow - 1);
1792# else 1992# else
1793 scr_page (DN, TermWin.nrow / 4); 1993 scr_page (DN, nrow / 4);
1794# endif 1994# endif
1795 else 1995 else
1796 scrollBar.setMotion (); 1996 scrollBar.setMotion ();
1797 } 1997 }
1798 else 1998 else
1799 { 1999 {
1800 scr_page ((ev.button == Button1 ? DN : UP), 2000 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 2001 (nrow
1802 * scrollbar_position (ev.y) 2002 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 2003 / scrollbar_size ()));
1804 } 2004 }
2005
1805 break; 2006 break;
1806 } 2007 }
1807 } 2008 }
1808 return; 2009 return;
1809 } 2010 }
… …
1821{ 2022{
1822 int reportmode = 0; 2023 int reportmode = 0;
1823 2024
1824 csrO = 0; /* reset csr Offset */ 2025 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate) 2026 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2027 reportmode = !! (priv_modes & PrivMode_mouse_report);
1827 2028
1828 if (scrollbar_isUpDn ()) 2029 if (scrollbar_isUpDn ())
1829 { 2030 {
1830 scrollBar.setIdle (); 2031 scrollBar.setIdle ();
1831 scrollbar_show (0); 2032 scrollbar_show (0);
1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1833 refresh_type &= ~SMOOTH_REFRESH; 2034 refresh_type &= ~SMOOTH_REFRESH;
1834#endif 2035#endif
1835
1836 } 2036 }
2037
1837#ifdef SELECTION_SCROLLING 2038#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 2039 if (sel_scroll_ev.active)
2040 sel_scroll_ev.stop();
1839#endif 2041#endif
2042
1840 if (ev.window == TermWin.vt) 2043 if (ev.window == vt)
1841 { 2044 {
2045#if ISO_14755
2046 // 5.4
2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2048 return;
2049#endif
1842 if (reportmode) 2050 if (reportmode)
1843 { 2051 {
1844 /* mouse report from vt window */ 2052 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */ 2053 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4) 2054 if (ev.button >= 4)
… …
1860 MEvent.button = AnyButton; 2068 MEvent.button = AnyButton;
1861 mouse_report (ev); 2069 mouse_report (ev);
1862#endif /* MOUSE_REPORT_DOUBLECLICK */ 2070#endif /* MOUSE_REPORT_DOUBLECLICK */
1863 return; 2071 return;
1864 } 2072 }
2073
1865 /* 2074 /*
1866 * dumb hack to compensate for the failure of click-and-drag 2075 * dumb hack to compensate for the failure of click-and-drag
1867 * when overriding mouse reporting 2076 * when overriding mouse reporting
1868 */ 2077 */
1869 if (PrivateModes & PrivMode_mouse_report 2078 if (priv_modes & PrivMode_mouse_report
1870 && bypass_keystate 2079 && bypass_keystate
1871 && ev.button == Button1 && MEvent.clicks <= 1) 2080 && ev.button == Button1 && MEvent.clicks <= 1)
1872 selection_extend (ev.x, ev.y, 0); 2081 selection_extend (ev.x, ev.y, 0);
1873 2082
1874 switch (ev.button) 2083 switch (ev.button)
… …
1885 case Button5: 2094 case Button5:
1886 { 2095 {
1887 int i; 2096 int i;
1888 page_dirn v; 2097 page_dirn v;
1889 2098
1890 v = (ev.button == Button4) ? UP : DN; 2099 v = ev.button == Button4 ? UP : DN;
2100
1891 if (ev.state & ShiftMask) 2101 if (ev.state & ShiftMask)
1892 i = 1; 2102 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 2103 else if (options & Opt_mouseWheelScrollPage)
1894 i = TermWin.nrow - 1; 2104 i = nrow - 1;
1895 else 2105 else
1896 i = 5; 2106 i = 5;
2107
1897# ifdef MOUSE_SLIP_WHEELING 2108# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 2109 if (ev.state & ControlMask)
1899 { 2110 {
1900 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)
1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2116 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2117
2118 slip_wheel_ev.start ();
1902 } 2119 }
2120 else
2121 {
1903# endif 2122# endif
1904# ifdef JUMP_MOUSE_WHEEL 2123# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1911 scr_page (v, 1); 2124 scr_page (v, i);
1912 scr_refresh (SMOOTH_REFRESH); 2125 scr_refresh (SMOOTH_REFRESH);
1913 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
1914 } 2136 }
1915# endif 2137#endif
1916
1917 } 2138 }
1918 break; 2139 break;
1919#endif 2140#endif
1920
1921 } 2141 }
1922 } 2142 }
1923#ifdef MENUBAR 2143#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window)) 2144 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev); 2145 menubar_control (ev);
1926#endif 2146#endif
1927} 2147}
1928 2148
1929
1930#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
1931/* 2381/*
1932 * Check our parents are still who we think they are. 2382 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 2383 * Do transparency updates if required
1934 */ 2384 */
1935int 2385int
1936rxvt_term::check_our_parents () 2386rxvt_term::check_our_parents ()
1937{ 2387{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 2388 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 2389 unsigned long nitems, bytes_after;
1940 Atom atype; 2390 Atom atype;
1941 unsigned char *prop = NULL; 2391 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 2392 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 2393 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 2394 XWindowAttributes wattr, wrootattr;
2395 dDisp;
1945 2396
1946 pchanged = 0; 2397 pchanged = 0;
1947 2398
1948 if (! (Options & Opt_transparent)) 2399 if (!(options & Opt_transparent))
1949 return pchanged; /* Don't try any more */ 2400 return pchanged; /* Don't try any more */
1950 2401
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 2402 XGetWindowAttributes (disp, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 2403 rootdepth = wrootattr.depth;
1953 2404
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2405 XGetWindowAttributes (disp, parent[0], &wattr);
2406
1955 if (rootdepth != wattr.depth) 2407 if (rootdepth != wattr.depth)
1956 { 2408 {
1957 if (am_transparent) 2409 if (am_transparent)
1958 { 2410 {
1959 pchanged = 1; 2411 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 2413 am_transparent = am_pixmap_trans = 0;
1963 } 2414 }
2415
1964 return pchanged; /* Don't try any more */ 2416 return pchanged; /* Don't try any more */
1965 } 2417 }
1966 2418
1967 /* 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. */
1968 XSync (display->display, False); 2420 XSync (disp, False);
1969 2421
1970 /* 2422 /*
1971 * Make the frame window set by the window manager have 2423 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 2424 * the root background. Some window managers put multiple nested frame
1973 * 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.
1974 */ 2426 */
1975 i = (xa[XA_XROOTPMAPID] != 0 2427 i = (xa[XA_XROOTPMAP_ID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2428 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success)); 2430 &nitems, &bytes_after, &prop) == Success);
2431
1979 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 )
1980 have_pixmap = 0; 2443 have_pixmap = 0;
1981 else 2444 else
1982 { 2445 {
1983 have_pixmap = 1; 2446 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2447 rootpixmap = *(Pixmap *)prop;
1985 XFree (prop); 2448 XFree (prop);
1986 } 2449 }
2450
1987 if (have_pixmap) 2451 if (have_pixmap)
1988 { 2452 {
1989 /* 2453 /*
1990 * Copy display->root pixmap transparency 2454 * Copy display->root pixmap transparency
1991 */ 2455 */
1992 int sx, sy, nx, ny; 2456 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2457 unsigned int nw, nh;
1994 Window cr; 2458 Window cr;
1995 XImage *image; 2459 XImage *image;
1996 GC gc; 2460 GC gc;
1997 XGCValues gcvalue; 2461 XGCValues gcvalue;
1998 2462
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2463 XTranslateCoordinates (disp, parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2464 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2465 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2466 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2467 nx = ny = 0;
2468
2004 if (sx < 0) 2469 if (sx < 0)
2005 { 2470 {
2006 nw += sx; 2471 nw += sx;
2007 nx = -sx; 2472 nx = -sx;
2008 sx = 0; 2473 sx = 0;
2009 } 2474 }
2475
2010 if (sy < 0) 2476 if (sy < 0)
2011 { 2477 {
2012 nh += sy; 2478 nh += sy;
2013 ny = -sy; 2479 ny = -sy;
2014 sy = 0; 2480 sy = 0;
2015 } 2481 }
2482
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2485
2486 XSync (disp, False);
2018 allowedxerror = -1; 2487 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2489
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2490 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2491 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2492 allowedxerror = 0;
2493
2024 if (image == NULL) 2494 if (image == NULL)
2025 { 2495 {
2026 if (am_transparent && am_pixmap_trans) 2496 if (am_transparent && am_pixmap_trans)
2027 { 2497 {
2028 pchanged = 1; 2498 pchanged = 1;
2029 if (TermWin.pixmap != None) 2499 if (pixmap != None)
2030 { 2500 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2501 XFreePixmap (disp, pixmap);
2032 TermWin.pixmap = None; 2502 pixmap = None;
2033 } 2503 }
2034 } 2504 }
2505
2035 am_pixmap_trans = 0; 2506 am_pixmap_trans = 0;
2036 } 2507 }
2037 else 2508 else
2038 { 2509 {
2039 if (TermWin.pixmap != None) 2510 if (pixmap != None)
2040 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
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2525 pixmap = XCreatePixmap (disp, vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height, 2526 szHint.width, szHint.height, image->depth);
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2529 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2530 XFreeGC (disp, gc);
2050 XDestroyImage (image); 2531 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2052 TermWin.pixmap); 2533 XClearWindow (disp, parent[0]);
2534
2053 if (!am_transparent || !am_pixmap_trans) 2535 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2536 pchanged = 1;
2537
2055 am_transparent = am_pixmap_trans = 1; 2538 am_transparent = am_pixmap_trans = 1;
2056 } 2539 }
2057 } 2540 }
2541
2058 if (!am_pixmap_trans) 2542 if (am_pixmap_trans)
2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2544 else
2059 { 2545 {
2060 unsigned int n; 2546 unsigned int n;
2061 /* 2547 /*
2062 * InheritPixmap transparency 2548 * InheritPixmap transparency
2063 */ 2549 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2551 {
2068 oldp = TermWin.parent[i]; 2552 oldp = parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2553 XQueryTree (disp, parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n); 2554 &parent[i], &list, &n);
2071 XFree (list); 2555 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2556
2073 if (TermWin.parent[i] == display->root) 2557 if (parent[i] == display->root)
2074 { 2558 {
2075 if (oldp != None) 2559 if (oldp != None)
2076 pchanged = 1; 2560 pchanged = 1;
2561
2077 break; 2562 break;
2078 } 2563 }
2564
2079 if (oldp != TermWin.parent[i]) 2565 if (oldp != parent[i])
2080 pchanged = 1; 2566 pchanged = 1;
2081 } 2567 }
2568
2082 n = 0; 2569 n = 0;
2570
2083 if (pchanged) 2571 if (pchanged)
2084 { 2572 {
2085 for (; n < (unsigned int)i; n++) 2573 for (; n < (unsigned int)i; n++)
2086 { 2574 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2575 XGetWindowAttributes (disp, parent[n], &wattr);
2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2090 { 2577 {
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2092 break; 2579 break;
2093 } 2580 }
2094 } 2581 }
2095 } 2582 }
2096 if (n > (int) (sizeof (TermWin.parent) 2583
2097 / sizeof (TermWin.parent[0]))) 2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2098 { 2585 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt,
2103 PixColors[Color_bg]);
2104 am_transparent = 0; 2588 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */ 2589 /* XXX: also turn off Opt_transparent? */
2106 } 2590 }
2107 else 2591 else
2108 { 2592 {
2593#if WAIT_FOR_WM
2109 /* wait (an arbitrary period) for the WM to do its thing 2594 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */ 2595 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113
2114 rqt.tv_sec = 1;
2115 rqt.tv_nsec = 0;
2116 nanosleep (&rqt, NULL);
2117# else
2118 sleep (1); 2596 sleep (1);
2119# endif 2597#endif
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++) 2598 for (n = 0; n < (unsigned int)i; n++)
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2599 {
2123 ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2601 XClearWindow (disp, parent[n]);
2125 ParentRelative); 2602 }
2603
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2126 am_transparent = 1; 2605 am_transparent = 1;
2127 } 2606 }
2607
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2609 parent[i] = None;
2610 }
2611
2612 if (scrollBar.win)
2130 } 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
2131 return pchanged; 2626 return pchanged;
2132} 2627}
2133#endif 2628#endif
2134 2629
2135/*}}} */ 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 (!(options & 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 ((options & 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}
2136 2827
2137/*{{{ print pipe */ 2828/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2829/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2830#ifdef PRINTPIPE
2140FILE * 2831FILE *
2141rxvt_term::popen_printer () 2832rxvt_term::popen_printer ()
2142{ 2833{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2834 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2835
2145 if (stream == NULL) 2836 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2837 rxvt_warn ("can't open printer pipe, not printing.\n");
2838
2147 return stream; 2839 return stream;
2148} 2840}
2149 2841
2150int 2842int
2151rxvt_term::pclose_printer (FILE *stream) 2843rxvt_term::pclose_printer (FILE *stream)
2152{ 2844{
2153 fflush (stream); 2845 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2846 return pclose (stream);
2160# endif
2161} 2847}
2162 2848
2163/* 2849/*
2164 * simulate attached vt100 printer 2850 * simulate attached vt100 printer
2165 */ 2851 */
2166void 2852void
2167rxvt_term::process_print_pipe () 2853rxvt_term::process_print_pipe ()
2168{ 2854{
2169 int done; 2855 int done;
2170 FILE *fd; 2856 FILE *fd;
2171 2857
2172 if ((fd = popen_printer ()) == NULL) 2858 if ((fd = popen_printer ()) == NULL)
2173 return; 2859 return;
2174 2860
2175 /* 2861 /*
2176 * 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
2177 * is received. 2863 * is received.
2178 */ 2864 */
2179 for (done = 0; !done;) 2865 for (done = 0; !done;)
2180 { 2866 {
2181 unsigned char buf[8]; 2867 unsigned char buf[8];
2182 unsigned char ch; 2868 unicode_t ch;
2183 unsigned int i, len; 2869 unsigned int i, len;
2184 2870
2185 if ((ch = cmd_getc ()) != C0_ESC) 2871 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2872 {
2187 if (putc (ch, fd) == EOF) 2873 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2874 break; /* done = 1 */
… …
2203 { 2889 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2890 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2891 break; /* done = 1 */
2206 } 2892 }
2207 } 2893 }
2894
2208 for (i = 0; i < len; i++) 2895 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2896 if (putc (buf[i], fd) == EOF)
2210 { 2897 {
2211 done = 1; 2898 done = 1;
2212 break; 2899 break;
2213 } 2900 }
2214 } 2901 }
2215 } 2902 }
2903
2216 pclose_printer (fd); 2904 pclose_printer (fd);
2217} 2905}
2218#endif /* PRINTPIPE */ 2906#endif /* PRINTPIPE */
2219/*}}} */ 2907/*}}} */
2220 2908
2221/* *INDENT-OFF* */ 2909/* *INDENT-OFF* */
2222enum { 2910enum {
2223 C1_40 = 0x40, 2911 C1_40 = 0x40,
2224 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,
2225 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,
2226 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,
2227 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,
2228}; 2916};
2229/* *INDENT-ON* */ 2917/* *INDENT-ON* */
2230 2918
2231/*{{{ process non-printing single characters */ 2919/*{{{ process non-printing single characters */
2232void 2920void
2233rxvt_term::process_nonprinting (unsigned char ch) 2921rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2922{
2235 switch (ch) 2923 switch (ch)
2236 { 2924 {
2925 case C0_ESC:
2926 process_escape_seq ();
2927 break;
2237 case C0_ENQ: /* terminal Status */ 2928 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2929 if (rs[Rs_answerbackstring])
2239 tt_write (
2240 (const unsigned char *)rs[Rs_answerbackstring], 2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2242 else 2932 else
2243 tt_write ((unsigned char *)VT100_ANS, 2933 tt_write ((unsigned char *)VT100_ANS,
2244 (unsigned int)STRLEN (VT100_ANS)); 2934 (unsigned int)strlen (VT100_ANS));
2245 break; 2935 break;
2246 case C0_BEL: /* bell */ 2936 case C0_BEL: /* bell */
2247 scr_bell (); 2937 scr_bell ();
2248 break; 2938 break;
2249 case C0_BS: /* backspace */ 2939 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 2954 scr_charset_choose (1);
2265 break; 2955 break;
2266 case C0_SI: /* shift in - acs */ 2956 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 2957 scr_charset_choose (0);
2268 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
2269 } 2972 }
2270} 2973}
2271/*}}} */ 2974/*}}} */
2272 2975
2273 2976
2274/*{{{ process VT52 escape sequences */ 2977/*{{{ process VT52 escape sequences */
2275void 2978void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 2979rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 2980{
2278 int row, col; 2981 int row, col;
2279 2982
2280 switch (ch) 2983 switch (ch)
2281 { 2984 {
… …
2333 3036
2334/*{{{ process escape sequences */ 3037/*{{{ process escape sequences */
2335void 3038void
2336rxvt_term::process_escape_seq () 3039rxvt_term::process_escape_seq ()
2337{ 3040{
2338 unsigned char ch = cmd_getc (); 3041 unicode_t ch = cmd_getc ();
2339 3042
2340 if (PrivateModes & PrivMode_vt52) 3043 if (priv_modes & PrivMode_vt52)
2341 { 3044 {
2342 process_escape_vt52 (ch); 3045 process_escape_vt52 (ch);
2343 return; 3046 return;
2344 } 3047 }
2345 3048
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 3063 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 3064 break;
2362 case '+': 3065 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 3066 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 3067 break;
2365#ifdef MULTICHAR_SET 3068#if ENABLE_FRILLS
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS
2371 case '6': 3069 case '6':
2372 scr_backindex (); 3070 scr_backindex ();
2373 break; 3071 break;
2374#endif 3072#endif
2375 case '7': 3073 case '7':
2376 scr_cursor (SAVE); 3074 scr_cursor (SAVE);
2377 break; 3075 break;
2378 case '8': 3076 case '8':
2379 scr_cursor (RESTORE); 3077 scr_cursor (RESTORE);
2380 break; 3078 break;
2381#ifndef NO_FRILLS 3079#if ENABLE_FRILLS
2382 case '9': 3080 case '9':
2383 scr_forwardindex (); 3081 scr_forwardindex ();
2384 break; 3082 break;
2385#endif 3083#endif
2386 case '=': 3084 case '=':
… …
2396 break; 3094 break;
2397 3095
2398 /* 8.3.87: NEXT LINE */ 3096 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 3097 case C1_NEL: /* ESC E */
2400 { 3098 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 3099 unicode_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 3100 scr_add_lines (nlcr, 1, 2);
2403 } 3101 }
2404 break; 3102 break;
2405 3103
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 3104 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2417 case C1_RI: /* ESC M */ 3115 case C1_RI: /* ESC M */
2418 scr_index (DN); 3116 scr_index (DN);
2419 break; 3117 break;
2420 3118
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 3119 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 3120 /*case C1_SS2: scr_single_shift (2); break; */
2423 3121
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 3122 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 3123 /*case C1_SS3: scr_single_shift (3); break; */
2426 3124
2427 /* 8.3.27: DEVICE CONTROL STRING */ 3125 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 3126 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 3127 process_dcs_seq ();
2430 break; 3128 break;
… …
2445 process_osc_seq (); 3143 process_osc_seq ();
2446 break; 3144 break;
2447 3145
2448 /* 8.3.106: RESET TO INITIAL STATE */ 3146 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 3147 case 'c':
3148 mbstate.reset ();
2450 scr_poweron (); 3149 scr_poweron ();
2451 scrollbar_show (1); 3150 scrollbar_show (1);
2452 break; 3151 break;
2453 3152
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3153 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 3165
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3166/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 3167/* *INDENT-OFF* */
2469enum { 3168enum {
2470 CSI_ICH = 0x40, 3169 CSI_ICH = 0x40,
2471 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,
2472 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 ,
2473 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,
2474 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,
2475 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,
2476 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,
… …
2491 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, */
2492 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, [, \, ], ^, _, */
2493 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, */
2494 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, */
2495 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, */
2496 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, {, |, }, ~, */
2497 }; 3196 };
2498/* *INDENT-ON* */ 3197/* *INDENT-ON* */
2499 3198
2500void 3199void
2501rxvt_term::process_csi_seq () 3200rxvt_term::process_csi_seq ()
2502{ 3201{
2503 unsigned char ch, priv, i; 3202 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 3203 unsigned int nargs, p;
2505 int n, ndef; 3204 int n, ndef;
2506 int arg[ESC_ARGS]; 3205 int arg[ESC_ARGS];
2507 3206
2508 for (nargs = ESC_ARGS; nargs > 0;) 3207 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 3208 arg[--nargs] = 0;
2510 3209
2511 priv = 0; 3210 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 3212 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 3213 { /* '<' '=' '>' '?' */
2515 priv = ch; 3214 priv = ch;
2516 ch = cmd_getc (); 3215 ch = cmd_getc ();
2517 } 3216 }
3217
2518 /* read any numerical arguments */ 3218 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 3219 for (n = -1; ch < CSI_ICH; )
2520 { 3220 {
2521 if (isdigit (ch)) 3221 if (isdigit (ch))
2522 { 3222 {
… …
2529 { 3229 {
2530 if (nargs < ESC_ARGS) 3230 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 3231 arg[nargs++] = n;
2532 n = -1; 3232 n = -1;
2533 } 3233 }
2534 else if (ch == '\b') 3234 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 3235 process_nonprinting (ch);
2546 } 3236
2547 ch = cmd_getc (); 3237 ch = cmd_getc ();
2548 } 3238 }
2549 3239
2550 if (ch > CSI_7F) 3240 if (ch > CSI_7F)
2551 return; 3241 return;
… …
2573 { 3263 {
2574 switch (priv) 3264 switch (priv)
2575 { 3265 {
2576 case '>': 3266 case '>':
2577 if (ch == CSI_DA) /* secondary device attributes */ 3267 if (ch == CSI_DA) /* secondary device attributes */
2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3268 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2579 break; 3269 break;
2580 case '?': 3270 case '?':
2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3271 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2582 process_terminal_mode (ch, priv, nargs, arg); 3272 process_terminal_mode (ch, priv, nargs, arg);
2583 break; 3273 break;
… …
2688 3378
2689 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3379 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2690 arg[0] = -arg[0]; 3380 arg[0] = -arg[0];
2691 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2694 break; 3384 break;
2695 3385
2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2697 tt_write ((const unsigned char *)VT100_ANS, 3387 tt_write ((const unsigned char *)VT100_ANS,
2698 (unsigned int) (sizeof (VT100_ANS) - 1)); 3388 (unsigned int) (sizeof (VT100_ANS) - 1));
2699 break; 3389 break;
2700 3390
2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2702 process_sgr_mode (nargs, arg); 3392 process_sgr_mode (nargs, arg);
2703 break; 3393 break;
… …
2709 tt_printf ("\033[0n"); 3399 tt_printf ("\033[0n");
2710 break; 3400 break;
2711 case 6: /* CPR requested */ 3401 case 6: /* CPR requested */
2712 scr_report_position (); 3402 scr_report_position ();
2713 break; 3403 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 3404 case 7: /* unofficial extension */
3405 if (options & Opt_insecure)
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3406 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2717 break; 3407 break;
2718#endif
2719 case 8: /* unofficial extension */ 3408 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 3410 break;
2722 } 3411 }
2723 break; 3412 break;
2724 3413
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3414 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2758 break; 3447 break;
2759 3448
2760 case CSI_RM: /* 8.3.107: RESET MODE */ 3449 case CSI_RM: /* 8.3.107: RESET MODE */
2761 if (arg[0] == 4) 3450 if (arg[0] == 4)
2762 scr_insert_mode (0); 3451 scr_insert_mode (0);
3452 else if (arg[0] == 20)
3453 priv_modes &= ~PrivMode_LFNL;
2763 break; 3454 break;
2764 3455
2765 case CSI_SM: /* 8.3.126: SET MODE */ 3456 case CSI_SM: /* 8.3.126: SET MODE */
2766 if (arg[0] == 4) 3457 if (arg[0] == 4)
2767 scr_insert_mode (1); 3458 scr_insert_mode (1);
3459 else if (arg[0] == 20)
3460 priv_modes |= PrivMode_LFNL;
2768 break; 3461 break;
2769 3462
2770 /* 3463 /*
2771 * PRIVATE USE beyond this point. All CSI_7? sequences here 3464 * PRIVATE USE beyond this point. All CSI_7? sequences here
2772 */ 3465 */
… …
2784 break; 3477 break;
2785 case CSI_75: 3478 case CSI_75:
2786 scr_cursor (RESTORE); 3479 scr_cursor (RESTORE);
2787 break; 3480 break;
2788 3481
2789#ifndef NO_FRILLS 3482#if ENABLE_FRILLS
2790 case CSI_74: 3483 case CSI_74:
2791 process_window_ops (arg, nargs); 3484 process_window_ops (arg, nargs);
2792 break; 3485 break;
2793#endif 3486#endif
2794 3487
2795 case CSI_78: /* DECREQTPARM */ 3488 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3489 if (arg[0] == 0 || arg[0] == 1)
2797 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);
2798 /* FALLTHROUGH */ 3491 break;
2799 3492
2800 default: 3493 default:
2801 break; 3494 break;
2802 } 3495 }
2803} 3496}
2804/*}}} */ 3497/*}}} */
2805 3498
2806#ifndef NO_FRILLS 3499#if ENABLE_FRILLS
2807/* ARGSUSED */ 3500/* ARGSUSED */
2808void 3501void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3502rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3503{
2811 int x, y; 3504 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3505 XWindowAttributes wattr;
2816 Window wdummy; 3506 Window wdummy;
3507 dDisp;
2817 3508
2818 if (nargs == 0) 3509 if (nargs == 0)
2819 return; 3510 return;
3511
2820 switch (args[0]) 3512 switch (args[0])
2821 { 3513 {
2822 /* 3514 /*
2823 * commands 3515 * commands
2824 */ 3516 */
2825 case 1: /* deiconify window */ 3517 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3518 XMapWindow (disp, parent[0]);
2827 break; 3519 break;
2828 case 2: /* iconify window */ 3520 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3521 XIconifyWindow (disp, parent[0], display->screen);
2830 DefaultScreen (display->display));
2831 break; 3522 break;
2832 case 3: /* set position (pixels) */ 3523 case 3: /* set position (pixels) */
2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3524 XMoveWindow (disp, parent[0], args[1], args[2]);
2834 break; 3525 break;
2835 case 4: /* set size (pixels) */ 3526 case 4: /* set size (pixels) */
2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2837 break; 3528 break;
2838 case 5: /* raise window */ 3529 case 5: /* raise window */
2839 XRaiseWindow (display->display, TermWin.parent[0]); 3530 XRaiseWindow (disp, parent[0]);
2840 break; 3531 break;
2841 case 6: /* lower window */ 3532 case 6: /* lower window */
2842 XLowerWindow (display->display, TermWin.parent[0]); 3533 XLowerWindow (disp, parent[0]);
2843 break; 3534 break;
2844 case 7: /* refresh window */ 3535 case 7: /* refresh window */
2845 scr_touch (true); 3536 scr_touch (true);
2846 break; 3537 break;
2847 case 8: /* set size (chars) */ 3538 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3539 set_widthheight ((unsigned int) (args[2] * fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3540 (unsigned int) (args[1] * fheight));
2850 break; 3541 break;
3542
3543 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3544 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3545 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3546 set_widthheight ((unsigned int)width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3547 (unsigned int) (args[1] * fheight));
2855 break; 3548 break;
3549
3550
2856 /* 3551 /*
2857 * reports - some output format copied from XTerm 3552 * reports - some output format copied from XTerm
2858 */ 3553 */
2859 case 11: /* report window state */ 3554 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3555 XGetWindowAttributes (disp, parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3557 break;
2863 case 13: /* report window position */ 3558 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3559 XGetWindowAttributes (disp, parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3560 XTranslateCoordinates (disp, parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3561 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3562 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3563 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3564 break;
2870 case 14: /* report window size (pixels) */ 3565 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3566 XGetWindowAttributes (disp, parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3568 break;
3569 case 18: /* report text area size (chars) */
3570 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3571 break;
2874 case 18: /* report window size (chars) */ 3572 case 19: /* report window size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2876 break; 3574 break;
2877#if 0 /* XXX: currently disabled due to security concerns */
2878 case 20: /* report icon label */ 3575 case 20: /* report icon label */
3576 {
3577 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3578 XGetIconName (disp, parent[0], &s);
2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3580 XFree (s);
3581 }
2881 break; 3582 break;
2882 case 21: /* report window title */ 3583 case 21: /* report window title */
3584 {
3585 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3586 XFetchName (disp, parent[0], &s);
2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s);
3589 }
2885 break; 3590 break;
2886#endif
2887
2888 } 3591 }
2889} 3592}
2890#endif 3593#endif
2891 3594
2892/*----------------------------------------------------------------------*/ 3595/*----------------------------------------------------------------------*/
2893/* 3596/*
2894 * get input up until STRING TERMINATOR (or BEL) 3597 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3598 * ends_how is terminator used. returned input must be free()'d
2896 */ 3599 */
2897unsigned char * 3600unsigned char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3601rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3602{
2900 int seen_esc = 0; /* seen escape? */ 3603 unicode_t ch;
3604 bool seen_esc = false;
2901 unsigned int n = 0; 3605 unsigned int n = 0;
2902 unsigned char *s; 3606 wchar_t string[STRING_MAX];
2903 unsigned char ch, string[STRING_MAX];
2904 3607
2905 for (; (ch = cmd_getc ());) 3608 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3609 {
2907 if (ch == C0_BEL 3610 if (seen_esc)
2908 || ch == CHAR_ST 3611 {
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3612 if (ch == 0x5c) /* 7bit ST */
2910 break; 3613 break;
3614 else
3615 return NULL;
3616 }
2911 if (ch == C0_ESC) 3617 else if (ch == C0_ESC)
2912 { 3618 {
2913 seen_esc = 1; 3619 seen_esc = true;
2914 continue; 3620 continue;
2915 } 3621 }
2916 else if (ch == '\t') 3622 else if (ch == C0_BEL || ch == CHAR_ST)
2917 ch = ' '; /* translate '\t' to space */ 3623 break;
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3624 else if (ch < 0x20)
2919 return NULL; /* other control character - exit */ 3625 return NULL; /* other control character - exit */
2920 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
2921 string[n++] = ch; 3636 string[n++] = ch;
2922 seen_esc = 0;
2923 } 3637 }
3638
2924 string[n++] = '\0'; 3639 string[n++] = '\0';
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3640
2926 return NULL;
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3641 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3642
2929 return s; 3643 return (unsigned char *)rxvt_wcstombs (string);
2930} 3644}
2931 3645
2932/*----------------------------------------------------------------------*/ 3646/*----------------------------------------------------------------------*/
2933/* 3647/*
2934 * 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)'
2935 */ 3649 */
2936void 3650void
2937rxvt_term::process_dcs_seq () 3651rxvt_term::process_dcs_seq ()
2938{ 3652{
2939 unsigned char eh, *s; 3653 unsigned char *s;
3654 unicode_t eh;
3655
2940 /* 3656 /*
2941 * Not handled yet 3657 * Not handled yet
2942 */ 3658 */
2943 s = get_to_st (&eh); 3659 s = get_to_st (eh);
2944 if (s) 3660 if (s)
2945 free (s); 3661 free (s);
3662
2946 return; 3663 return;
2947} 3664}
2948 3665
2949/*----------------------------------------------------------------------*/ 3666/*----------------------------------------------------------------------*/
2950/* 3667/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3668 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3669 */
2953void 3670void
2954rxvt_term::process_osc_seq () 3671rxvt_term::process_osc_seq ()
2955{ 3672{
2956 unsigned char ch, eh, *s; 3673 unicode_t ch, eh;
2957 int arg; 3674 int arg;
2958 3675
2959 ch = cmd_getc (); 3676 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3677 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3678 arg = arg * 10 + (ch - '0');
2962 3679
2963 if (ch == ';') 3680 if (ch == ';')
2964 { 3681 {
2965 s = get_to_st (&eh); 3682 unsigned char *s = get_to_st (eh);
3683
2966 if (s) 3684 if (s)
2967 { 3685 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3686 process_xterm_seq (arg, (char *)s, eh);
2980 free (s); 3687 free (s);
2981 } 3688 }
2982 } 3689 }
2983} 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
2984/* 3705/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title
2987 * 1 = change iconName
2988 * 2 = change title
2989 * 4 = change color
2990 * 12 = change text color
2991 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour
2993 * 18 = change bold character color
2994 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented)
2996 * 50 = change font
2997 *
2998 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap
3002 * 39 = change default fg color
3003 * 49 = change default bg color
3004 * 55 = dump scrollback buffer and all of screen
3005 */ 3707 */
3006void 3708void
3007rxvt_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)
3008{ 3710{
3009 int changed = 0; 3711 int changed = 0;
3010 int color; 3712 int color;
3011 char *buf, *name; 3713 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1];
3715 int saveop = op;
3716 dDisp;
3012 3717
3013 assert (str != NULL); 3718 assert (str != NULL);
3014 switch (op) 3719 switch (op)
3015 { 3720 {
3016 case XTerm_name: 3721 case XTerm_name:
3017 set_title (str); 3722 set_title (str);
3018 /* FALLTHROUGH */ 3723 /* FALLTHROUGH */
3019 case XTerm_iconName: 3724 case XTerm_iconName:
3020 set_iconName (str); 3725 set_icon_name (str);
3021 break; 3726 break;
3022 case XTerm_title: 3727 case XTerm_title:
3023 set_title (str); 3728 set_title (str);
3024 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
3025 case XTerm_Color: 3769 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3770 for (buf = (char *)str; buf && *buf;)
3027 { 3771 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3772 if ((name = strchr (buf, ';')) == NULL)
3029 break; 3773 break;
3774
3030 *name++ = '\0'; 3775 *name++ = '\0';
3031 color = atoi (buf); 3776 color = atoi (buf);
3777
3032 if (color < 0 || color >= TOTAL_COLORS) 3778 if (color < 0 || color >= TOTAL_COLORS)
3033 break; 3779 break;
3780
3034 if ((buf = STRCHR (name, ';')) != NULL) 3781 if ((buf = strchr (name, ';')) != NULL)
3035 *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
3036 set_window_color (color + minCOLOR, name); 3791 set_window_color (color + minCOLOR, name);
3037 } 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);
3038 break; 3799 break;
3039#ifndef NO_CURSORCOLOR 3800#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3801 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3802 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3042 break; 3803 break;
3043#endif 3804#endif
3044 case XTerm_Color_pointer: 3805 case XTerm_Color_pointer_fg:
3045 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);
3046 break; 3810 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3811#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD: 3812 case XTerm_Color_BD:
3049 set_window_color (Color_BD, str); 3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3050 break; 3814 break;
3051 case XTerm_Color_UL: 3815 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str); 3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3053 break; 3817 break;
3054 case XTerm_Color_RV: 3818 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3056 break; 3820 break;
3057#endif 3821 case URxvt_Color_IT:
3058 3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3059 case XTerm_Menu:
3060 /*
3061 * rxvt_menubar_dispatch () violates the constness of the string,
3062 * so DON'T do it here
3063 */
3064 break; 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
3065 case XTerm_Pixmap: 3834 case XTerm_Pixmap:
3066 if (*str != ';') 3835 if (*str != ';')
3067 { 3836 {
3068#if XPM_BACKGROUND 3837#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3838 scale_pixmap (""); /* reset to default scaling */
3070 set_bgPixmap (str); /* change pixmap */ 3839 set_bgPixmap (str); /* change pixmap */
3071#endif 3840#endif
3072 scr_touch (true); 3841 scr_touch (true);
3073 } 3842 }
3074 while ((str = STRCHR (str, ';')) != NULL) 3843 while ((str = strchr (str, ';')) != NULL)
3075 { 3844 {
3076 str++; 3845 str++;
3077#if XPM_BACKGROUND 3846#if XPM_BACKGROUND
3078 changed += scale_pixmap (str); 3847 changed += scale_pixmap (str);
3079#endif 3848#endif
3080
3081 } 3849 }
3850
3082 if (changed) 3851 if (changed)
3083 { 3852 {
3084#ifdef XPM_BACKGROUND 3853#ifdef XPM_BACKGROUND
3085 resize_pixmap (); 3854 resize_pixmap ();
3086#endif 3855#endif
… …
3092 set_window_color (Color_fg, str); 3861 set_window_color (Color_fg, str);
3093 break; 3862 break;
3094 case XTerm_restoreBG: 3863 case XTerm_restoreBG:
3095 set_window_color (Color_bg, str); 3864 set_window_color (Color_bg, str);
3096 break; 3865 break;
3866
3097 case XTerm_logfile: 3867 case XTerm_logfile:
3868 // TODO, when secure mode?
3869 break;
3870
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (options & Opt_insecure)
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3098 break; 3875 break;
3099 case XTerm_font: 3876#endif
3100 change_font (str);
3101 break;
3102 case XTerm_locale:
3103 if (str[0] == '?' && !str[1])
3104 tt_printf ("%-.250s\n", locale);
3105 else
3106 {
3107 set_locale (str);
3108 im_cb ();
3109
3110 if (display->selection_owner == this)
3111 display->set_selection_owner (0);
3112 }
3113 break;
3114#if 0 3877#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3878 case XTerm_dumpscreen: /* no error notices */
3116 { 3879 {
3117 int fd; 3880 int fd;
3118 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)
3119 { 3882 {
3120 scr_dump (fd); 3883 scr_dump (fd);
3121 close (fd); 3884 close (fd);
3122 } 3885 }
3123 } 3886 }
3124 break; 3887 break;
3125#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 (options & 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)];
3126 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, (options & 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
3127 } 3937 }
3128} 3938}
3129/*----------------------------------------------------------------------*/ 3939/*----------------------------------------------------------------------*/
3130 3940
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3941/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 3949 * so no need for fancy checking
3140 */ 3950 */
3141int 3951int
3142rxvt_term::privcases (int mode, unsigned long bit) 3952rxvt_term::privcases (int mode, unsigned long bit)
3143{ 3953{
3144 int state; 3954 int state;
3145 3955
3146 if (mode == 's') 3956 if (mode == 's')
3147 { 3957 {
3148 SavedModes |= (PrivateModes & bit); 3958 SavedModes |= (priv_modes & bit);
3149 return -1; 3959 return -1;
3150 } 3960 }
3151 else 3961 else
3152 { 3962 {
3153 if (mode == 'r') 3963 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3964 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3965 else
3156 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3966 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3157 PrivMode (state, bit); 3967 PrivMode (state, bit);
3158 } 3968 }
3969
3159 return state; 3970 return state;
3160} 3971}
3161 3972
3162/* we're not using priv _yet_ */ 3973/* we're not using priv _yet_ */
3163void 3974void
3164rxvt_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)
3165{ 3976{
3166 unsigned int i, j; 3977 unsigned int i, j;
3167 int state; 3978 int state;
3979
3168 static const struct 3980 static const struct
3169 { 3981 {
3170 const int argval; 3982 const int argval;
3171 const unsigned long bit; 3983 const unsigned long bit;
3172 } 3984 }
3985
3173 argtopriv[] = { 3986 argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 3987 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 3988 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 3989 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 3990 { 4, PrivMode_smoothScroll },
3178 { 5, PrivMode_rVideo }, 3991 { 5, PrivMode_rVideo },
3179 { 6, PrivMode_relOrigin }, 3992 { 6, PrivMode_relOrigin },
3180 { 7, PrivMode_Autowrap }, 3993 { 7, PrivMode_Autowrap },
3994 // 8, bi-directional support mode
3181 { 9, PrivMode_MouseX10 }, 3995 { 9, PrivMode_MouseX10 },
3182#ifdef menuBar_esc 3996#ifdef menuBar_esc
3183 { menuBar_esc, PrivMode_menuBar }, 3997 { menuBar_esc, PrivMode_menuBar },
3184#endif 3998#endif
3999 // 18, 19 printing-related
4000 { 25, PrivMode_VisibleCursor },
3185#ifdef scrollBar_esc 4001#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 4002 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 4003#endif
3188 { 25, PrivMode_VisibleCursor },
3189 { 35, PrivMode_ShiftKeys }, 4004 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 4005 { 40, PrivMode_132OK },
4006 // 41 xterm more fixes NYI
4007 // 45 margin bell NYI
4008 // 46 start logging
3191 { 47, PrivMode_Screen }, 4009 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 4010 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 4011#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 4012 { 67, PrivMode_BackSpace },
3195#endif 4013#endif
3196 { 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
3197 { 1010, PrivMode_TtyOutputInh }, 4018 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 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
3199 { 1047, PrivMode_Screen }, 4023 { 1047, PrivMode_Screen },
4024 // 1048 save and restore cursor
3200 { 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
3201 }; 4027 };
3202 4028
3203 if (nargs == 0) 4029 if (nargs == 0)
3204 return; 4030 return;
3205 4031
… …
3220 state = privcases (mode, argtopriv[j].bit); 4046 state = privcases (mode, argtopriv[j].bit);
3221 break; 4047 break;
3222 } 4048 }
3223 4049
3224 /* extra handling for values with state unkept */ 4050 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 4051 switch (arg[i])
3227 { 4052 {
3228 case 1048: /* alternative cursor save */ 4053 case 1048: /* alternative cursor save */
4054 case 1049:
4055 if (options & Opt_secondaryScreen)
3229 if (mode == 0) 4056 if (mode == 0)
3230 scr_cursor (RESTORE); 4057 scr_cursor (RESTORE);
3231 else if (mode == 1) 4058 else if (mode == 1)
3232 scr_cursor (SAVE); 4059 scr_cursor (SAVE);
3233 /* FALLTHROUGH */
3234 default:
3235 continue; /* for (;i;) */
3236 }
3237
3238 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i])
3240 {
3241 /* case 1: - application cursor keys */
3242 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode
3246 */
3247 PrivMode (1, PrivMode_vt52);
3248 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;
3249 case 3: /* 80/132 */ 4075 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 4076 if (priv_modes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4077 set_widthheight (((state ? 132 : 80) * fwidth), height);
3252 (unsigned int)TermWin.height);
3253 break; 4078 break;
3254 case 4: /* smooth scrolling */ 4079 case 4: /* smooth scrolling */
3255 if (state) 4080 if (state)
3256 Options &= ~Opt_jumpScroll; 4081 options &= ~Opt_jumpScroll;
3257 else 4082 else
3258 Options |= Opt_jumpScroll; 4083 options |= Opt_jumpScroll;
3259 break; 4084 break;
3260 case 5: /* reverse video */ 4085 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 4086 scr_rvideo_mode (state);
3262 break; 4087 break;
3263 case 6: /* relative/absolute origins */ 4088 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 4089 scr_relative_origin (state);
3265 break; 4090 break;
3266 case 7: /* autowrap */ 4091 case 7: /* autowrap */
3267 scr_autowrap (state); 4092 scr_autowrap (state);
3268 break; 4093 break;
3269 /* 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 */
3270 case 9: /* X10 mouse reporting */ 4095 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 4096 if (state) /* orthogonal */
3272 PrivateModes &= ~ (PrivMode_MouseX11); 4097 priv_modes &= ~PrivMode_MouseX11;
3273 break; 4098 break;
3274#ifdef menuBar_esc 4099#ifdef menuBar_esc
3275 case menuBar_esc: 4100 case menuBar_esc:
3276#ifdef MENUBAR 4101#ifdef MENUBAR
3277 map_menuBar (state); 4102 map_menuBar (state);
3278#endif 4103#endif
3279 break; 4104 break;
3280#endif 4105#endif
3281#ifdef scrollBar_esc 4106#ifdef scrollBar_esc
3282 case scrollBar_esc: 4107 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 4108 if (scrollbar_mapping (state))
3284 { 4109 {
3285 resize_all_windows (0, 0, 0); 4110 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 4111 scr_touch (true);
3287 } 4112 }
3288 break; 4113 break;
3289#endif 4114#endif
3290 case 25: /* visible/invisible cursor */ 4115 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 4116 scr_cursor_visible (state);
3292 break; 4117 break;
3293 /* case 35: - shift keys */ 4118 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 4119 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 4120 case 47: /* secondary screen */
3296 scr_change_screen (state); 4121 scr_change_screen (state);
3297 break; 4122 break;
3298 /* case 66: - application key pad */ 4123 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 4124 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 4125 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 4126 if (state) /* orthogonal */
3302 PrivateModes &= ~ (PrivMode_MouseX10); 4127 priv_modes &= ~PrivMode_MouseX10;
3303 break; 4128 break;
3304#if 0 4129#if 0
3305 case 1001: 4130 case 1001:
3306 break; /* X11 mouse highlighting */ 4131 break; /* X11 mouse highlighting */
3307#endif 4132#endif
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 4133 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state) 4134 if (state)
3310 Options &= ~Opt_scrollTtyOutput; 4135 options &= ~Opt_scrollTtyOutput;
3311 else 4136 else
3312 Options |= Opt_scrollTtyOutput; 4137 options |= Opt_scrollTtyOutput;
3313 break; 4138 break;
3314 case 1011: /* scroll to bottom on key press */ 4139 case 1011: /* scroll to bottom on key press */
3315 if (state) 4140 if (state)
3316 Options |= Opt_scrollTtyKeypress; 4141 options |= Opt_scrollTtyKeypress;
3317 else 4142 else
3318 Options &= ~Opt_scrollTtyKeypress; 4143 options &= ~Opt_scrollTtyKeypress;
3319 break; 4144 break;
3320 case 1047: /* secondary screen w/ clearing */ 4145 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4146 if (options & Opt_secondaryScreen)
3322 if (current_screen != PRIMARY) 4147 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 4148 scr_erase_screen (2);
3324 scr_change_screen (state); 4149 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 4150 break;
4151 case 1049: /* secondary screen w/ clearing first */
4152 scr_change_screen (state);
4153 if (options & Opt_secondaryScreen)
4154 if (current_screen != PRIMARY)
4155 scr_erase_screen (2);
4156 break;
4157 default:
4158 break;
3328 } 4159 }
3329 } 4160 }
3330} 4161}
3331/*}}} */ 4162/*}}} */
3332 4163
3333/*{{{ process sgr sequences */ 4164/*{{{ process sgr sequences */
3334void 4165void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4166rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 4167{
3337 unsigned int i; 4168 unsigned int i;
3338 short rendset; 4169 short rendset;
3339 int rendstyle; 4170 int rendstyle;
3340 4171
3341 if (nargs == 0) 4172 if (nargs == 0)
3342 { 4173 {
3343 scr_rendition (0, ~RS_None); 4174 scr_rendition (0, ~RS_None);
3344 return; 4175 return;
3345 } 4176 }
4177
3346 for (i = 0; i < nargs; i++) 4178 for (i = 0; i < nargs; i++)
3347 { 4179 {
3348 rendset = -1; 4180 rendset = -1;
3349 switch (arg[i]) 4181 switch (arg[i])
3350 { 4182 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 4184 rendset = 0, rendstyle = ~RS_None;
3353 break; 4185 break;
3354 case 1: 4186 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 4187 rendset = 1, rendstyle = RS_Bold;
3356 break; 4188 break;
4189 //case 2: // low intensity
4190 case 3:
4191 rendset = 1, rendstyle = RS_Italic;
4192 break;
3357 case 4: 4193 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 4194 rendset = 1, rendstyle = RS_Uline;
3359 break; 4195 break;
3360 case 5: 4196 case 5: // slowly blinking
4197 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 4198 rendset = 1, rendstyle = RS_Blink;
3362 break; 4199 break;
4200 //case 6: // scoansi light background
3363 case 7: 4201 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 4202 rendset = 1, rendstyle = RS_RVid;
3365 break; 4203 break;
3366 case 22: 4204 case 8:
4205 // invisible. NYI
4206 break;
4207 //case 9: // crossed out
4208 //case 10: // scoansi acs off, primary font
4209 //case 11: // scoansi acs on, first alt font
4210 //case 12: // scoansi acs on, |0x80, second alt font
4211 //...
4212 //case 19: // ninth alt font
4213 //case 20: // gothic
4214 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3367 rendset = 0, rendstyle = RS_Bold; 4215 rendset = 0, rendstyle = RS_Bold;
4216 break;
4217 case 22: // normal intensity
4218 rendset = 0, rendstyle = RS_Bold;
4219 break;
4220 case 23: // disable italic
4221 rendset = 0, rendstyle = RS_Italic;
3368 break; 4222 break;
3369 case 24: 4223 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 4224 rendset = 0, rendstyle = RS_Uline;
3371 break; 4225 break;
3372 case 25: 4226 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 4227 rendset = 0, rendstyle = RS_Blink;
3374 break; 4228 break;
4229 case 26: // variable spacing (iso 8613)
4230 rendset = 0, rendstyle = RS_Blink;
4231 break;
3375 case 27: 4232 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 4233 rendset = 0, rendstyle = RS_RVid;
3377 break; 4234 break;
4235 //case 28: // visible. NYI
4236 //case 29: // not crossed-out
3378 } 4237 }
4238
3379 if (rendset != -1) 4239 if (rendset != -1)
3380 { 4240 {
3381 scr_rendition (rendset, rendstyle); 4241 scr_rendition (rendset, rendstyle);
3382 continue; /* for (;i;) */ 4242 continue; /* for (;i;) */
3383 } 4243 }
… …
3390 case 33: 4250 case 33:
3391 case 34: 4251 case 34:
3392 case 35: 4252 case 35:
3393 case 36: 4253 case 36:
3394 case 37: 4254 case 37:
3395 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4255 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 4256 break;
3398#ifdef TTY_256COLOR 4257 case 38: // set fg color, ISO 8613-6
3399 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 4258 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 4259 {
3402 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4260 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 4261 i += 2;
3405 } 4262 }
3406 break; 4263 break;
3407#endif
3408 case 39: /* default fg */ 4264 case 39: /* default fg */
3409 scr_color (Color_fg, Color_fg); 4265 scr_color (Color_fg, Color_fg);
3410 break; 4266 break;
3411 4267
3412 case 40: 4268 case 40:
… …
3415 case 43: 4271 case 43:
3416 case 44: 4272 case 44:
3417 case 45: 4273 case 45:
3418 case 46: 4274 case 46:
3419 case 47: 4275 case 47:
3420 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4276 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 4277 break;
3423#ifdef TTY_256COLOR 4278 case 48: // set bg color, ISO 8613-6
3424 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 4279 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 4280 {
3427 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4281 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 4282 i += 2;
3430 } 4283 }
3431 break; 4284 break;
3432#endif
3433 case 49: /* default bg */ 4285 case 49: /* default bg */
3434 scr_color (Color_bg, Color_bg); 4286 scr_color (Color_bg, Color_bg);
3435 break; 4287 break;
4288
4289 //case 50: // not variable spacing
3436 4290
3437#ifndef NO_BRIGHTCOLOR 4291#ifndef NO_BRIGHTCOLOR
3438 case 90: 4292 case 90:
3439 case 91: /* set bright fg color */ 4293 case 91: /* set bright fg color */
3440 case 92: 4294 case 92:
3441 case 93: 4295 case 93:
3442 case 94: 4296 case 94:
3443 case 95: 4297 case 95:
3444 case 96: 4298 case 96:
3445 case 97: 4299 case 97:
3446 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4300 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3447 Color_fg);
3448 break; 4301 break;
3449 case 100: 4302 case 100:
3450 case 101: /* set bright bg color */ 4303 case 101: /* set bright bg color */
3451 case 102: 4304 case 102:
3452 case 103: 4305 case 103:
3453 case 104: 4306 case 104:
3454 case 105: 4307 case 105:
3455 case 106: 4308 case 106:
3456 case 107: 4309 case 107:
3457 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4310 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3458 Color_bg);
3459 break; 4311 break;
3460#endif 4312#endif
3461 4313
3462 } 4314 }
3463 } 4315 }
3464} 4316}
3465/*}}} */ 4317/*}}} */
3466 4318
3467/*{{{ process Rob Nation's own graphics mode sequences */ 4319/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 4320void
3469rxvt_term::process_graphics () 4321rxvt_term::process_graphics ()
3470{ 4322{
3471 unsigned char ch, cmd = cmd_getc (); 4323 unicode_t ch, cmd = cmd_getc ();
3472 4324
3473 if (cmd == 'Q') 4325 if (cmd == 'Q')
3474 { /* query graphics */ 4326 { /* query graphics */
3475 tt_printf ("\033G0\n"); /* no graphics */ 4327 tt_printf ("\033G0\012"); /* no graphics */
3476 return; 4328 return;
3477 } 4329 }
3478 /* swallow other graphics sequences until terminating ':' */ 4330 /* swallow other graphics sequences until terminating ':' */
3479 do 4331 do
3480 ch = cmd_getc (); 4332 ch = cmd_getc ();
… …
3495 unsigned char buf[256]; 4347 unsigned char buf[256];
3496 4348
3497 va_start (arg_ptr, fmt); 4349 va_start (arg_ptr, fmt);
3498 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4350 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3499 va_end (arg_ptr); 4351 va_end (arg_ptr);
3500 tt_write (buf, STRLEN (buf)); 4352 tt_write (buf, strlen (buf));
3501} 4353}
3502 4354
3503/* ---------------------------------------------------------------------- */ 4355/* ---------------------------------------------------------------------- */
3504/* Write data to the pty as typed by the user, pasted with the mouse, 4356/* Write data to the pty as typed by the user, pasted with the mouse,
3505 * or generated by us in response to a query ESC sequence. 4357 * or generated by us in response to a query ESC sequence.
3506 */ 4358 */
4359const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4360
3507void 4361void
3508rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4362rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509{ 4363{
3510 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4364 if (v_buflen == 0)
4365 {
4366 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3511 4367
3512 if (len) 4368 if ((unsigned int)written == len)
4369 return;
4370
4371 data += written;
4372 len -= written;
3513 { 4373 }
4374
4375 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4376
4377 memcpy (v_buffer + v_buflen, data, len);
4378 v_buflen += len;
4379
4380 pty_ev.set (EVENT_READ | EVENT_WRITE);
4381}
4382
4383void rxvt_term::pty_write ()
4384{
4385 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4386
4387 if (written > 0)
4388 {
4389 v_buflen -= written;
4390
3514 if (v_buflen == 0) 4391 if (v_buflen == 0)
3515 { 4392 {
3516 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3517
3518 if ((unsigned int)written == len)
3519 return;
3520
3521 data += written;
3522 len -= written;
3523 }
3524
3525
3526 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3527
3528 memcpy (v_buffer + v_buflen, data, len);
3529 v_buflen += len;
3530 }
3531
3532 for (;;)
3533 {
3534 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3535
3536 if (written > 0)
3537 {
3538 v_buflen -= written;
3539
3540 if (v_buflen == 0)
3541 {
3542 free (v_buffer); 4393 free (v_buffer);
3543 v_buffer = 0; 4394 v_buffer = 0;
3544 v_buflen = 0; 4395 v_buflen = 0;
3545 4396
3546 pty_ev.set (EVENT_READ); 4397 pty_ev.set (EVENT_READ);
3547 return;
3548 }
3549
3550 memmove (v_buffer, v_buffer + written, v_buflen);
3551 }
3552 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3553 // original code just ignores this...
3554 destroy ();
3555 else
3556 {
3557 pty_ev.set (EVENT_READ | EVENT_WRITE);
3558 return; 4398 return;
3559 } 4399 }
4400
4401 memmove (v_buffer, v_buffer + written, v_buflen);
3560 } 4402 }
4403 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4404 pty_ev.set (EVENT_READ);
3561} 4405}
3562 4406
3563/*----------------------- end-of-file (C source) -----------------------*/ 4407/*----------------------- end-of-file (C source) -----------------------*/
3564 4408

Diff Legend

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