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.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC

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

Diff Legend

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