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

Diff Legend

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