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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

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

Diff Legend

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