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

Diff Legend

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