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

Diff Legend

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