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.58 by pcg, Wed Feb 25 15:06:03 2004 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC

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

Diff Legend

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