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

Diff Legend

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