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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.250 by root, Sun Jan 8 06:35:23 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_STR_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 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (++row < end_row);
1011 }
1012
726 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
727 scrollbar_show (1); 1014 scrollbar_show (1);
728#ifdef USE_XIM 1015#ifdef USE_XIM
729 IMSendSpot (); 1016 IMSendSpot ();
730#endif 1017#endif
731
732 } 1018 }
733 1019
734 display->flush (); 1020 display->flush ();
735} 1021}
736 1022
… …
738rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
739{ 1025{
740 SET_R (this); 1026 SET_R (this);
741 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
742 1028
1029 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033}
1034
1035void
1036rxvt_term::flush_cb (time_watcher &w)
1037{
1038 SET_R (this);
1039 SET_LOCALE (locale);
1040
1041 refresh_limit = 1;
1042 refresh_count = 0;
743 flush (); 1043 flush ();
744} 1044}
745 1045
746#ifdef CURSOR_BLINK 1046#ifdef CURSOR_BLINK
747void 1047void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 1065 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 1066 }
767} 1067}
768#endif 1068#endif
769 1069
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void
1072rxvt_term::cont_scroll_cb (time_watcher &w)
1073{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 }
1081}
1082#endif
1083
1084#ifdef SELECTION_SCROLLING
1085void
1086rxvt_term::sel_scroll_cb (time_watcher &w)
1087{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 }
1095}
1096#endif
1097
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void
1100rxvt_term::slip_wheel_cb (time_watcher &w)
1101{
1102 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 }
1114}
1115#endif
1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
770bool 1135bool
771rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
772{ 1137{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1139
1140 if (CBUFSIZ == n)
1141 {
1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1143 n = 0;
1144 }
774 1145
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
778 1149
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
780 1151
781 if (n > 0) 1152 if (r > 0)
782 { 1153 {
783 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
784 return true; 1155 return true;
785 } 1156 }
786 else if (n < 0 && errno != EAGAIN) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1165 {
1166 pty_ev.stop ();
1167
1168 if (!OPTION (Opt_hold))
787 destroy (); 1169 destroy ();
788 1170 }
1171
789 return false; 1172 return false;
790} 1173}
791 1174
792void 1175void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1176rxvt_term::pty_cb (io_watcher &w, short revents)
794{ 1177{
795 SET_R (this); 1178 SET_R (this);
796 SET_LOCALE (locale); 1179 SET_LOCALE (locale);
797 1180
1181 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ())
1184 if (cmd_parse ())
1185 break;
1186
798 if (revents & EVENT_WRITE) 1187 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1188 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} 1189}
916 1190
917// read the next character, currently handles UTF-8 1191void
918// will probably handle all sorts of other stuff in the future 1192rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1193{
922 while (cmdbuf_ptr < cmdbuf_endp) 1194 XDefineCursor (display->display, vt, TermWin_cursor);
923 { 1195 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1196
927 wchar_t wc; 1197#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1198 hidden_pointer = 0;
929 1199
930 if (len == (size_t)-2) 1200 if (OPTION (Opt_pointerBlank))
931 return NOCHAR; 1201 pointer_ev.start (NOW + pointerBlankDelay);
932 1202#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} 1203}
965 1204
966#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
967void 1206void
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 () 1207rxvt_term::pointer_blank ()
981{ 1208{
982 if (! (Options & Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
983 return; 1210 return;
984 1211
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
986 XFlush (display->display); 1213 XFlush (display->display);
987 1214
988 hidden_pointer = 1; 1215 hidden_pointer = 1;
989} 1216}
990 1217
… …
997 pointer_blank (); 1224 pointer_blank ();
998} 1225}
999#endif 1226#endif
1000 1227
1001void 1228void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1229rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1230{
1004 int button_number, key_state = 0; 1231 int button_number, key_state = 0;
1005 int x, y; 1232 int x, y;
1006 1233
1007 x = ev.x; 1234 x = ev.x;
1008 y = ev.y; 1235 y = ev.y;
1009 pixel_position (&x, &y); 1236 pixel_position (&x, &y);
1010 1237
1011 if (MEvent.button == AnyButton) 1238 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1239 button_number = 3;
1014 }
1015 else 1240 else
1016 { 1241 {
1017 button_number = MEvent.button - Button1; 1242 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1243 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1244 if (button_number >= 3)
1020 button_number += (64 - 3); 1245 button_number += (64 - 3);
1021 } 1246 }
1022 1247
1023 if (PrivateModes & PrivMode_MouseX10) 1248 if (priv_modes & PrivMode_MouseX10)
1024 { 1249 {
1025 /* 1250 /*
1026 * do not report ButtonRelease 1251 * do not report ButtonRelease
1027 * no state info allowed 1252 * no state info allowed
1028 */ 1253 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1268 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1269 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1270#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1271 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1272#endif
1048
1049 } 1273 }
1050 1274
1051#ifdef DEBUG_MOUSEREPORT 1275#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1276 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1277 if (key_state & 16)
1054 fputc ('C', stderr); 1278 fputc ('C', stderr);
1055 if (key_state & 4) 1279 if (key_state & 4)
1056 fputc ('S', stderr); 1280 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1284 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1285 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1286 button_number,
1063 x + 1, 1287 x + 1,
1064 y + 1); 1288 y + 1);
1065#else 1289#endif
1290
1066 tt_printf ("\033[M%c%c%c", 1291 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1292 (32 + button_number + key_state),
1068 (32 + x + 1), 1293 (32 + x + 1),
1069 (32 + y + 1)); 1294 (32 + y + 1));
1070#endif
1071} 1295}
1072 1296
1073#ifdef USING_W11LIB 1297#ifdef USING_W11LIB
1074void 1298void
1075rxvt_W11_process_x_event (XEvent *ev) 1299rxvt_W11_process_x_event (XEvent *ev)
… …
1082 1306
1083/*{{{ process an X event */ 1307/*{{{ process an X event */
1084void 1308void
1085rxvt_term::x_cb (XEvent &ev) 1309rxvt_term::x_cb (XEvent &ev)
1086{ 1310{
1311 dDisp;
1312
1087 SET_R (this); 1313 SET_R (this);
1088 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1089 1315
1090#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1092 {
1093 if (hidden_cursor)
1094 {
1095 hidden_cursor = 0;
1096 want_refresh = 1;
1097 }
1098
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 }
1101#endif
1102
1103#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 {
1106 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease)
1109 if (hidden_pointer)
1110 pointer_unblank ();
1111
1112 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank ();
1114 }
1115#endif
1116
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1122 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1318 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 1319
1175 switch (ev.type) 1320 switch (ev.type)
1176 { 1321 {
1177 case KeyPress: 1322 case KeyPress:
1323#if ISO_14755
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1178 lookup_key (ev.xkey); 1326 lookup_key (ev.xkey);
1327
1328 break;
1329
1330 case KeyRelease:
1331 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1333 KeySym ks;
1334
1335 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((ks >= 0x40 && ks <= 0x5f)
1351 || (ks >= 0x61 && ks <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == ks)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1179 break; 1394 break;
1180 1395
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease:
1183 {
1184 if (! (ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (ks == XK_Control_L || ks == XK_Control_R)
1185 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1186 else 1401#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; 1402 break;
1195 } 1403 }
1196#endif
1197 1404
1198 case ButtonPress: 1405 case ButtonPress:
1199 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1200 break; 1407 break;
1201 1408
… …
1203 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1204 break; 1411 break;
1205 1412
1206 case ClientMessage: 1413 case ClientMessage:
1207 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1209 destroy (); 1418 destroy ();
1419#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev);
1424#endif
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1210#ifdef OFFIX_DND 1435#ifdef OFFIX_DND
1211 /* OffiX Dnd (drag 'n' drop) protocol */ 1436 /* OffiX Dnd (drag 'n' drop) protocol */
1212 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1213 && (ev.xclient.data.l[0] == DndFile 1438 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1439 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1440 || ev.xclient.data.l[0] == DndLink))
1216 { 1441 {
1217 /* Get Dnd data */ 1442 /* Get Dnd data */
1218 Atom ActualType; 1443 Atom ActualType;
1219 int ActualFormat; 1444 int ActualFormat;
1220 unsigned char *data; 1445 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1446 unsigned long Size, RemainingBytes;
1222 1447
1223 XGetWindowProperty (display->display, display->root, 1448 XGetWindowProperty (disp, display->root,
1224 xa[XA_DNDSELECTION], 1449 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1450 0L, 1000000L,
1226 False, AnyPropertyType, 1451 False, AnyPropertyType,
1227 &ActualType, &ActualFormat, 1452 &ActualType, &ActualFormat,
1228 &Size, &RemainingBytes, 1453 &Size, &RemainingBytes,
1229 &data); 1454 &data);
1230 XChangeProperty (display->display, display->root, 1455 set_string_property (XA_CUT_BUFFER0, data);
1231 XA_CUT_BUFFER0, XA_STRING, 1456 XFree (data);
1232 8, PropModeReplace,
1233 data, STRLEN (data));
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1236 } 1459 }
1237#endif /* OFFIX_DND */ 1460#endif /* OFFIX_DND */
1238 break; 1461 break;
1239 1462
1240 case MappingNotify: 1463 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1464 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1465 break;
1243 1466
1244 /* 1467 /*
1245 * XXX: this is not the _current_ arrangement 1468 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1469 * Here's my conclusion:
… …
1265 break; 1488 break;
1266 } 1489 }
1267 break; 1490 break;
1268 1491
1269 case FocusIn: 1492 case FocusIn:
1270 if (!TermWin.focus) 1493 focus_in ();
1494 break;
1495
1496 case FocusOut:
1497 focus_out ();
1498 break;
1499
1500 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0])
1271 { 1502 {
1272 TermWin.focus = 1; 1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1273 want_refresh = 1; 1504 ;
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 1505
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 {
1508 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 }
1511
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent))
1514 check_our_parents ();
1515#endif
1283 } 1516 }
1284 break; 1517 break;
1285 1518
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: 1519 case PropertyNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1306 { 1521 && ev.xproperty.state == PropertyNewValue)
1307 int height, width; 1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1308 1523
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; 1524 break;
1339 1525
1340 case SelectionClear: 1526 case SelectionClear:
1341 display->set_selection_owner (0); 1527 selection_clear ();
1342 break; 1528 break;
1343 1529
1344 case SelectionNotify: 1530 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1531 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1533 break;
1349 1534
1350 case SelectionRequest: 1535 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1352 break; 1537 break;
1353 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1354 case UnmapNotify: 1547 case UnmapNotify:
1355 TermWin.mapped = 0; 1548 mapped = 0;
1356#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1357 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1358#endif 1551#endif
1359 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1360
1361 case MapNotify:
1362 TermWin.mapped = 1;
1363#ifdef TEXT_BLINK
1364 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1365#endif
1366 break; 1553 break;
1367 1554
1368#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1369 case ReparentNotify: 1556 case ReparentNotify:
1370 rootwin_cb (ev); 1557 rootwin_cb (ev);
1371 break; 1558 break;
1372#endif /* TRANSPARENT */ 1559#endif /* TRANSPARENT */
1373 1560
1374 case GraphicsExpose: 1561 case GraphicsExpose:
1375 case Expose: 1562 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1563 if (ev.xany.window == vt)
1377 { 1564 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1565 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1569
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1575
1386 // ev.xexpose.width, TermWin.height, False); 1576 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1577 }
1390 else 1578 else
1391 { 1579 {
1392 XEvent unused_event; 1580 XEvent unused_event;
1393 1581
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1395 Expose, 1583 ;
1396 &unused_event)) ; 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1585 ;
1398 GraphicsExpose, 1586
1399 &unused_event)) ;
1400 if (isScrollbarWindow (ev.xany.window)) 1587 if (isScrollbarWindow (ev.xany.window))
1401 { 1588 {
1402 scrollBar.setIdle (); 1589 scrollBar.setIdle ();
1403 scrollbar_show (0); 1590 scrollbar_show (0);
1404 } 1591 }
1405#ifdef MENUBAR 1592#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1594 menubar_expose ();
1408#endif 1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1409 } 1601 }
1410 break; 1602 break;
1411 1603
1412 case MotionNotify: 1604 case MotionNotify:
1413#ifdef POINTER_BLANK 1605#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1607 pointer_unblank ();
1416#endif 1608#endif
1417#if MENUBAR 1609#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1610 if (isMenuBarWindow (ev.xany.window))
1419 { 1611 {
1420 menubar_control (& (ev.xbutton)); 1612 menubar_control (ev.xbutton);
1421 break; 1613 break;
1422 } 1614 }
1423#endif 1615#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1617 break;
1426 1618
1427 if (ev.xany.window == TermWin.vt) 1619 if (ev.xany.window == vt)
1428 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1624 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1432 ; 1626 ;
1433 1627
1434 XQueryPointer (display->display, TermWin.vt, 1628 XQueryPointer (disp, vt,
1435 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1631 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1632 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1634 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1635 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1636 {
1443#endif 1637#endif
1638#if ISO_14755
1639 // 5.4
1640 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1641 {
1642 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1643 break;
1644 }
1645#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1646 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1647 ev.xbutton.state & Button3Mask ? 2 : 0);
1648
1446#ifdef SELECTION_SCROLLING 1649#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1650 if (ev.xbutton.y < int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1651 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1449 { 1652 {
1450 int dist; 1653 int dist;
1451
1452 pending_scroll_selection=1;
1453 1654
1454 /* don't clobber the current delay if we are 1655 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1656 * already in the middle of scrolling.
1456 */ 1657 */
1457 if (scroll_selection_delay<=0) 1658 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1659 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1660
1460 /* save the event params so we can highlight 1661 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1662 * the selection in the pending-scroll loop
1462 */ 1663 */
1463 selection_save_x=ev.xbutton.x; 1664 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1665 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1666 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1667
1468 /* calc number of lines to scroll */ 1668 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1669 if (ev.xbutton.y < int_bwidth)
1470 { 1670 {
1471 scroll_selection_dir = UP; 1671 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1672 dist = int_bwidth - ev.xbutton.y;
1473 } 1673 }
1474 else 1674 else
1475 { 1675 {
1476 scroll_selection_dir = DN; 1676 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y - 1677 dist = ev.xbutton.y - (int_bwidth + height);
1478 (TermWin.int_bwidth + TermWin.height);
1479 } 1678 }
1679
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1680 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1681 / SELECTION_SCROLL_LINE_SPEEDUP
1682 + 1;
1482 MIN_IT (scroll_selection_lines, 1683 min_it (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1684 SELECTION_SCROLL_MAX_LINES);
1484 } 1685 }
1485 else 1686 else
1486 { 1687 {
1487 /* we are within the text window, so we 1688 /* we are within the text window, so we
1488 * shouldn't be scrolling 1689 * shouldn't be scrolling
1489 */ 1690 */
1490 pending_scroll_selection = 0; 1691 if (sel_scroll_ev.active)
1692 sel_scroll_ev.stop();
1491 } 1693 }
1492#endif 1694#endif
1493#ifdef MOUSE_THRESHOLD 1695#ifdef MOUSE_THRESHOLD
1494
1495 } 1696 }
1496#endif 1697#endif
1497
1498 } 1698 }
1499 } 1699 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1701 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1702 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1503 MotionNotify, &ev)) ; 1703 MotionNotify, &ev))
1704 ;
1705
1504 XQueryPointer (display->display, scrollBar.win, 1706 XQueryPointer (disp, scrollBar.win,
1505 &unused_root, &unused_child, 1707 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1709 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1710 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1712 scrollbar_size ());
1511 scr_refresh (refresh_type); 1713 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1714 refresh_limit = 0;
1513 scrollbar_show (1); 1715 scrollbar_show (1);
1514 } 1716 }
1515 break; 1717 break;
1516 } 1718 }
1517}
1518 1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1748}
1749
1750void
1751rxvt_term::focus_in ()
1752{
1753 if (!focus)
1754 {
1755 focus = 1;
1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1760#if USE_XIM
1761 if (Input_Context != NULL)
1762 {
1763 IMSetStatusPosition ();
1764 XSetICFocus (Input_Context);
1765 }
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1770#endif
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 pix_colors = pix_colors_focused;
1775 scr_recolour ();
1776 }
1777#endif
1778 }
1779}
1780
1781void
1782rxvt_term::focus_out ()
1783{
1784 if (focus)
1785 {
1786 focus = 0;
1787 want_refresh = 1;
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1794 iso14755buf = 0;
1795# if ENABLE_OVERLAY
1796 scr_overlay_off ();
1797# endif
1798 }
1799#endif
1800#if USE_XIM
1801 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context);
1803#endif
1804#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink))
1806 cursor_blink_ev.stop ();
1807 hidden_cursor = 0;
1808#endif
1809#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade])
1811 {
1812 pix_colors = pix_colors_unfocused;
1813 scr_recolour ();
1814 }
1815#endif
1816 }
1817}
1818
1819#if TRANSPARENT
1519void 1820void
1520rxvt_term::rootwin_cb (XEvent &ev) 1821rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1822{
1522 SET_R (this); 1823 SET_R (this);
1523 SET_LOCALE (locale); 1824 SET_LOCALE (locale);
1524 1825
1525 switch (ev.type) 1826 switch (ev.type)
1526 { 1827 {
1527 case PropertyNotify: 1828 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 /* 1829 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1830 * 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. 1831 * use the property to determine the pixmap. We use it later on.
1540 */ 1832 */
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]) 1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1545 return; 1835 return;
1546 }
1547 1836
1548 /* FALLTHROUGH */ 1837 /* FALLTHROUGH */
1549 case ReparentNotify: 1838 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1840 want_refresh = want_full_refresh = 1;
1553 break; 1841 break;
1554#endif
1555 } 1842 }
1556} 1843}
1844#endif
1557 1845
1558void 1846void
1559rxvt_term::button_press (const XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1560{ 1848{
1561 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1562 1850
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1564 if (!bypass_keystate) 1853 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1855
1566 /* 1856 /*
1567 * VT window processing of button press 1857 * VT window processing of button press
1568 */ 1858 */
1569 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1570 { 1860 {
1861#if ISO_14755
1862 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 {
1865 iso14755_54 (ev.x, ev.y);
1866 return;
1867 }
1868#endif
1869
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1870 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1871
1572 if (reportmode) 1872 if (reportmode)
1573 { 1873 {
1574 /* mouse report from vt window */ 1874 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1875 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1876 MEvent.state = ev.state;
1577#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1578 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1579 { 1879 {
1580 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1581 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1582 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1583 { 1884 {
1584 /* only report double clicks */ 1885 /* only report double clicks */
1585 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1586 mouse_report (ev); 1887 mouse_report (ev);
… …
1605 } 1906 }
1606 else 1907 else
1607 { 1908 {
1608 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1610 switch (ev.button) 1913 switch (ev.button)
1611 { 1914 {
1612 case Button1: 1915 case Button1:
1916 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */
1918#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask);
1920#else
1921 selection.rect = false;
1922#endif
1923
1613 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1615 { 1926 {
1616 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1618 else 1929 else
1619 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1620 } 1931 }
1621 else 1932 else
1622 { 1933 {
1623 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1624 MEvent.clicks++; 1935 MEvent.clicks++;
1625 else 1936 else
1626 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1627 1938
1628 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1629 } 1940 }
1630 1941
1631 MEvent.button = Button1; 1942 MEvent.button = Button1;
1632 break; 1943 break;
1633 1944
1634 case Button3: 1945 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1637 else 1948 else
1638 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1950
1639 MEvent.button = Button3; 1951 MEvent.button = Button3;
1640 break; 1952 break;
1641 } 1953 }
1642 } 1954 }
1955
1643 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1644 return; 1957 return;
1645 } 1958 }
1646 1959
1647 /* 1960 /*
… …
1713 upordown = 1; /* down */ 2026 upordown = 1; /* down */
1714 } 2027 }
1715 if (upordown) 2028 if (upordown)
1716 { 2029 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 2032#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 2034 {
1722 if (upordown < 0) 2035 if (upordown < 0)
1723 scrollBar.setUp (); 2036 scrollBar.setUp ();
… …
1739 break; 2052 break;
1740 case R_SB_ALIGN_BOTTOM: 2053 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 2054 csrO = scrollBar.bot - scrollBar.top;
1742 break; 2055 break;
1743 } 2056 }
2057
1744 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 2062
1749 scrollBar.setMotion (); 2063 scrollBar.setMotion ();
1750 break; 2064 break;
1751 2065
1752 case Button1: 2066 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1757 case Button3: 2071 case Button3:
1758 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
1759 { 2073 {
1760 if (scrollbar_above_slider (ev.y)) 2074 if (scrollbar_above_slider (ev.y))
1761# ifdef RXVT_SCROLL_FULL 2075# ifdef RXVT_SCROLL_FULL
1762 scr_page (UP, TermWin.nrow - 1); 2076 scr_page (UP, nrow - 1);
1763# else 2077# else
1764 scr_page (UP, TermWin.nrow / 4); 2078 scr_page (UP, nrow / 4);
1765# endif 2079# endif
1766 else if (scrollbar_below_slider (ev.y)) 2080 else if (scrollbar_below_slider (ev.y))
1767# ifdef RXVT_SCROLL_FULL 2081# ifdef RXVT_SCROLL_FULL
1768 scr_page (DN, TermWin.nrow - 1); 2082 scr_page (DN, nrow - 1);
1769# else 2083# else
1770 scr_page (DN, TermWin.nrow / 4); 2084 scr_page (DN, nrow / 4);
1771# endif 2085# endif
1772 else 2086 else
1773 scrollBar.setMotion (); 2087 scrollBar.setMotion ();
1774 } 2088 }
1775 else 2089 else
1776 { 2090 {
1777 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 2092 (nrow
1779 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 2094 / scrollbar_size ()));
1781 } 2095 }
2096
1782 break; 2097 break;
1783 } 2098 }
1784 } 2099 }
2100
1785 return; 2101 return;
1786 } 2102 }
2103
1787#if MENUBAR 2104#if MENUBAR
1788 /* 2105 /*
1789 * Menubar window processing of button press 2106 * Menubar window processing of button press
1790 */ 2107 */
1791 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
1792 menubar_control (ev); 2109 menubar_control (ev);
1793#endif 2110#endif
1794} 2111}
1795 2112
1796void 2113void
1797rxvt_term::button_release (const XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1798{ 2115{
1799 int reportmode = 0; 2116 int reportmode = 0;
1800 2117
1801 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 2119 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 2121
1805 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1806 { 2123 {
1807 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1808 scrollbar_show (0); 2125 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 2127 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 2128#endif
1812
1813 } 2129 }
2130
1814#ifdef SELECTION_SCROLLING 2131#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop();
1816#endif 2134#endif
2135
1817 if (ev.window == TermWin.vt) 2136 if (ev.window == vt)
1818 { 2137 {
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
1819 if (reportmode) 2143 if (reportmode)
1820 { 2144 {
1821 /* mouse report from vt window */ 2145 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 2146 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 2147 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 2161 MEvent.button = AnyButton;
1838 mouse_report (ev); 2162 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 2163#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2164 return;
1841 } 2165 }
2166
1842 /* 2167 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2168 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2169 * when overriding mouse reporting
1845 */ 2170 */
1846 if (PrivateModes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2172 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
1850 2178
1851 switch (ev.button) 2179 switch (ev.button)
1852 { 2180 {
1853 case Button1: 2181 case Button1:
1854 case Button3: 2182 case Button3:
… …
1862 case Button5: 2190 case Button5:
1863 { 2191 {
1864 int i; 2192 int i;
1865 page_dirn v; 2193 page_dirn v;
1866 2194
1867 v = (ev.button == Button4) ? UP : DN; 2195 v = ev.button == Button4 ? UP : DN;
2196
1868 if (ev.state & ShiftMask) 2197 if (ev.state & ShiftMask)
1869 i = 1; 2198 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2199 else if (OPTION (Opt_mouseWheelScrollPage))
1871 i = TermWin.nrow - 1; 2200 i = nrow - 1;
1872 else 2201 else
1873 i = 5; 2202 i = 5;
2203
1874# ifdef MOUSE_SLIP_WHEELING 2204# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2205 if (ev.state & ControlMask)
1876 { 2206 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2207 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210
2211 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2213
2214 slip_wheel_ev.start ();
1879 } 2215 }
2216 else
2217 {
1880# endif 2218# endif
1881# ifdef JUMP_MOUSE_WHEEL 2219# 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); 2220 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 2221 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 2222 scrollbar_show (1);
2223# else
2224 while (i--)
2225 {
2226 scr_page (v, 1);
2227 scr_refresh (SMOOTH_REFRESH);
2228 scrollbar_show (1);
2229 }
2230# endif
2231# ifdef MOUSE_SLIP_WHEELING
1891 } 2232 }
1892# endif 2233#endif
1893
1894 } 2234 }
1895 break; 2235 break;
1896#endif 2236#endif
1897
1898 } 2237 }
1899 } 2238 }
1900#ifdef MENUBAR 2239#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2240 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2241 menubar_control (ev);
1903#endif 2242#endif
1904} 2243}
1905 2244
1906
1907#ifdef TRANSPARENT 2245#ifdef TRANSPARENT
2246#if TINTING
2247/* taken from aterm-0.4.2 */
2248
2249typedef uint32_t RUINT32T;
2250
2251void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2252{
2253 int sh_r, sh_g, sh_b;
2254 RUINT32T mask_r, mask_g, mask_b;
2255 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2256 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2257 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2258 int i;
2259
2260 Visual *visual = display->visual;
2261
2262 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2263
2264 /* for convenience */
2265 mask_r = visual->red_mask;
2266 mask_g = visual->green_mask;
2267 mask_b = visual->blue_mask;
2268
2269 /* boring lookup table pre-initialization */
2270 switch (srcImage->bits_per_pixel) {
2271 case 15:
2272 if ((mask_r != 0x7c00) ||
2273 (mask_g != 0x03e0) ||
2274 (mask_b != 0x001f))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2277 lookup_r = lookup;
2278 lookup_g = lookup+32;
2279 lookup_b = lookup+32+32;
2280 sh_r = 10;
2281 sh_g = 5;
2282 sh_b = 0;
2283 break;
2284 case 16:
2285 if ((mask_r != 0xf800) ||
2286 (mask_g != 0x07e0) ||
2287 (mask_b != 0x001f))
2288 return;
2289 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2290 lookup_r = lookup;
2291 lookup_g = lookup+32;
2292 lookup_b = lookup+32+64;
2293 sh_r = 11;
2294 sh_g = 5;
2295 sh_b = 0;
2296 break;
2297 case 24:
2298 if ((mask_r != 0xff0000) ||
2299 (mask_g != 0x00ff00) ||
2300 (mask_b != 0x0000ff))
2301 return;
2302 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2303 lookup_r = lookup;
2304 lookup_g = lookup+256;
2305 lookup_b = lookup+256+256;
2306 sh_r = 16;
2307 sh_g = 8;
2308 sh_b = 0;
2309 break;
2310 case 32:
2311 if ((mask_r != 0xff0000) ||
2312 (mask_g != 0x00ff00) ||
2313 (mask_b != 0x0000ff))
2314 return;
2315 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2316 lookup_r = lookup;
2317 lookup_g = lookup+256;
2318 lookup_b = lookup+256+256;
2319 sh_r = 16;
2320 sh_g = 8;
2321 sh_b = 0;
2322 break;
2323 default:
2324 return; /* we do not support this color depth */
2325 }
2326
2327 /* prepare limits for color transformation (each channel is handled separately) */
2328 if (shade < 0) {
2329 shade = -shade;
2330 if (shade < 0) shade = 0;
2331 if (shade > 100) shade = 100;
2332
2333 lower_lim_r = 65535-rm;
2334 lower_lim_g = 65535-gm;
2335 lower_lim_b = 65535-bm;
2336
2337 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2338 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2339 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2340
2341 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2342 } else {
2343 if (shade < 0) shade = 0;
2344 if (shade > 100) shade = 100;
2345
2346 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2347
2348 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2349 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2350 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2351 }
2352
2353 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2354 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2355 {
2356 unsigned int tmp;
2357
2358 tmp = lower_lim_r;
2359 lower_lim_r = lower_lim_b;
2360 lower_lim_b = tmp;
2361
2362 tmp = upper_lim_r;
2363 upper_lim_r = upper_lim_b;
2364 upper_lim_b = tmp;
2365 }
2366
2367 /* fill our lookup tables */
2368 for (i = 0; i <= mask_r>>sh_r; i++)
2369 {
2370 RUINT32T tmp;
2371 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2372 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2373 lookup_r[i] = (tmp/65535)<<sh_r;
2374 }
2375 for (i = 0; i <= mask_g>>sh_g; i++)
2376 {
2377 RUINT32T tmp;
2378 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2379 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2380 lookup_g[i] = (tmp/65535)<<sh_g;
2381 }
2382 for (i = 0; i <= mask_b>>sh_b; i++)
2383 {
2384 RUINT32T tmp;
2385 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2386 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2387 lookup_b[i] = (tmp/65535)<<sh_b;
2388 }
2389
2390 /* apply table to input image (replacing colors by newly calculated ones) */
2391 switch (srcImage->bits_per_pixel)
2392 {
2393 case 15:
2394 {
2395 unsigned short *p1, *pf, *p, *pl;
2396 p1 = (unsigned short *) srcImage->data;
2397 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width;
2402 for (; p < pl; p++)
2403 {
2404 *p = lookup_r[(*p & 0x7c00)>>10] |
2405 lookup_g[(*p & 0x03e0)>> 5] |
2406 lookup_b[(*p & 0x001f)];
2407 }
2408 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 16:
2413 {
2414 unsigned short *p1, *pf, *p, *pl;
2415 p1 = (unsigned short *) srcImage->data;
2416 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xf800)>>11] |
2424 lookup_g[(*p & 0x07e0)>> 5] |
2425 lookup_b[(*p & 0x001f)];
2426 }
2427 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 case 24:
2432 {
2433 unsigned char *p1, *pf, *p, *pl;
2434 p1 = (unsigned char *) srcImage->data;
2435 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2436 while (p1 < pf)
2437 {
2438 p = p1;
2439 pl = p1 + srcImage->width * 3;
2440 for (; p < pl; p += 3)
2441 {
2442 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2443 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2444 p[2] = lookup_r[(p[2] & 0x0000ff)];
2445 }
2446 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2447 }
2448 break;
2449 }
2450 case 32:
2451 {
2452 RUINT32T *p1, *pf, *p, *pl;
2453 p1 = (RUINT32T *) srcImage->data;
2454 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2455
2456 while (p1 < pf)
2457 {
2458 p = p1;
2459 pl = p1 + srcImage->width;
2460 for (; p < pl; p++)
2461 {
2462 *p = lookup_r[(*p & 0xff0000)>>16] |
2463 lookup_g[(*p & 0x00ff00)>> 8] |
2464 lookup_b[(*p & 0x0000ff)] |
2465 (*p & ~0xffffff);
2466 }
2467 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2468 }
2469 break;
2470 }
2471 }
2472
2473 free (lookup);
2474}
2475#endif
2476
1908/* 2477/*
1909 * Check our parents are still who we think they are. 2478 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2479 * Do transparency updates if required
1911 */ 2480 */
1912int 2481int
1913rxvt_term::check_our_parents () 2482rxvt_term::check_our_parents ()
1914{ 2483{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2484 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2485 unsigned long nitems, bytes_after;
1917 Atom atype; 2486 Atom atype;
1918 unsigned char *prop = NULL; 2487 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2488 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2489 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2490 XWindowAttributes wattr, wrootattr;
2491 dDisp;
1922 2492
1923 pchanged = 0; 2493 pchanged = 0;
1924 2494
1925 if (! (Options & Opt_transparent)) 2495 if (!OPTION (Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2496 return pchanged; /* Don't try any more */
1927 2497
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2498 XGetWindowAttributes (disp, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2499 rootdepth = wrootattr.depth;
1930 2500
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2501 XGetWindowAttributes (disp, parent[0], &wattr);
2502
1932 if (rootdepth != wattr.depth) 2503 if (rootdepth != wattr.depth)
1933 { 2504 {
1934 if (am_transparent) 2505 if (am_transparent)
1935 { 2506 {
1936 pchanged = 1; 2507 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2508 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2509 am_transparent = am_pixmap_trans = 0;
1940 } 2510 }
2511
1941 return pchanged; /* Don't try any more */ 2512 return pchanged; /* Don't try any more */
1942 } 2513 }
1943 2514
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2515 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2516 XSync (disp, False);
1946 2517
1947 /* 2518 /*
1948 * Make the frame window set by the window manager have 2519 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2520 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2521 * windows for each client, so we have to take care about that.
1951 */ 2522 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2523 i = (xa[XA_XROOTPMAP_ID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2524 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2526 &nitems, &bytes_after, &prop) == Success);
2527
1956 if (!i || prop == NULL) 2528 if (!i || prop == NULL)
2529 i = (xa[XA_ESETROOT_PMAP_ID]
2530 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2531 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2532 &nitems, &bytes_after, &prop) == Success);
2533
2534 if (!i || prop == NULL
2535#if TINTING
2536 || !rs[Rs_color + Color_tint]
2537#endif
2538 )
1957 have_pixmap = 0; 2539 have_pixmap = 0;
1958 else 2540 else
1959 { 2541 {
1960 have_pixmap = 1; 2542 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2543 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2544 XFree (prop);
1963 } 2545 }
2546
1964 if (have_pixmap) 2547 if (have_pixmap)
1965 { 2548 {
1966 /* 2549 /*
1967 * Copy display->root pixmap transparency 2550 * Copy display->root pixmap transparency
1968 */ 2551 */
1969 int sx, sy, nx, ny; 2552 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2553 unsigned int nw, nh;
1971 Window cr; 2554 Window cr;
1972 XImage *image; 2555 XImage *image;
1973 GC gc; 2556 GC gc;
1974 XGCValues gcvalue; 2557 XGCValues gcvalue;
1975 2558
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2559 XTranslateCoordinates (disp, parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2560 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2561 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2562 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2563 nx = ny = 0;
2564
1981 if (sx < 0) 2565 if (sx < 0)
1982 { 2566 {
1983 nw += sx; 2567 nw += sx;
1984 nx = -sx; 2568 nx = -sx;
1985 sx = 0; 2569 sx = 0;
1986 } 2570 }
2571
1987 if (sy < 0) 2572 if (sy < 0)
1988 { 2573 {
1989 nh += sy; 2574 nh += sy;
1990 ny = -sy; 2575 ny = -sy;
1991 sy = 0; 2576 sy = 0;
1992 } 2577 }
2578
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2579 min_it (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2580 min_it (nh, (unsigned int) (wrootattr.height - sy));
2581
2582 XSync (disp, False);
1995 allowedxerror = -1; 2583 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2584 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2585
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2586 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2587 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2588 allowedxerror = 0;
2589
2001 if (image == NULL) 2590 if (image == NULL)
2002 { 2591 {
2003 if (am_transparent && am_pixmap_trans) 2592 if (am_transparent && am_pixmap_trans)
2004 { 2593 {
2005 pchanged = 1; 2594 pchanged = 1;
2006 if (TermWin.pixmap != None) 2595 if (pixmap != None)
2007 { 2596 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2597 XFreePixmap (disp, pixmap);
2009 TermWin.pixmap = None; 2598 pixmap = None;
2010 } 2599 }
2011 } 2600 }
2601
2012 am_pixmap_trans = 0; 2602 am_pixmap_trans = 0;
2013 } 2603 }
2014 else 2604 else
2015 { 2605 {
2016 if (TermWin.pixmap != None) 2606 if (pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2607 XFreePixmap (disp, pixmap);
2608
2609#if TINTING
2610 if (ISSET_PIXCOLOR (Color_tint))
2611 {
2612 unsigned short rm, gm, bm;
2613 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2614
2615 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2616
2617 ShadeXImage (display, image, shade, rm, gm, bm);
2618 }
2619#endif
2620
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2621 pixmap = XCreatePixmap (disp, vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2622 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2623 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2624 XPutImage (disp, pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2625 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2626 XFreeGC (disp, gc);
2027 XDestroyImage (image); 2627 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2628 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2029 TermWin.pixmap); 2629 XClearWindow (disp, parent[0]);
2630
2030 if (!am_transparent || !am_pixmap_trans) 2631 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2632 pchanged = 1;
2633
2032 am_transparent = am_pixmap_trans = 1; 2634 am_transparent = am_pixmap_trans = 1;
2033 } 2635 }
2034 } 2636 }
2637
2035 if (!am_pixmap_trans) 2638 if (am_pixmap_trans)
2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2640 else
2036 { 2641 {
2037 unsigned int n; 2642 unsigned int n;
2038 /* 2643 /*
2039 * InheritPixmap transparency 2644 * InheritPixmap transparency
2040 */ 2645 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2646 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2647 {
2045 oldp = TermWin.parent[i]; 2648 oldp = parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2649 XQueryTree (disp, parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2650 &parent[i], &list, &n);
2048 XFree (list); 2651 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2652
2050 if (TermWin.parent[i] == display->root) 2653 if (parent[i] == display->root)
2051 { 2654 {
2052 if (oldp != None) 2655 if (oldp != None)
2053 pchanged = 1; 2656 pchanged = 1;
2657
2054 break; 2658 break;
2055 } 2659 }
2660
2056 if (oldp != TermWin.parent[i]) 2661 if (oldp != parent[i])
2057 pchanged = 1; 2662 pchanged = 1;
2058 } 2663 }
2664
2059 n = 0; 2665 n = 0;
2666
2060 if (pchanged) 2667 if (pchanged)
2061 { 2668 {
2062 for (; n < (unsigned int)i; n++) 2669 for (; n < (unsigned int)i; n++)
2063 { 2670 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2671 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) 2672 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2673 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2674 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2069 break; 2675 break;
2070 } 2676 }
2071 } 2677 }
2072 } 2678 }
2073 if (n > (int) (sizeof (TermWin.parent) 2679
2074 / sizeof (TermWin.parent[0]))) 2680 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2075 { 2681 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2682 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2683 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; 2684 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2685 /* XXX: also turn off Opt_transparent? */
2083 } 2686 }
2084 else 2687 else
2085 { 2688 {
2689#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2690 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2691 * 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); 2692 sleep (1);
2096# endif 2693#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2694 for (n = 0; n < (unsigned int)i; n++)
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2695 {
2100 ParentRelative); 2696 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2697 XClearWindow (disp, parent[n]);
2102 ParentRelative); 2698 }
2699
2700 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2103 am_transparent = 1; 2701 am_transparent = 1;
2104 } 2702 }
2703
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2704 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2705 parent[i] = None;
2706 }
2707
2708 if (scrollBar.win)
2107 } 2709 {
2710 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2711 scrollBar.setIdle ();
2712 scrollbar_show (0);
2713 }
2714
2715 if (am_transparent)
2716 {
2717 want_refresh = want_full_refresh = 1;
2718 if (am_pixmap_trans)
2719 flush ();
2720 }
2721
2108 return pchanged; 2722 return pchanged;
2109} 2723}
2110#endif 2724#endif
2111 2725
2112/*}}} */ 2726/*}}} */
2727
2728bool
2729rxvt_term::cmd_parse ()
2730{
2731 bool flag = false;
2732 wchar_t ch = NOCHAR;
2733 char *seq_begin; // remember start of esc-sequence here
2734
2735 for (;;)
2736 {
2737 if (ch == NOCHAR)
2738 {
2739 seq_begin = cmdbuf_ptr;
2740 ch = next_char ();
2741
2742 if (ch == NOCHAR)
2743 break;
2744 }
2745
2746 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2747 {
2748 if (!seen_input)
2749 {
2750 seen_input = 1;
2751 // many badly-written programs (e.g. jed) contain a race condition:
2752 // they first read the screensize and then install a SIGWINCH handler.
2753 // some window managers resize the window early, and these programs
2754 // then sometimes get the size wrong.
2755 // unfortunately other programs are even more buggy and dislike
2756 // being sent SIGWINCH, so only do it when we were in fact being
2757 // resized.
2758 if (seen_resize && cmd_pid)
2759 kill (-cmd_pid, SIGWINCH);
2760 }
2761
2762 /* Read a text string from the input buffer */
2763 wchar_t buf[UBUFSIZ];
2764 bool refreshnow = false;
2765 int nlines = 0;
2766 wchar_t *str = buf;
2767 wchar_t *eol = str + min (ncol, UBUFSIZ);
2768
2769 for (;;)
2770 {
2771 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2772 break;
2773
2774 *str++ = ch;
2775
2776 if (ch == C0_LF || str >= eol)
2777 {
2778 if (ch == C0_LF)
2779 nlines++;
2780
2781 refresh_count++;
2782
2783 if (!OPTION (Opt_jumpScroll)
2784 || (refresh_count >= refresh_limit * (nrow - 1)))
2785 {
2786 refreshnow = true;
2787 refresh_count = 0;
2788 ch = NOCHAR;
2789 break;
2790 }
2791
2792 // scr_add_lines only works for nlines <= nrow - 1.
2793 if (nlines >= nrow - 1)
2794 {
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2796 scr_add_lines (buf, str - buf, nlines);
2797
2798 nlines = 0;
2799 str = buf;
2800 eol = str + min (ncol, UBUFSIZ);
2801 }
2802
2803 if (str >= eol)
2804 {
2805 if (eol >= buf + UBUFSIZ)
2806 {
2807 ch = NOCHAR;
2808 break;
2809 }
2810 else
2811 eol = min (eol + ncol, buf + UBUFSIZ);
2812 }
2813
2814 }
2815
2816 seq_begin = cmdbuf_ptr;
2817 ch = next_char ();
2818 }
2819
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2821 scr_add_lines (buf, str - buf, nlines);
2822
2823 /*
2824 * If there have been a lot of new lines, then update the screen
2825 * What the heck I'll cheat and only refresh less than every page-full.
2826 * the number of pages between refreshes is refresh_limit, which
2827 * is incremented here because we must be doing flat-out scrolling.
2828 */
2829 if (refreshnow)
2830 {
2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2832 refresh_limit++;
2833 else
2834 {
2835 flag = true;
2836 scr_refresh (refresh_type);
2837 flush_ev.stop ();
2838 }
2839 }
2840
2841 }
2842 else
2843 {
2844 try
2845 {
2846 process_nonprinting (ch);
2847 }
2848 catch (const class out_of_input &o)
2849 {
2850 // we ran out of input, retry later
2851 cmdbuf_ptr = seq_begin;
2852 break;
2853 }
2854
2855 ch = NOCHAR;
2856 }
2857 }
2858
2859 return flag;
2860}
2861
2862// read the next character
2863wchar_t
2864rxvt_term::next_char ()
2865{
2866 while (cmdbuf_ptr < cmdbuf_endp)
2867 {
2868 // assume 7-bit to be ascii ALWAYS
2869 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2870 return *cmdbuf_ptr++;
2871
2872 wchar_t wc;
2873 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2874
2875 if (len == (size_t)-2)
2876 {
2877 // the mbstate stores incomplete sequences. didn't know this :/
2878 cmdbuf_ptr = cmdbuf_endp;
2879 break;
2880 }
2881
2882 if (len == (size_t)-1)
2883 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2884
2885 // assume wchar == unicode
2886 cmdbuf_ptr += len;
2887 return wc & UNICODE_MASK;
2888 }
2889
2890 return NOCHAR;
2891}
2892
2893// read the next octet
2894uint32_t
2895rxvt_term::next_octet ()
2896{
2897 return cmdbuf_ptr < cmdbuf_endp
2898 ? (unsigned char)*cmdbuf_ptr++
2899 : NOCHAR;
2900}
2901
2902/* rxvt_cmd_getc () - Return next input character */
2903/*
2904 * Return the next input character after first passing any keyboard input
2905 * to the command.
2906 */
2907wchar_t
2908rxvt_term::cmd_getc ()
2909{
2910 wchar_t c = next_char ();
2911
2912 if (c == NOCHAR)
2913 throw out_of_input;
2914
2915 return c;
2916}
2917
2918uint32_t
2919rxvt_term::cmd_get8 ()
2920{
2921 uint32_t c = next_octet ();
2922
2923 if (c == NOCHAR)
2924 throw out_of_input;
2925
2926 return c;
2927}
2113 2928
2114/*{{{ print pipe */ 2929/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2930/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2931#ifdef PRINTPIPE
2117FILE * 2932FILE *
2118rxvt_term::popen_printer () 2933rxvt_term::popen_printer ()
2119{ 2934{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2935 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2936
2122 if (stream == NULL) 2937 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2938 rxvt_warn ("can't open printer pipe, not printing.\n");
2939
2124 return stream; 2940 return stream;
2125} 2941}
2126 2942
2127int 2943int
2128rxvt_term::pclose_printer (FILE *stream) 2944rxvt_term::pclose_printer (FILE *stream)
2129{ 2945{
2130 fflush (stream); 2946 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); 2947 return pclose (stream);
2137# endif
2138} 2948}
2139 2949
2140/* 2950/*
2141 * simulate attached vt100 printer 2951 * simulate attached vt100 printer
2142 */ 2952 */
2143void 2953void
2144rxvt_term::process_print_pipe () 2954rxvt_term::process_print_pipe ()
2145{ 2955{
2146 int done; 2956 int done;
2147 FILE *fd; 2957 FILE *fd;
2148 2958
2149 if ((fd = popen_printer ()) == NULL) 2959 if ((fd = popen_printer ()) == NULL)
2150 return; 2960 return;
2151 2961
2152 /* 2962 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2963 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2964 * is received.
2155 */ 2965 */
2156 for (done = 0; !done;) 2966 for (done = 0; !done;)
2157 { 2967 {
2158 unsigned char buf[8]; 2968 unsigned char buf[8];
2159 unsigned char ch; 2969 unicode_t ch;
2160 unsigned int i, len; 2970 unsigned int i, len;
2161 2971
2162 if ((ch = cmd_getc ()) != C0_ESC) 2972 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2973 {
2164 if (putc (ch, fd) == EOF) 2974 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2975 break; /* done = 1 */
… …
2180 { 2990 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2991 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2992 break; /* done = 1 */
2183 } 2993 }
2184 } 2994 }
2995
2185 for (i = 0; i < len; i++) 2996 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2997 if (putc (buf[i], fd) == EOF)
2187 { 2998 {
2188 done = 1; 2999 done = 1;
2189 break; 3000 break;
2190 } 3001 }
2191 } 3002 }
2192 } 3003 }
3004
2193 pclose_printer (fd); 3005 pclose_printer (fd);
2194} 3006}
2195#endif /* PRINTPIPE */ 3007#endif /* PRINTPIPE */
2196/*}}} */ 3008/*}}} */
2197 3009
2198/* *INDENT-OFF* */ 3010/* *INDENT-OFF* */
2199enum { 3011enum {
2200 C1_40 = 0x40, 3012 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3013 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, 3014 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, 3015 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 3016 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 3017};
2206/* *INDENT-ON* */ 3018/* *INDENT-ON* */
2207 3019
2208/*{{{ process non-printing single characters */ 3020/*{{{ process non-printing single characters */
2209void 3021void
2210rxvt_term::process_nonprinting (unsigned char ch) 3022rxvt_term::process_nonprinting (unicode_t ch)
2211{ 3023{
2212 switch (ch) 3024 switch (ch)
2213 { 3025 {
3026 case C0_ESC:
3027 process_escape_seq ();
3028 break;
2214 case C0_ENQ: /* terminal Status */ 3029 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 3030 if (rs[Rs_answerbackstring])
2216 tt_write ( 3031 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 3032 else
2220 tt_write ((unsigned char *)VT100_ANS, 3033 tt_write (VT100_ANS, strlen (VT100_ANS));
2221 (unsigned int)STRLEN (VT100_ANS));
2222 break; 3034 break;
2223 case C0_BEL: /* bell */ 3035 case C0_BEL: /* bell */
2224 scr_bell (); 3036 scr_bell ();
2225 break; 3037 break;
2226 case C0_BS: /* backspace */ 3038 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 3053 scr_charset_choose (1);
2242 break; 3054 break;
2243 case C0_SI: /* shift in - acs */ 3055 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 3056 scr_charset_choose (0);
2245 break; 3057 break;
3058
3059#ifdef EIGHT_BIT_CONTROLS
3060 // 8-bit controls
3061 case 0x90: /* DCS */
3062 process_dcs_seq ();
3063 break;
3064 case 0x9b: /* CSI */
3065 process_csi_seq ();
3066 break;
3067 case 0x9d: /* CSI */
3068 process_osc_seq ();
3069 break;
3070#endif
2246 } 3071 }
2247} 3072}
2248/*}}} */ 3073/*}}} */
2249 3074
2250 3075
2251/*{{{ process VT52 escape sequences */ 3076/*{{{ process VT52 escape sequences */
2252void 3077void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 3078rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 3079{
2255 int row, col; 3080 int row, col;
2256 3081
2257 switch (ch) 3082 switch (ch)
2258 { 3083 {
… …
2310 3135
2311/*{{{ process escape sequences */ 3136/*{{{ process escape sequences */
2312void 3137void
2313rxvt_term::process_escape_seq () 3138rxvt_term::process_escape_seq ()
2314{ 3139{
2315 unsigned char ch = cmd_getc (); 3140 unicode_t ch = cmd_getc ();
2316 3141
2317 if (PrivateModes & PrivMode_vt52) 3142 if (priv_modes & PrivMode_vt52)
2318 { 3143 {
2319 process_escape_vt52 (ch); 3144 process_escape_vt52 (ch);
2320 return; 3145 return;
2321 } 3146 }
2322 3147
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 3162 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 3163 break;
2339 case '+': 3164 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 3165 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 3166 break;
2342#ifdef MULTICHAR_SET 3167#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': 3168 case '6':
2349 scr_backindex (); 3169 scr_backindex ();
2350 break; 3170 break;
2351#endif 3171#endif
2352 case '7': 3172 case '7':
2353 scr_cursor (SAVE); 3173 scr_cursor (SAVE);
2354 break; 3174 break;
2355 case '8': 3175 case '8':
2356 scr_cursor (RESTORE); 3176 scr_cursor (RESTORE);
2357 break; 3177 break;
2358#ifndef NO_FRILLS 3178#if ENABLE_FRILLS
2359 case '9': 3179 case '9':
2360 scr_forwardindex (); 3180 scr_forwardindex ();
2361 break; 3181 break;
2362#endif 3182#endif
2363 case '=': 3183 case '=':
… …
2373 break; 3193 break;
2374 3194
2375 /* 8.3.87: NEXT LINE */ 3195 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3196 case C1_NEL: /* ESC E */
2377 { 3197 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3198 wchar_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3199 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2380 } 3200 }
2381 break; 3201 break;
2382 3202
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3203 /* kidnapped escape sequence: Should be 8.3.48 */
2384 case C1_ESA: /* ESC G */ 3204 case C1_ESA: /* ESC G */
… …
2394 case C1_RI: /* ESC M */ 3214 case C1_RI: /* ESC M */
2395 scr_index (DN); 3215 scr_index (DN);
2396 break; 3216 break;
2397 3217
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3218 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3219 /*case C1_SS2: scr_single_shift (2); break; */
2400 3220
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3221 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3222 /*case C1_SS3: scr_single_shift (3); break; */
2403 3223
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3224 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3225 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3226 process_dcs_seq ();
2407 break; 3227 break;
2408 3228
2409 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3229 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2410 case C1_SCI: /* ESC Z */ 3230 case C1_SCI: /* ESC Z */
2411 tt_write ((const unsigned char *)ESCZ_ANSWER, 3231 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2412 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2413 break; /* steal obsolete ESC [ c */ 3232 break; /* steal obsolete ESC [ c */
2414 3233
2415 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3234 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2416 case C1_CSI: /* ESC [ */ 3235 case C1_CSI: /* ESC [ */
2417 process_csi_seq (); 3236 process_csi_seq ();
… …
2422 process_osc_seq (); 3241 process_osc_seq ();
2423 break; 3242 break;
2424 3243
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3244 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3245 case 'c':
3246 mbstate.reset ();
2427 scr_poweron (); 3247 scr_poweron ();
2428 scrollbar_show (1); 3248 scrollbar_show (1);
2429 break; 3249 break;
2430 3250
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3251 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3263
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3264/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3265/* *INDENT-OFF* */
2446enum { 3266enum {
2447 CSI_ICH = 0x40, 3267 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3268 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 , 3269 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, 3270 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, 3271 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, 3272 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, 3273 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, */ 3288 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, [, \, ], ^, _, */ 3289 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, */ 3290 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, */ 3291 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, */ 3292 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, {, |, }, ~, */ 3293 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3294 };
2475/* *INDENT-ON* */ 3295/* *INDENT-ON* */
2476 3296
2477void 3297void
2478rxvt_term::process_csi_seq () 3298rxvt_term::process_csi_seq ()
2479{ 3299{
2480 unsigned char ch, priv, i; 3300 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3301 unsigned int nargs, p;
2482 int n, ndef; 3302 int n, ndef;
2483 int arg[ESC_ARGS]; 3303 int arg[ESC_ARGS];
2484 3304
2485 for (nargs = ESC_ARGS; nargs > 0;) 3305 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3306 arg[--nargs] = 0;
2487 3307
2488 priv = 0; 3308 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3310 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3311 { /* '<' '=' '>' '?' */
2492 priv = ch; 3312 priv = ch;
2493 ch = cmd_getc (); 3313 ch = cmd_getc ();
2494 } 3314 }
3315
2495 /* read any numerical arguments */ 3316 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3317 for (n = -1; ch < CSI_ICH; )
2497 { 3318 {
2498 if (isdigit (ch)) 3319 if (isdigit (ch))
2499 { 3320 {
… …
2506 { 3327 {
2507 if (nargs < ESC_ARGS) 3328 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3329 arg[nargs++] = n;
2509 n = -1; 3330 n = -1;
2510 } 3331 }
2511 else if (ch == '\b') 3332 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); 3333 process_nonprinting (ch);
2523 } 3334
2524 ch = cmd_getc (); 3335 ch = cmd_getc ();
2525 } 3336 }
2526 3337
2527 if (ch > CSI_7F) 3338 if (ch > CSI_7F)
2528 return; 3339 return;
… …
2550 { 3361 {
2551 switch (priv) 3362 switch (priv)
2552 { 3363 {
2553 case '>': 3364 case '>':
2554 if (ch == CSI_DA) /* secondary device attributes */ 3365 if (ch == CSI_DA) /* secondary device attributes */
2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3366 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2556 break; 3367 break;
2557 case '?': 3368 case '?':
2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3369 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2559 process_terminal_mode (ch, priv, nargs, arg); 3370 process_terminal_mode (ch, priv, nargs, arg);
2560 break; 3371 break;
… …
2665 3476
2666 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3477 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2667 arg[0] = -arg[0]; 3478 arg[0] = -arg[0];
2668 /* FALLTHROUGH */ 3479 /* FALLTHROUGH */
2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3480 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3481 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2671 break; 3482 break;
2672 3483
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3484 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3485 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2675 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3486 break;
2677 3487
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3488 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3489 process_sgr_mode (nargs, arg);
2680 break; 3490 break;
… …
2686 tt_printf ("\033[0n"); 3496 tt_printf ("\033[0n");
2687 break; 3497 break;
2688 case 6: /* CPR requested */ 3498 case 6: /* CPR requested */
2689 scr_report_position (); 3499 scr_report_position ();
2690 break; 3500 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3501 case 7: /* unofficial extension */
3502 if (OPTION (Opt_insecure))
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3503 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3504 break;
2695#endif
2696 case 8: /* unofficial extension */ 3505 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3506 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3507 break;
2699 } 3508 }
2700 break; 3509 break;
2701 3510
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3511 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3544 break;
2736 3545
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3546 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3547 if (arg[0] == 4)
2739 scr_insert_mode (0); 3548 scr_insert_mode (0);
3549 else if (arg[0] == 20)
3550 priv_modes &= ~PrivMode_LFNL;
2740 break; 3551 break;
2741 3552
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3553 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3554 if (arg[0] == 4)
2744 scr_insert_mode (1); 3555 scr_insert_mode (1);
3556 else if (arg[0] == 20)
3557 priv_modes |= PrivMode_LFNL;
2745 break; 3558 break;
2746 3559
2747 /* 3560 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3561 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3562 */
… …
2761 break; 3574 break;
2762 case CSI_75: 3575 case CSI_75:
2763 scr_cursor (RESTORE); 3576 scr_cursor (RESTORE);
2764 break; 3577 break;
2765 3578
2766#ifndef NO_FRILLS 3579#if ENABLE_FRILLS
2767 case CSI_74: 3580 case CSI_74:
2768 process_window_ops (arg, nargs); 3581 process_window_ops (arg, nargs);
2769 break; 3582 break;
2770#endif 3583#endif
2771 3584
2772 case CSI_78: /* DECREQTPARM */ 3585 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3586 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3587 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3588 break;
2776 3589
2777 default: 3590 default:
2778 break; 3591 break;
2779 } 3592 }
2780} 3593}
2781/*}}} */ 3594/*}}} */
2782 3595
2783#ifndef NO_FRILLS 3596#if ENABLE_FRILLS
2784/* ARGSUSED */ 3597/* ARGSUSED */
2785void 3598void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3599rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3600{
2788 int x, y; 3601 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3602 XWindowAttributes wattr;
2793 Window wdummy; 3603 Window wdummy;
3604 dDisp;
2794 3605
2795 if (nargs == 0) 3606 if (nargs == 0)
2796 return; 3607 return;
3608
2797 switch (args[0]) 3609 switch (args[0])
2798 { 3610 {
2799 /* 3611 /*
2800 * commands 3612 * commands
2801 */ 3613 */
2802 case 1: /* deiconify window */ 3614 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3615 XMapWindow (disp, parent[0]);
2804 break; 3616 break;
2805 case 2: /* iconify window */ 3617 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3618 XIconifyWindow (disp, parent[0], display->screen);
2807 DefaultScreen (display->display));
2808 break; 3619 break;
2809 case 3: /* set position (pixels) */ 3620 case 3: /* set position (pixels) */
2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3621 XMoveWindow (disp, parent[0], args[1], args[2]);
2811 break; 3622 break;
2812 case 4: /* set size (pixels) */ 3623 case 4: /* set size (pixels) */
2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3624 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2814 break; 3625 break;
2815 case 5: /* raise window */ 3626 case 5: /* raise window */
2816 XRaiseWindow (display->display, TermWin.parent[0]); 3627 XRaiseWindow (disp, parent[0]);
2817 break; 3628 break;
2818 case 6: /* lower window */ 3629 case 6: /* lower window */
2819 XLowerWindow (display->display, TermWin.parent[0]); 3630 XLowerWindow (disp, parent[0]);
2820 break; 3631 break;
2821 case 7: /* refresh window */ 3632 case 7: /* refresh window */
2822 scr_touch (true); 3633 scr_touch (true);
2823 break; 3634 break;
2824 case 8: /* set size (chars) */ 3635 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3636 set_widthheight ((unsigned int) (args[2] * fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3637 (unsigned int) (args[1] * fheight));
2827 break; 3638 break;
3639
3640 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3641 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3642 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3643 set_widthheight ((unsigned int)width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3644 (unsigned int) (args[1] * fheight));
2832 break; 3645 break;
3646
3647
2833 /* 3648 /*
2834 * reports - some output format copied from XTerm 3649 * reports - some output format copied from XTerm
2835 */ 3650 */
2836 case 11: /* report window state */ 3651 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3652 XGetWindowAttributes (disp, parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3653 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3654 break;
2840 case 13: /* report window position */ 3655 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3656 XGetWindowAttributes (disp, parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3657 XTranslateCoordinates (disp, parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3658 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3659 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3660 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3661 break;
2847 case 14: /* report window size (pixels) */ 3662 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3663 XGetWindowAttributes (disp, parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3664 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3665 break;
3666 case 18: /* report text area size (chars) */
3667 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3668 break;
2851 case 18: /* report window size (chars) */ 3669 case 19: /* report window size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3670 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2853 break; 3671 break;
2854#if 0 /* XXX: currently disabled due to security concerns */
2855 case 20: /* report icon label */ 3672 case 20: /* report icon label */
3673 {
3674 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3675 XGetIconName (disp, parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3676 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s);
3678 }
2858 break; 3679 break;
2859 case 21: /* report window title */ 3680 case 21: /* report window title */
3681 {
3682 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3683 XFetchName (disp, parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3684 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3685 XFree (s);
3686 }
2862 break; 3687 break;
2863#endif
2864
2865 } 3688 }
2866} 3689}
2867#endif 3690#endif
2868 3691
2869/*----------------------------------------------------------------------*/ 3692/*----------------------------------------------------------------------*/
2870/* 3693/*
2871 * get input up until STRING TERMINATOR (or BEL) 3694 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3695 * ends_how is terminator used. returned input must be free()'d
2873 */ 3696 */
2874unsigned char * 3697char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3698rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3699{
2877 int seen_esc = 0; /* seen escape? */ 3700 unicode_t ch;
3701 bool seen_esc = false;
2878 unsigned int n = 0; 3702 unsigned int n = 0;
2879 unsigned char *s; 3703 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3704
2882 for (; (ch = cmd_getc ());) 3705 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3706 {
2884 if (ch == C0_BEL 3707 if (seen_esc)
2885 || ch == CHAR_ST 3708 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3709 if (ch == 0x5c) /* 7bit ST */
2887 break; 3710 break;
3711 else
3712 return NULL;
3713 }
2888 if (ch == C0_ESC) 3714 else if (ch == C0_ESC)
2889 { 3715 {
2890 seen_esc = 1; 3716 seen_esc = true;
2891 continue; 3717 continue;
2892 } 3718 }
2893 else if (ch == '\t') 3719 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3720 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3721 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3722 return NULL; /* other control character - exit */
2897 if (n < sizeof (string) - 1) 3723
3724 seen_esc = false;
3725
3726 if (n >= STRING_MAX - 1)
3727 // stop at some sane length
3728 return NULL;
3729
3730 if (ch == C0_SYN)
3731 string[n++] = cmd_get8 ();
3732 else
2898 string[n++] = ch; 3733 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3734 }
3735
2901 string[n++] = '\0'; 3736 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3737
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3738 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3739
2906 return s; 3740 return rxvt_wcstombs (string);
2907} 3741}
2908 3742
2909/*----------------------------------------------------------------------*/ 3743/*----------------------------------------------------------------------*/
2910/* 3744/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3745 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3746 */
2913void 3747void
2914rxvt_term::process_dcs_seq () 3748rxvt_term::process_dcs_seq ()
2915{ 3749{
2916 unsigned char eh, *s; 3750 char *s;
3751 unicode_t eh;
3752
2917 /* 3753 /*
2918 * Not handled yet 3754 * Not handled yet
2919 */ 3755 */
2920 s = get_to_st (&eh); 3756 s = get_to_st (eh);
2921 if (s) 3757 if (s)
2922 free (s); 3758 free (s);
3759
2923 return; 3760 return;
2924} 3761}
2925 3762
2926/*----------------------------------------------------------------------*/ 3763/*----------------------------------------------------------------------*/
2927/* 3764/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3765 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3766 */
2930void 3767void
2931rxvt_term::process_osc_seq () 3768rxvt_term::process_osc_seq ()
2932{ 3769{
2933 unsigned char ch, eh, *s; 3770 unicode_t ch, eh;
2934 int arg; 3771 int arg;
2935 3772
2936 ch = cmd_getc (); 3773 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3774 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3775 arg = arg * 10 + (ch - '0');
2939 3776
2940 if (ch == ';') 3777 if (ch == ';')
2941 { 3778 {
2942 s = get_to_st (&eh); 3779 char *s = get_to_st (eh);
3780
2943 if (s) 3781 if (s)
2944 { 3782 {
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); 3783 process_xterm_seq (arg, s, eh);
2957 free (s); 3784 free (s);
2958 } 3785 }
2959 } 3786 }
2960} 3787}
3788
3789void
3790rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3791{
3792 if (str[0] == '?' && !str[1])
3793 {
3794 unsigned short r, g, b;
3795 pix_colors_focused[color].get (display, r, g, b);
3796 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3797 }
3798 else
3799 set_window_color (color, str);
3800}
3801
2961/* 3802/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3803 * 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 */ 3804 */
2983void 3805void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3806rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2985{ 3807{
2986 int changed = 0; 3808 int changed = 0;
2987 int color; 3809 int color;
2988 char *buf, *name; 3810 char *buf, *name;
3811 bool query = str[0] == '?' && !str[1];
3812 int saveop = op;
3813 dDisp;
2989 3814
2990 assert (str != NULL); 3815 assert (str != NULL);
2991 switch (op) 3816 switch (op)
2992 { 3817 {
2993 case XTerm_name: 3818 case XTerm_name:
2994 set_title (str); 3819 set_title (str);
2995 /* FALLTHROUGH */ 3820 /* FALLTHROUGH */
2996 case XTerm_iconName: 3821 case XTerm_iconName:
2997 set_iconName (str); 3822 set_icon_name (str);
2998 break; 3823 break;
2999 case XTerm_title: 3824 case XTerm_title:
3000 set_title (str); 3825 set_title (str);
3001 break; 3826 break;
3827 case XTerm_property:
3828 if (str[0] == '?')
3829 {
3830 Atom prop = display->atom (str + 1);
3831 Atom actual_type;
3832 int actual_format;
3833 unsigned long nitems;
3834 unsigned long bytes_after;
3835 unsigned char *value = 0;
3836 const char *str = "";
3837
3838 if (prop
3839 && XGetWindowProperty (disp, parent[0],
3840 prop, 0, 1<<16, 0, AnyPropertyType,
3841 &actual_type, &actual_format,
3842 &nitems, &bytes_after, &value) == Success
3843 && actual_type != None
3844 && actual_format == 8)
3845 str = (const char *)(value);
3846
3847 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3848
3849 XFree (value);
3850 }
3851 else
3852 {
3853 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3854
3855 if (eq)
3856 {
3857 *eq = 0;
3858 set_utf8_property (display->atom (str), eq + 1);
3859 }
3860 else
3861 XDeleteProperty (disp, parent[0],
3862 display->atom (str));
3863 }
3864 break;
3865
3002 case XTerm_Color: 3866 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3867 for (buf = (char *)str; buf && *buf;)
3004 { 3868 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3869 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3870 break;
3871
3007 *name++ = '\0'; 3872 *name++ = '\0';
3008 color = atoi (buf); 3873 color = atoi (buf);
3874
3009 if (color < 0 || color >= TOTAL_COLORS) 3875 if (color < 0 || color >= TOTAL_COLORS)
3010 break; 3876 break;
3877
3011 if ((buf = STRCHR (name, ';')) != NULL) 3878 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3879 *buf++ = '\0';
3880
3881 if (name[0] == '?' && !name[1])
3882 {
3883 unsigned short r, g, b;
3884 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3885 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3886 }
3887 else
3013 set_window_color (color + minCOLOR, name); 3888 set_window_color (color + minCOLOR, name);
3014 } 3889 }
3890 break;
3891 case XTerm_Color00:
3892 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3893 break;
3894 case XTerm_Color01:
3895 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3015 break; 3896 break;
3016#ifndef NO_CURSORCOLOR 3897#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3898 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3899 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3900 break;
3020#endif 3901#endif
3021 case XTerm_Color_pointer: 3902 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3903 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3904 break;
3905 case XTerm_Color_pointer_bg:
3906 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3907 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3908#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD: 3909 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str); 3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3027 break; 3911 break;
3028 case XTerm_Color_UL: 3912 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str); 3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3030 break; 3914 break;
3031 case XTerm_Color_RV: 3915 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3917 break;
3034#endif 3918 case URxvt_Color_IT:
3035 3919 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; 3920 break;
3921#endif
3922#if TRANSPARENT && TINTING
3923 case URxvt_Color_tint:
3924 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3925 check_our_parents ();
3926 if (am_transparent)
3927 want_full_refresh = want_refresh = 1;
3928 break;
3929#endif
3930
3042 case XTerm_Pixmap: 3931 case XTerm_Pixmap:
3043 if (*str != ';') 3932 if (*str != ';')
3044 { 3933 {
3045#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3935 scale_pixmap (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3936 set_bgPixmap (str); /* change pixmap */
3048#endif 3937#endif
3049 scr_touch (true); 3938 scr_touch (true);
3050 } 3939 }
3051 while ((str = STRCHR (str, ';')) != NULL) 3940 while ((str = strchr (str, ';')) != NULL)
3052 { 3941 {
3053 str++; 3942 str++;
3054#if XPM_BACKGROUND 3943#if XPM_BACKGROUND
3055 changed += scale_pixmap (str); 3944 changed += scale_pixmap (str);
3056#endif 3945#endif
3057
3058 } 3946 }
3947
3059 if (changed) 3948 if (changed)
3060 { 3949 {
3061#ifdef XPM_BACKGROUND 3950#ifdef XPM_BACKGROUND
3062 resize_pixmap (); 3951 resize_pixmap ();
3063#endif 3952#endif
… …
3069 set_window_color (Color_fg, str); 3958 set_window_color (Color_fg, str);
3070 break; 3959 break;
3071 case XTerm_restoreBG: 3960 case XTerm_restoreBG:
3072 set_window_color (Color_bg, str); 3961 set_window_color (Color_bg, str);
3073 break; 3962 break;
3963
3074 case XTerm_logfile: 3964 case XTerm_logfile:
3965 // TODO, when secure mode?
3966 break;
3967
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3075 break; 3972 break;
3076 case XTerm_font: 3973#endif
3077 change_font (str);
3078 break;
3079 case XTerm_locale:
3080 /* TODO */
3081 break;
3082#if 0 3974#if 0
3083 case XTerm_dumpscreen: /* no error notices */ 3975 case XTerm_dumpscreen: /* no error notices */
3084 { 3976 {
3085 int fd; 3977 int fd;
3086 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3087 { 3979 {
3088 scr_dump (fd); 3980 scr_dump (fd);
3089 close (fd); 3981 close (fd);
3090 } 3982 }
3091 } 3983 }
3092 break; 3984 break;
3093#endif 3985#endif
3986 case XTerm_font:
3987 op = URxvt_font;
3988 case URxvt_font:
3989#if ENABLE_STYLES
3990 case URxvt_boldFont:
3991 case URxvt_italicFont:
3992 case URxvt_boldItalicFont:
3993#endif
3994 if (query)
3995 tt_printf ("\33]%d;%-.250s%c", saveop,
3996 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3997 ? fontset[op - URxvt_font]->fontdesc : "",
3998 resp);
3999 else
4000 {
4001 const char *&res = rs[Rs_font + (op - URxvt_font)];
3094 4002
4003 res = strdup (str);
4004 allocated.push_back ((void *)res);
4005 set_fonts ();
4006 }
4007 break;
4008
4009#if ENABLE_FRILLS
4010 case URxvt_locale:
4011 if (query)
4012 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4013 else
4014 {
4015 set_locale (str);
4016 pty.set_utf8_mode (enc_utf8);
4017 init_xlocale ();
4018 }
4019 break;
4020
4021 case URxvt_view_up:
4022 case URxvt_view_down:
4023 {
4024 int lines = atoi (str);
4025
4026 if (lines)
4027 scr_page (op == URxvt_view_up ? UP : DN, lines);
4028 else
4029 scr_erase_savelines ();
4030 }
4031
4032 break;
4033#endif
4034
4035#if ENABLE_PERL
4036 case URxvt_perl:
4037 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4038 ; // no responses yet
4039 break;
4040#endif
3095 } 4041 }
3096} 4042}
3097/*----------------------------------------------------------------------*/ 4043/*----------------------------------------------------------------------*/
3098 4044
3099/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4045/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3107 * so no need for fancy checking 4053 * so no need for fancy checking
3108 */ 4054 */
3109int 4055int
3110rxvt_term::privcases (int mode, unsigned long bit) 4056rxvt_term::privcases (int mode, unsigned long bit)
3111{ 4057{
3112 int state; 4058 int state;
3113 4059
3114 if (mode == 's') 4060 if (mode == 's')
3115 { 4061 {
3116 SavedModes |= (PrivateModes & bit); 4062 SavedModes |= (priv_modes & bit);
3117 return -1; 4063 return -1;
3118 } 4064 }
3119 else 4065 else
3120 { 4066 {
3121 if (mode == 'r') 4067 if (mode == 'r')
3122 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4068 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3123 else 4069 else
3124 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4070 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3125 PrivMode (state, bit); 4071 PrivMode (state, bit);
3126 } 4072 }
4073
3127 return state; 4074 return state;
3128} 4075}
3129 4076
3130/* we're not using priv _yet_ */ 4077/* we're not using priv _yet_ */
3131void 4078void
3132rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4079rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3133{ 4080{
3134 unsigned int i, j; 4081 unsigned int i, j;
3135 int state; 4082 int state;
4083
3136 static const struct 4084 static const struct
3137 { 4085 {
3138 const int argval; 4086 const int argval;
3139 const unsigned long bit; 4087 const unsigned long bit;
3140 } 4088 }
4089
3141 argtopriv[] = { 4090 argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 4091 { 1, PrivMode_aplCUR },
3143 { 2, PrivMode_vt52 }, 4092 { 2, PrivMode_vt52 },
3144 { 3, PrivMode_132 }, 4093 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4094 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4095 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4096 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4097 { 7, PrivMode_Autowrap },
4098 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4099 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4100#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 4101 { menuBar_esc, PrivMode_menuBar },
3152#endif 4102#endif
4103 // 18, 19 printing-related
4104 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 4105#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4106 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4107#endif
3156 { 25, PrivMode_VisibleCursor },
3157 { 35, PrivMode_ShiftKeys }, 4108 { 35, PrivMode_ShiftKeys }, // rxvt extension
3158 { 40, PrivMode_132OK }, 4109 { 40, PrivMode_132OK },
4110 // 41 xterm more fixes NYI
4111 // 45 margin bell NYI
4112 // 46 start logging
3159 { 47, PrivMode_Screen }, 4113 { 47, PrivMode_Screen },
3160 { 66, PrivMode_aplKP }, 4114 { 66, PrivMode_aplKP },
3161#ifndef NO_BACKSPACE_KEY 4115#ifndef NO_BACKSPACE_KEY
3162 { 67, PrivMode_BackSpace }, 4116 { 67, PrivMode_BackSpace },
3163#endif 4117#endif
3164 { 1000, PrivMode_MouseX11 }, 4118 { 1000, PrivMode_MouseX11 },
4119 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4120 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4121 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3165 { 1010, PrivMode_TtyOutputInh }, 4122 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3166 { 1011, PrivMode_Keypress }, 4123 { 1011, PrivMode_Keypress }, // rxvt extension
4124 // 1035 enable modifiers for alt, numlock NYI
4125 // 1036 send ESC for meta keys NYI
4126 // 1037 send DEL for keypad delete NYI
3167 { 1047, PrivMode_Screen }, 4127 { 1047, PrivMode_Screen },
4128 // 1048 save and restore cursor
3168 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4129 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4130 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3169 }; 4131 };
3170 4132
3171 if (nargs == 0) 4133 if (nargs == 0)
3172 return; 4134 return;
3173 4135
… …
3188 state = privcases (mode, argtopriv[j].bit); 4150 state = privcases (mode, argtopriv[j].bit);
3189 break; 4151 break;
3190 } 4152 }
3191 4153
3192 /* extra handling for values with state unkept */ 4154 /* extra handling for values with state unkept */
3193 if (state == -1)
3194 switch (arg[i]) 4155 switch (arg[i])
3195 { 4156 {
4157#if ENABLE_STYLES
4158 case 1021:
4159 set_option (Opt_intensityStyles, mode);
4160
4161 scr_touch (true);
4162 break;
4163#endif
3196 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
4165 case 1049:
4166 if (OPTION (Opt_secondaryScreen))
3197 if (mode == 0) 4167 if (mode == 0)
3198 scr_cursor (RESTORE); 4168 scr_cursor (RESTORE);
3199 else if (mode == 1) 4169 else if (mode == 1)
3200 scr_cursor (SAVE); 4170 scr_cursor (SAVE);
3201 /* FALLTHROUGH */
3202 default:
3203 continue; /* for (;i;) */
3204 }
3205
3206 /* extra handling for values with valid 0 or 1 state */
3207 switch (arg[i])
3208 {
3209 /* case 1: - application cursor keys */
3210 case 2: /* VT52 mode */
3211 /* oddball mode. should be set regardless of set/reset
3212 * parameter. Return from VT52 mode with an ESC < from
3213 * within VT52 mode
3214 */
3215 PrivMode (1, PrivMode_vt52);
3216 break; 4171 break;
4172 }
4173
4174 if (state >= 0)
4175 /* extra handling for values with valid 0 or 1 state */
4176 switch (arg[i])
4177 {
4178 /* case 1: - application cursor keys */
4179 case 2: /* VT52 mode */
4180 /* oddball mode. should be set regardless of set/reset
4181 * parameter. Return from VT52 mode with an ESC < from
4182 * within VT52 mode
4183 */
4184 PrivMode (1, PrivMode_vt52);
4185 break;
3217 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
3218 if (PrivateModes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
3219 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
3220 (unsigned int)TermWin.height);
3221 break; 4189 break;
3222 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
3223 if (state)
3224 Options &= ~Opt_jumpScroll;
3225 else
3226 Options |= Opt_jumpScroll; 4191 set_option (Opt_jumpScroll, !state);
3227 break; 4192 break;
3228 case 5: /* reverse video */ 4193 case 5: /* reverse video */
3229 scr_rvideo_mode (state); 4194 scr_rvideo_mode (state);
3230 break; 4195 break;
3231 case 6: /* relative/absolute origins */ 4196 case 6: /* relative/absolute origins */
3232 scr_relative_origin (state); 4197 scr_relative_origin (state);
3233 break; 4198 break;
3234 case 7: /* autowrap */ 4199 case 7: /* autowrap */
3235 scr_autowrap (state); 4200 scr_autowrap (state);
3236 break; 4201 break;
3237 /* case 8: - auto repeat, can't do on a per window basis */ 4202 /* case 8: - auto repeat, can't do on a per window basis */
3238 case 9: /* X10 mouse reporting */ 4203 case 9: /* X10 mouse reporting */
3239 if (state) /* orthogonal */ 4204 if (state) /* orthogonal */
3240 PrivateModes &= ~ (PrivMode_MouseX11); 4205 priv_modes &= ~PrivMode_MouseX11;
3241 break; 4206 break;
3242#ifdef menuBar_esc 4207#ifdef menuBar_esc
3243 case menuBar_esc: 4208 case menuBar_esc:
3244#ifdef MENUBAR 4209#ifdef MENUBAR
3245 map_menuBar (state); 4210 map_menuBar (state);
3246#endif 4211#endif
3247 break; 4212 break;
3248#endif 4213#endif
3249#ifdef scrollBar_esc 4214#ifdef scrollBar_esc
3250 case scrollBar_esc: 4215 case scrollBar_esc:
3251 if (scrollbar_mapping (state)) 4216 if (scrollbar_mapping (state))
3252 { 4217 {
3253 resize_all_windows (0, 0, 0); 4218 resize_all_windows (0, 0, 0);
3254 scr_touch (true); 4219 scr_touch (true);
3255 } 4220 }
3256 break; 4221 break;
3257#endif 4222#endif
3258 case 25: /* visible/invisible cursor */ 4223 case 25: /* visible/invisible cursor */
3259 scr_cursor_visible (state); 4224 scr_cursor_visible (state);
3260 break; 4225 break;
3261 /* case 35: - shift keys */ 4226 /* case 35: - shift keys */
3262 /* case 40: - 80 <--> 132 mode */ 4227 /* case 40: - 80 <--> 132 mode */
3263 case 47: /* secondary screen */ 4228 case 47: /* secondary screen */
3264 scr_change_screen (state); 4229 scr_change_screen (state);
3265 break; 4230 break;
3266 /* case 66: - application key pad */ 4231 /* case 66: - application key pad */
3267 /* case 67: - backspace key */ 4232 /* case 67: - backspace key */
3268 case 1000: /* X11 mouse reporting */ 4233 case 1000: /* X11 mouse reporting */
3269 if (state) /* orthogonal */ 4234 if (state) /* orthogonal */
3270 PrivateModes &= ~ (PrivMode_MouseX10); 4235 priv_modes &= ~PrivMode_MouseX10;
3271 break; 4236 break;
3272#if 0 4237#if 0
3273 case 1001: 4238 case 1001:
3274 break; /* X11 mouse highlighting */ 4239 break; /* X11 mouse highlighting */
3275#endif 4240#endif
3276 case 1010: /* scroll to bottom on TTY output inhibit */ 4241 case 1010: /* scroll to bottom on TTY output inhibit */
3277 if (state)
3278 Options &= ~Opt_scrollTtyOutput;
3279 else
3280 Options |= Opt_scrollTtyOutput; 4242 set_option (Opt_scrollTtyOutput, !state);
3281 break; 4243 break;
3282 case 1011: /* scroll to bottom on key press */ 4244 case 1011: /* scroll to bottom on key press */
3283 if (state)
3284 Options |= Opt_scrollTtyKeypress; 4245 set_option (Opt_scrollTtyKeypress, state);
3285 else
3286 Options &= ~Opt_scrollTtyKeypress;
3287 break; 4246 break;
3288 case 1047: /* secondary screen w/ clearing */ 4247 case 1047: /* secondary screen w/ clearing last */
3289 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4248 if (OPTION (Opt_secondaryScreen))
3290 if (current_screen != PRIMARY) 4249 if (current_screen != PRIMARY)
3291 scr_erase_screen (2); 4250 scr_erase_screen (2);
3292 scr_change_screen (state); 4251 scr_change_screen (state);
3293 /* FALLTHROUGH */
3294 default:
3295 break; 4252 break;
4253 case 1049: /* secondary screen w/ clearing first */
4254 scr_change_screen (state);
4255 if (OPTION (Opt_secondaryScreen))
4256 if (current_screen != PRIMARY)
4257 scr_erase_screen (2);
4258 break;
4259 default:
4260 break;
3296 } 4261 }
3297 } 4262 }
3298} 4263}
3299/*}}} */ 4264/*}}} */
3300 4265
3301/*{{{ process sgr sequences */ 4266/*{{{ process sgr sequences */
3302void 4267void
3303rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4268rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3304{ 4269{
3305 unsigned int i; 4270 unsigned int i;
3306 short rendset; 4271 short rendset;
3307 int rendstyle; 4272 int rendstyle;
3308 4273
3309 if (nargs == 0) 4274 if (nargs == 0)
3310 { 4275 {
3311 scr_rendition (0, ~RS_None); 4276 scr_rendition (0, ~RS_None);
3312 return; 4277 return;
3313 } 4278 }
4279
3314 for (i = 0; i < nargs; i++) 4280 for (i = 0; i < nargs; i++)
3315 { 4281 {
3316 rendset = -1; 4282 rendset = -1;
3317 switch (arg[i]) 4283 switch (arg[i])
3318 { 4284 {
… …
3320 rendset = 0, rendstyle = ~RS_None; 4286 rendset = 0, rendstyle = ~RS_None;
3321 break; 4287 break;
3322 case 1: 4288 case 1:
3323 rendset = 1, rendstyle = RS_Bold; 4289 rendset = 1, rendstyle = RS_Bold;
3324 break; 4290 break;
4291 //case 2: // low intensity
4292 case 3:
4293 rendset = 1, rendstyle = RS_Italic;
4294 break;
3325 case 4: 4295 case 4:
3326 rendset = 1, rendstyle = RS_Uline; 4296 rendset = 1, rendstyle = RS_Uline;
3327 break; 4297 break;
3328 case 5: 4298 case 5: // slowly blinking
4299 case 6: // rapidly blinking
3329 rendset = 1, rendstyle = RS_Blink; 4300 rendset = 1, rendstyle = RS_Blink;
3330 break; 4301 break;
4302 //case 6: // scoansi light background
3331 case 7: 4303 case 7:
3332 rendset = 1, rendstyle = RS_RVid; 4304 rendset = 1, rendstyle = RS_RVid;
3333 break; 4305 break;
3334 case 22: 4306 case 8:
4307 // invisible. NYI
4308 break;
4309 //case 9: // crossed out
4310 //case 10: // scoansi acs off, primary font
4311 //case 11: // scoansi acs on, first alt font
4312 //case 12: // scoansi acs on, |0x80, second alt font
4313 //...
4314 //case 19: // ninth alt font
4315 //case 20: // gothic
4316 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3335 rendset = 0, rendstyle = RS_Bold; 4317 rendset = 0, rendstyle = RS_Bold;
4318 break;
4319 case 22: // normal intensity
4320 rendset = 0, rendstyle = RS_Bold;
4321 break;
4322 case 23: // disable italic
4323 rendset = 0, rendstyle = RS_Italic;
3336 break; 4324 break;
3337 case 24: 4325 case 24:
3338 rendset = 0, rendstyle = RS_Uline; 4326 rendset = 0, rendstyle = RS_Uline;
3339 break; 4327 break;
3340 case 25: 4328 case 25:
3341 rendset = 0, rendstyle = RS_Blink; 4329 rendset = 0, rendstyle = RS_Blink;
3342 break; 4330 break;
4331 case 26: // variable spacing (iso 8613)
4332 rendset = 0, rendstyle = RS_Blink;
4333 break;
3343 case 27: 4334 case 27:
3344 rendset = 0, rendstyle = RS_RVid; 4335 rendset = 0, rendstyle = RS_RVid;
3345 break; 4336 break;
4337 //case 28: // visible. NYI
4338 //case 29: // not crossed-out
3346 } 4339 }
4340
3347 if (rendset != -1) 4341 if (rendset != -1)
3348 { 4342 {
3349 scr_rendition (rendset, rendstyle); 4343 scr_rendition (rendset, rendstyle);
3350 continue; /* for (;i;) */ 4344 continue; /* for (;i;) */
3351 } 4345 }
… …
3358 case 33: 4352 case 33:
3359 case 34: 4353 case 34:
3360 case 35: 4354 case 35:
3361 case 36: 4355 case 36:
3362 case 37: 4356 case 37:
3363 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4357 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3364 Color_fg);
3365 break; 4358 break;
3366#ifdef TTY_256COLOR 4359 case 38: // set fg color, ISO 8613-6
3367 case 38:
3368 if (nargs > i + 2 && arg[i + 1] == 5) 4360 if (nargs > i + 2 && arg[i + 1] == 5)
3369 { 4361 {
3370 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4362 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3371 Color_fg);
3372 i += 2; 4363 i += 2;
3373 } 4364 }
3374 break; 4365 break;
3375#endif
3376 case 39: /* default fg */ 4366 case 39: /* default fg */
3377 scr_color (Color_fg, Color_fg); 4367 scr_color (Color_fg, Color_fg);
3378 break; 4368 break;
3379 4369
3380 case 40: 4370 case 40:
… …
3383 case 43: 4373 case 43:
3384 case 44: 4374 case 44:
3385 case 45: 4375 case 45:
3386 case 46: 4376 case 46:
3387 case 47: 4377 case 47:
3388 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4378 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3389 Color_bg);
3390 break; 4379 break;
3391#ifdef TTY_256COLOR 4380 case 48: // set bg color, ISO 8613-6
3392 case 48:
3393 if (nargs > i + 2 && arg[i + 1] == 5) 4381 if (nargs > i + 2 && arg[i + 1] == 5)
3394 { 4382 {
3395 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3396 Color_bg);
3397 i += 2; 4384 i += 2;
3398 } 4385 }
3399 break; 4386 break;
3400#endif
3401 case 49: /* default bg */ 4387 case 49: /* default bg */
3402 scr_color (Color_bg, Color_bg); 4388 scr_color (Color_bg, Color_bg);
3403 break; 4389 break;
3404 4390
3405#ifndef NO_BRIGHTCOLOR 4391 //case 50: // not variable spacing
4392
4393#if ENABLE_FRILLS
3406 case 90: 4394 case 90:
3407 case 91: /* set bright fg color */ 4395 case 91: /* set bright fg color */
3408 case 92: 4396 case 92:
3409 case 93: 4397 case 93:
3410 case 94: 4398 case 94:
3411 case 95: 4399 case 95:
3412 case 96: 4400 case 96:
3413 case 97: 4401 case 97:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4402 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3415 Color_fg);
3416 break; 4403 break;
3417 case 100: 4404 case 100:
3418 case 101: /* set bright bg color */ 4405 case 101: /* set bright bg color */
3419 case 102: 4406 case 102:
3420 case 103: 4407 case 103:
3421 case 104: 4408 case 104:
3422 case 105: 4409 case 105:
3423 case 106: 4410 case 106:
3424 case 107: 4411 case 107:
3425 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4412 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3426 Color_bg);
3427 break; 4413 break;
3428#endif 4414#endif
3429
3430 } 4415 }
3431 } 4416 }
3432} 4417}
3433/*}}} */ 4418/*}}} */
3434 4419
3435/*{{{ process Rob Nation's own graphics mode sequences */ 4420/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3436void 4421void
3437rxvt_term::process_graphics () 4422rxvt_term::process_graphics ()
3438{ 4423{
3439 unsigned char ch, cmd = cmd_getc (); 4424 unicode_t ch, cmd = cmd_getc ();
3440 4425
3441 if (cmd == 'Q') 4426 if (cmd == 'Q')
3442 { /* query graphics */ 4427 { /* query graphics */
3443 tt_printf ("\033G0\n"); /* no graphics */ 4428 tt_printf ("\033G0\012"); /* no graphics */
3444 return; 4429 return;
3445 } 4430 }
3446 /* swallow other graphics sequences until terminating ':' */ 4431 /* swallow other graphics sequences until terminating ':' */
3447 do 4432 do
3448 ch = cmd_getc (); 4433 ch = cmd_getc ();
… …
3458 */ 4443 */
3459void 4444void
3460rxvt_term::tt_printf (const char *fmt,...) 4445rxvt_term::tt_printf (const char *fmt,...)
3461{ 4446{
3462 va_list arg_ptr; 4447 va_list arg_ptr;
3463 unsigned char buf[256]; 4448 char buf[256];
3464 4449
3465 va_start (arg_ptr, fmt); 4450 va_start (arg_ptr, fmt);
3466 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4451 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3467 va_end (arg_ptr); 4452 va_end (arg_ptr);
3468 tt_write (buf, STRLEN (buf)); 4453 tt_write (buf, strlen (buf));
3469} 4454}
3470 4455
3471/* ---------------------------------------------------------------------- */ 4456/* ---------------------------------------------------------------------- */
3472/* Write data to the pty as typed by the user, pasted with the mouse, 4457/* Write data to the pty as typed by the user, pasted with the mouse,
3473 * or generated by us in response to a query ESC sequence. 4458 * or generated by us in response to a query ESC sequence.
3474 */ 4459 */
4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461
3475void 4462void
3476rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4463rxvt_term::tt_write (const char *data, unsigned int len)
3477{ 4464{
3478 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4465 if (pty.pty < 0)
4466 return;
3479 4467
3480 if (len) 4468 if (v_buflen == 0)
4469 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4471
4472 if ((unsigned int)written == len)
4473 return;
4474
4475 data += written;
4476 len -= written;
3481 { 4477 }
4478
4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4480
4481 memcpy (v_buffer + v_buflen, data, len);
4482 v_buflen += len;
4483
4484 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485}
4486
4487void rxvt_term::pty_write ()
4488{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490
4491 if (written > 0)
4492 {
4493 v_buflen -= written;
4494
3482 if (v_buflen == 0) 4495 if (v_buflen == 0)
3483 { 4496 {
3484 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3485
3486 if ((unsigned int)written == len)
3487 return;
3488
3489 data += written;
3490 len -= written;
3491 }
3492
3493
3494 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3495
3496 memcpy (v_buffer + v_buflen, data, len);
3497 v_buflen += len;
3498 }
3499
3500 for (;;)
3501 {
3502 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3503
3504 if (written > 0)
3505 {
3506 v_buflen -= written;
3507
3508 if (v_buflen == 0)
3509 {
3510 free (v_buffer); 4497 free (v_buffer);
3511 v_buffer = 0; 4498 v_buffer = 0;
3512 v_buflen = 0; 4499 v_buflen = 0;
3513 4500
3514 pty_ev.set (EVENT_READ); 4501 pty_ev.set (EVENT_READ);
3515 return;
3516 }
3517
3518 memmove (v_buffer, v_buffer + written, v_buflen);
3519 }
3520 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3521 // original code just ignores this...
3522 destroy ();
3523 else
3524 {
3525 pty_ev.set (EVENT_READ | EVENT_WRITE);
3526 return; 4502 return;
3527 } 4503 }
4504
4505 memmove (v_buffer, v_buffer + written, v_buflen);
3528 } 4506 }
4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4508 pty_ev.set (EVENT_READ);
3529} 4509}
3530 4510
3531/*----------------------- end-of-file (C source) -----------------------*/ 4511/*----------------------- end-of-file (C source) -----------------------*/
3532 4512

Diff Legend

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