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

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

Diff Legend

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