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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC

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

Diff Legend

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