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

Diff Legend

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