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.50 by pcg, Sun Feb 22 08:09:37 2004 UTC vs.
Revision 1.241 by root, Fri Jan 6 05:28:55 2006 UTC

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

Diff Legend

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