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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.219 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

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