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

Diff Legend

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