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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines