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

Diff Legend

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