ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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