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.196 by root, Thu Feb 17 12:23:39 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
… …
1183 && (ev.xclient.data.l[0] == DndFile 1340 && (ev.xclient.data.l[0] == DndFile
1184 || ev.xclient.data.l[0] == DndDir 1341 || ev.xclient.data.l[0] == DndDir
1185 || ev.xclient.data.l[0] == DndLink)) 1342 || ev.xclient.data.l[0] == DndLink))
1186 { 1343 {
1187 /* Get Dnd data */ 1344 /* Get Dnd data */
1188 Atom ActualType; 1345 Atom ActualType;
1189 int ActualFormat; 1346 int ActualFormat;
1190 unsigned char *data; 1347 unsigned char *data;
1191 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1192 1349
1193 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1194 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1195 0L, 1000000L, 1352 0L, 1000000L,
1196 False, AnyPropertyType, 1353 False, AnyPropertyType,
1197 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1198 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1199 &data); 1356 &data);
1200 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1201 XA_CUT_BUFFER0, XA_STRING, 1358 XFree (data);
1202 8, PropModeReplace,
1203 data, STRLEN (data));
1204 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1206 } 1361 }
1207#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1208 break; 1363 break;
1209 1364
1210 case MappingNotify: 1365 case MappingNotify:
1211 XRefreshKeyboardMapping (& (ev.xmapping)); 1366 XRefreshKeyboardMapping (&ev.xmapping);
1212 break; 1367 break;
1213 1368
1214 /* 1369 /*
1215 * XXX: this is not the _current_ arrangement 1370 * XXX: this is not the _current_ arrangement
1216 * Here's my conclusion: 1371 * Here's my conclusion:
… …
1241 { 1396 {
1242 TermWin.focus = 1; 1397 TermWin.focus = 1;
1243 want_refresh = 1; 1398 want_refresh = 1;
1244#ifdef USE_XIM 1399#ifdef USE_XIM
1245 if (Input_Context != NULL) 1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1246 XSetICFocus (Input_Context); 1403 XSetICFocus (Input_Context);
1404 }
1247#endif 1405#endif
1248#ifdef CURSOR_BLINK 1406#ifdef CURSOR_BLINK
1249 if (Options & Opt_cursorBlink) 1407 if (options & Opt_cursorBlink)
1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1251#endif 1416#endif
1252 1417
1253 } 1418 }
1254 break; 1419 break;
1255 1420
1256 case FocusOut: 1421 case FocusOut:
1257 if (TermWin.focus) 1422 if (TermWin.focus)
1258 { 1423 {
1259 TermWin.focus = 0; 1424 TermWin.focus = 0;
1260 want_refresh = 1; 1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1261#ifdef USE_XIM 1433#ifdef USE_XIM
1262 if (Input_Context != NULL) 1434 if (Input_Context != NULL)
1263 XUnsetICFocus (Input_Context); 1435 XUnsetICFocus (Input_Context);
1264#endif 1436#endif
1265#ifdef CURSOR_BLINK 1437#ifdef CURSOR_BLINK
1266 if (Options & Opt_cursorBlink) 1438 if (options & Opt_cursorBlink)
1267 cursor_blink_ev.stop (); 1439 cursor_blink_ev.stop ();
1268 hidden_cursor = 0; 1440 hidden_cursor = 0;
1269#endif 1441#endif
1270 1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1271 } 1449 }
1272 break; 1450 break;
1273 1451
1274 case ConfigureNotify: 1452 case ConfigureNotify:
1275 if (ev.xconfigure.window == TermWin.parent[0]) 1453 if (ev.xconfigure.window == TermWin.parent[0])
… …
1280 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1281 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1282 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1284 } 1462 }
1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1286 1464
1287 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1288 { 1466 {
1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1467 seen_resize = 1;
1290 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1291 } 1469 }
1292#ifdef DEBUG_SIZE 1470
1293 else
1294 {
1295 D_SIZE ((stderr, "Size: Not resizing"));
1296 }
1297#endif
1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1299 if (Options & Opt_transparent) 1472 if (options & Opt_transparent)
1300 {
1301 check_our_parents (); 1473 check_our_parents ();
1302 if (am_transparent)
1303 want_full_refresh = 1;
1304 }
1305#endif 1474#endif
1306
1307 } 1475 }
1308 break; 1476 break;
1309 1477
1478 case PropertyNotify:
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1483 break;
1484
1310 case SelectionClear: 1485 case SelectionClear:
1311 display->set_selection_owner (0); 1486 selection_clear ();
1312 break; 1487 break;
1313 1488
1314 case SelectionNotify: 1489 case SelectionNotify:
1315 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1316 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1317 ev.xselection.property, True);
1318 break; 1492 break;
1319 1493
1320 case SelectionRequest: 1494 case SelectionRequest:
1321 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1322 break; 1496 break;
… …
1343 1517
1344 case GraphicsExpose: 1518 case GraphicsExpose:
1345 case Expose: 1519 case Expose:
1346 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1347 { 1521 {
1348#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1349 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1350 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1351#else 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1352 // don't understand this, so commented it out 1526
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1353 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1354 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1355 //scr_expose (ev.xexpose.x, 0, 1532
1356 // ev.xexpose.width, TermWin.height, False); 1533 scr_refresh (refresh_type);
1357#endif
1358 want_refresh = 1;
1359 } 1534 }
1360 else 1535 else
1361 { 1536 {
1362 XEvent unused_event; 1537 XEvent unused_event;
1363 1538
1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1365 Expose, 1540 ;
1366 &unused_event)) ; 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1542 ;
1368 GraphicsExpose, 1543
1369 &unused_event)) ;
1370 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1371 { 1545 {
1372 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1373 scrollbar_show (0); 1547 scrollbar_show (0);
1374 } 1548 }
1375#ifdef MENUBAR 1549#ifdef MENUBAR
1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1377 menubar_expose (); 1551 menubar_expose ();
1378#endif 1552#endif
1553
1554#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1556 XClearWindow (disp, ev.xany.window);
1557#endif
1379 } 1558 }
1380 break; 1559 break;
1381 1560
1382 case MotionNotify: 1561 case MotionNotify:
1383#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
… …
1389 { 1568 {
1390 menubar_control (ev.xbutton); 1569 menubar_control (ev.xbutton);
1391 break; 1570 break;
1392 } 1571 }
1393#endif 1572#endif
1394 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1395 break; 1574 break;
1396 1575
1397 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1398 { 1577 {
1399 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1400 { 1579 {
1401 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1402 ; 1581 ;
1403 1582
1404 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1405 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1406 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1407 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1408 &unused_mask); 1587 &ev.xbutton.state);
1409#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1410 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1411 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1412 { 1591 {
1413#endif 1592#endif
1593#if ISO_14755
1594 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1598 break;
1599 }
1600#endif
1414 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1415 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1416#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1417 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1419 { 1607 {
1420 int dist; 1608 int dist;
1421 1609
1422 pending_scroll_selection=1;
1423
1424 /* don't clobber the current delay if we are 1610 /* don't clobber the current delay if we are
1425 * already in the middle of scrolling. 1611 * already in the middle of scrolling.
1426 */ 1612 */
1427 if (scroll_selection_delay<=0) 1613 if (!sel_scroll_ev.active)
1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1429 1615
1430 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1431 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1432 */ 1618 */
1433 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1434 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1435 selection_save_state=
1436 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1437 1622
1438 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1439 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1440 { 1625 {
1441 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1442 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1443 } 1628 }
1444 else 1629 else
1445 { 1630 {
1446 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1447 dist = ev.xbutton.y -
1448 (TermWin.int_bwidth + TermWin.height); 1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1449 } 1633 }
1634
1450 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1451 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1452 MIN_IT (scroll_selection_lines, 1638 MIN_IT (scroll_selection_lines,
1453 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1454 } 1640 }
1455 else 1641 else
1456 { 1642 {
1457 /* we are within the text window, so we 1643 /* we are within the text window, so we
1458 * shouldn't be scrolling 1644 * shouldn't be scrolling
1459 */ 1645 */
1460 pending_scroll_selection = 0; 1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop();
1461 } 1648 }
1462#endif 1649#endif
1463#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1464
1465 } 1651 }
1466#endif 1652#endif
1467
1468 } 1653 }
1469 } 1654 }
1470 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1471 { 1656 {
1472 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1473 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1474 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1475 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1476 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1477 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1478 &unused_mask); 1665 &unused_mask);
1479 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1480 scrollbar_size ()); 1667 scrollbar_size ());
1481 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1482 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1484 } 1671 }
1485 break; 1672 break;
1486 } 1673 }
1487} 1674}
1488 1675
1676#if TRANSPARENT
1489void 1677void
1490rxvt_term::rootwin_cb (XEvent &ev) 1678rxvt_term::rootwin_cb (XEvent &ev)
1491{ 1679{
1492 SET_R (this); 1680 SET_R (this);
1493 SET_LOCALE (locale); 1681 SET_LOCALE (locale);
1494 1682
1495 switch (ev.type) 1683 switch (ev.type)
1496 { 1684 {
1497 case PropertyNotify: 1685 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 /* 1686 /*
1508 * if user used some Esetroot compatible prog to set the root bg, 1687 * 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. 1688 * use the property to determine the pixmap. We use it later on.
1510 */ 1689 */
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]) 1690 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1515 return; 1692 return;
1516 }
1517 1693
1518 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1519 case ReparentNotify: 1695 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ()) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1521 if (am_transparent)
1522 want_full_refresh = 1; 1697 want_refresh = want_full_refresh = 1;
1523 break; 1698 break;
1524#endif
1525 } 1699 }
1526} 1700}
1701#endif
1527 1702
1528void 1703void
1529rxvt_term::button_press (XButtonEvent &ev) 1704rxvt_term::button_press (XButtonEvent &ev)
1530{ 1705{
1531 int reportmode = 0, clickintime; 1706 int reportmode = 0, clickintime;
1532 1707
1533 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1534 if (!bypass_keystate) 1709 if (!bypass_keystate)
1535 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1710 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711
1536 /* 1712 /*
1537 * VT window processing of button press 1713 * VT window processing of button press
1538 */ 1714 */
1539 if (ev.window == TermWin.vt) 1715 if (ev.window == TermWin.vt)
1540 { 1716 {
1717#if ISO_14755
1718 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 {
1721 iso14755_54 (ev.x, ev.y);
1722 return;
1723 }
1724#endif
1725
1541 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1542 if (reportmode) 1728 if (reportmode)
1543 { 1729 {
1544 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1545 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1546 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1575 } 1761 }
1576 else 1762 else
1577 { 1763 {
1578 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1579 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1580 switch (ev.button) 1767 switch (ev.button)
1581 { 1768 {
1582 case Button1: 1769 case Button1:
1770 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */
1772#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask);
1774#else
1775 selection.rect = false;
1776#endif
1777
1583 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1584 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1585 { 1780 {
1586 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1587 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
1588 else 1783 else
1589 selection_extend (ev.x, ev.y, 1); 1784 selection_extend (ev.x, ev.y, 1);
… …
1604 case Button3: 1799 case Button3:
1605 if (MEvent.button == Button3 && clickintime) 1800 if (MEvent.button == Button3 && clickintime)
1606 selection_rotate (ev.x, ev.y); 1801 selection_rotate (ev.x, ev.y);
1607 else 1802 else
1608 selection_extend (ev.x, ev.y, 1); 1803 selection_extend (ev.x, ev.y, 1);
1804
1609 MEvent.button = Button3; 1805 MEvent.button = Button3;
1610 break; 1806 break;
1611 } 1807 }
1612 } 1808 }
1809
1613 MEvent.time = ev.time; 1810 MEvent.time = ev.time;
1614 return; 1811 return;
1615 } 1812 }
1616 1813
1617 /* 1814 /*
… …
1683 upordown = 1; /* down */ 1880 upordown = 1; /* down */
1684 } 1881 }
1685 if (upordown) 1882 if (upordown)
1686 { 1883 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1884#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1885 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1689#endif 1886#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1)) 1887 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 { 1888 {
1692 if (upordown < 0) 1889 if (upordown < 0)
1693 scrollBar.setUp (); 1890 scrollBar.setUp ();
… …
1709 break; 1906 break;
1710 case R_SB_ALIGN_BOTTOM: 1907 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top; 1908 csrO = scrollBar.bot - scrollBar.top;
1712 break; 1909 break;
1713 } 1910 }
1911
1714 if (scrollBar.style == R_SB_XTERM 1912 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y) 1913 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y)) 1914 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO, 1915 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1718 scrollbar_size ()); 1916
1719 scrollBar.setMotion (); 1917 scrollBar.setMotion ();
1720 break; 1918 break;
1721 1919
1722 case Button1: 1920 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1921 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1747 scr_page ((ev.button == Button1 ? DN : UP), 1945 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow 1946 (TermWin.nrow
1749 * scrollbar_position (ev.y) 1947 * scrollbar_position (ev.y)
1750 / scrollbar_size ())); 1948 / scrollbar_size ()));
1751 } 1949 }
1950
1752 break; 1951 break;
1753 } 1952 }
1754 } 1953 }
1755 return; 1954 return;
1756 } 1955 }
… …
1768{ 1967{
1769 int reportmode = 0; 1968 int reportmode = 0;
1770 1969
1771 csrO = 0; /* reset csr Offset */ 1970 csrO = 0; /* reset csr Offset */
1772 if (!bypass_keystate) 1971 if (!bypass_keystate)
1773 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1972 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1973
1775 if (scrollbar_isUpDn ()) 1974 if (scrollbar_isUpDn ())
1776 { 1975 {
1777 scrollBar.setIdle (); 1976 scrollBar.setIdle ();
1778 scrollbar_show (0); 1977 scrollbar_show (0);
1779#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780 refresh_type &= ~SMOOTH_REFRESH; 1979 refresh_type &= ~SMOOTH_REFRESH;
1781#endif 1980#endif
1782
1783 } 1981 }
1982
1784#ifdef SELECTION_SCROLLING 1983#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0; 1984 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop();
1786#endif 1986#endif
1987
1787 if (ev.window == TermWin.vt) 1988 if (ev.window == TermWin.vt)
1788 { 1989 {
1990#if ISO_14755
1991 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return;
1994#endif
1789 if (reportmode) 1995 if (reportmode)
1790 { 1996 {
1791 /* mouse report from vt window */ 1997 /* mouse report from vt window */
1792 /* don't report release of wheel "buttons" */ 1998 /* don't report release of wheel "buttons" */
1793 if (ev.button >= 4) 1999 if (ev.button >= 4)
… …
1807 MEvent.button = AnyButton; 2013 MEvent.button = AnyButton;
1808 mouse_report (ev); 2014 mouse_report (ev);
1809#endif /* MOUSE_REPORT_DOUBLECLICK */ 2015#endif /* MOUSE_REPORT_DOUBLECLICK */
1810 return; 2016 return;
1811 } 2017 }
2018
1812 /* 2019 /*
1813 * dumb hack to compensate for the failure of click-and-drag 2020 * dumb hack to compensate for the failure of click-and-drag
1814 * when overriding mouse reporting 2021 * when overriding mouse reporting
1815 */ 2022 */
1816 if (PrivateModes & PrivMode_mouse_report 2023 if (priv_modes & PrivMode_mouse_report
1817 && bypass_keystate 2024 && bypass_keystate
1818 && ev.button == Button1 && MEvent.clicks <= 1) 2025 && ev.button == Button1 && MEvent.clicks <= 1)
1819 selection_extend (ev.x, ev.y, 0); 2026 selection_extend (ev.x, ev.y, 0);
1820 2027
1821 switch (ev.button) 2028 switch (ev.button)
… …
1832 case Button5: 2039 case Button5:
1833 { 2040 {
1834 int i; 2041 int i;
1835 page_dirn v; 2042 page_dirn v;
1836 2043
1837 v = (ev.button == Button4) ? UP : DN; 2044 v = ev.button == Button4 ? UP : DN;
2045
1838 if (ev.state & ShiftMask) 2046 if (ev.state & ShiftMask)
1839 i = 1; 2047 i = 1;
1840 else if ((Options & Opt_mouseWheelScrollPage)) 2048 else if (options & Opt_mouseWheelScrollPage)
1841 i = TermWin.nrow - 1; 2049 i = TermWin.nrow - 1;
1842 else 2050 else
1843 i = 5; 2051 i = 5;
2052
1844# ifdef MOUSE_SLIP_WHEELING 2053# ifdef MOUSE_SLIP_WHEELING
1845 if (ev.state & ControlMask) 2054 if (ev.state & ControlMask)
1846 { 2055 {
1847 mouse_slip_wheel_speed += (v ? -1 : 1); 2056 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2059
2060 if (slip_wheel_ev.at < NOW)
1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062
2063 slip_wheel_ev.start ();
1849 } 2064 }
2065 else
2066 {
1850# endif 2067# endif
1851# ifdef JUMP_MOUSE_WHEEL 2068# 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); 2069 scr_page (v, i);
1859 scr_refresh (SMOOTH_REFRESH); 2070 scr_refresh (SMOOTH_REFRESH);
1860 scrollbar_show (1); 2071 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING
1861 } 2081 }
1862# endif 2082#endif
1863
1864 } 2083 }
1865 break; 2084 break;
1866#endif 2085#endif
1867
1868 } 2086 }
1869 } 2087 }
1870#ifdef MENUBAR 2088#ifdef MENUBAR
1871 else if (isMenuBarWindow (ev.window)) 2089 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev); 2090 menubar_control (ev);
1873#endif 2091#endif
1874} 2092}
1875 2093
1876
1877#ifdef TRANSPARENT 2094#ifdef TRANSPARENT
2095#if TINTING
2096/* taken from aterm-0.4.2 */
2097
2098typedef uint32_t RUINT32T;
2099
2100void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2101{
2102 int sh_r, sh_g, sh_b;
2103 RUINT32T mask_r, mask_g, mask_b;
2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i;
2108
2109 Visual *visual = display->visual;
2110
2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2112
2113 /* for convenience */
2114 mask_r = visual->red_mask;
2115 mask_g = visual->green_mask;
2116 mask_b = visual->blue_mask;
2117
2118 /* boring lookup table pre-initialization */
2119 switch (srcImage->bits_per_pixel) {
2120 case 15:
2121 if ((mask_r != 0x7c00) ||
2122 (mask_g != 0x03e0) ||
2123 (mask_b != 0x001f))
2124 return;
2125 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2126 lookup_r = lookup;
2127 lookup_g = lookup+32;
2128 lookup_b = lookup+32+32;
2129 sh_r = 10;
2130 sh_g = 5;
2131 sh_b = 0;
2132 break;
2133 case 16:
2134 if ((mask_r != 0xf800) ||
2135 (mask_g != 0x07e0) ||
2136 (mask_b != 0x001f))
2137 return;
2138 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2139 lookup_r = lookup;
2140 lookup_g = lookup+32;
2141 lookup_b = lookup+32+64;
2142 sh_r = 11;
2143 sh_g = 5;
2144 sh_b = 0;
2145 break;
2146 case 24:
2147 if ((mask_r != 0xff0000) ||
2148 (mask_g != 0x00ff00) ||
2149 (mask_b != 0x0000ff))
2150 return;
2151 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2152 lookup_r = lookup;
2153 lookup_g = lookup+256;
2154 lookup_b = lookup+256+256;
2155 sh_r = 16;
2156 sh_g = 8;
2157 sh_b = 0;
2158 break;
2159 case 32:
2160 if ((mask_r != 0xff0000) ||
2161 (mask_g != 0x00ff00) ||
2162 (mask_b != 0x0000ff))
2163 return;
2164 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2165 lookup_r = lookup;
2166 lookup_g = lookup+256;
2167 lookup_b = lookup+256+256;
2168 sh_r = 16;
2169 sh_g = 8;
2170 sh_b = 0;
2171 break;
2172 default:
2173 return; /* we do not support this color depth */
2174 }
2175
2176 /* prepare limits for color transformation (each channel is handled separately) */
2177 if (shade < 0) {
2178 shade = -shade;
2179 if (shade < 0) shade = 0;
2180 if (shade > 100) shade = 100;
2181
2182 lower_lim_r = 65535-rm;
2183 lower_lim_g = 65535-gm;
2184 lower_lim_b = 65535-bm;
2185
2186 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2187 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2188 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2189
2190 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2191 } else {
2192 if (shade < 0) shade = 0;
2193 if (shade > 100) shade = 100;
2194
2195 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2196
2197 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2198 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2199 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2200 }
2201
2202 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2203 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2204 {
2205 unsigned int tmp;
2206
2207 tmp = lower_lim_r;
2208 lower_lim_r = lower_lim_b;
2209 lower_lim_b = tmp;
2210
2211 tmp = upper_lim_r;
2212 upper_lim_r = upper_lim_b;
2213 upper_lim_b = tmp;
2214 }
2215
2216 /* fill our lookup tables */
2217 for (i = 0; i <= mask_r>>sh_r; i++)
2218 {
2219 RUINT32T tmp;
2220 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2221 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2222 lookup_r[i] = (tmp/65535)<<sh_r;
2223 }
2224 for (i = 0; i <= mask_g>>sh_g; i++)
2225 {
2226 RUINT32T tmp;
2227 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2228 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2229 lookup_g[i] = (tmp/65535)<<sh_g;
2230 }
2231 for (i = 0; i <= mask_b>>sh_b; i++)
2232 {
2233 RUINT32T tmp;
2234 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2235 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2236 lookup_b[i] = (tmp/65535)<<sh_b;
2237 }
2238
2239 /* apply table to input image (replacing colors by newly calculated ones) */
2240 switch (srcImage->bits_per_pixel)
2241 {
2242 case 15:
2243 {
2244 unsigned short *p1, *pf, *p, *pl;
2245 p1 = (unsigned short *) srcImage->data;
2246 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2247 while (p1 < pf)
2248 {
2249 p = p1;
2250 pl = p1 + srcImage->width;
2251 for (; p < pl; p++)
2252 {
2253 *p = lookup_r[(*p & 0x7c00)>>10] |
2254 lookup_g[(*p & 0x03e0)>> 5] |
2255 lookup_b[(*p & 0x001f)];
2256 }
2257 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2258 }
2259 break;
2260 }
2261 case 16:
2262 {
2263 unsigned short *p1, *pf, *p, *pl;
2264 p1 = (unsigned short *) srcImage->data;
2265 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2266 while (p1 < pf)
2267 {
2268 p = p1;
2269 pl = p1 + srcImage->width;
2270 for (; p < pl; p++)
2271 {
2272 *p = lookup_r[(*p & 0xf800)>>11] |
2273 lookup_g[(*p & 0x07e0)>> 5] |
2274 lookup_b[(*p & 0x001f)];
2275 }
2276 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2277 }
2278 break;
2279 }
2280 case 24:
2281 {
2282 unsigned char *p1, *pf, *p, *pl;
2283 p1 = (unsigned char *) srcImage->data;
2284 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2285 while (p1 < pf)
2286 {
2287 p = p1;
2288 pl = p1 + srcImage->width * 3;
2289 for (; p < pl; p += 3)
2290 {
2291 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2292 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2293 p[2] = lookup_r[(p[2] & 0x0000ff)];
2294 }
2295 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2296 }
2297 break;
2298 }
2299 case 32:
2300 {
2301 RUINT32T *p1, *pf, *p, *pl;
2302 p1 = (RUINT32T *) srcImage->data;
2303 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2304
2305 while (p1 < pf)
2306 {
2307 p = p1;
2308 pl = p1 + srcImage->width;
2309 for (; p < pl; p++)
2310 {
2311 *p = lookup_r[(*p & 0xff0000)>>16] |
2312 lookup_g[(*p & 0x00ff00)>> 8] |
2313 lookup_b[(*p & 0x0000ff)] |
2314 (*p & ~0xffffff);
2315 }
2316 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2317 }
2318 break;
2319 }
2320 }
2321
2322 free (lookup);
2323}
2324#endif
2325
1878/* 2326/*
1879 * Check our parents are still who we think they are. 2327 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 2328 * Do transparency updates if required
1881 */ 2329 */
1882int 2330int
1883rxvt_term::check_our_parents () 2331rxvt_term::check_our_parents ()
1884{ 2332{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 2333 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 2334 unsigned long nitems, bytes_after;
1887 Atom atype; 2335 Atom atype;
1888 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 2337 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
1892 2341
1893 pchanged = 0; 2342 pchanged = 0;
1894 2343
1895 if (! (Options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
1896 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1897 2346
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
1900 2349
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2351
1902 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
1903 { 2353 {
1904 if (am_transparent) 2354 if (am_transparent)
1905 { 2355 {
1906 pchanged = 1; 2356 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
1910 } 2359 }
2360
1911 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
1912 } 2362 }
1913 2363
1914 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
1915 XSync (display->display, False); 2365 XSync (disp, False);
1916 2366
1917 /* 2367 /*
1918 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
1920 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
1921 */ 2371 */
1922 i = (xa[XA_XROOTPMAPID] != 0 2372 i = (xa[XA_XROOTPMAP_ID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 2375 &nitems, &bytes_after, &prop) == Success);
2376
1926 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2378 i = (xa[XA_ESETROOT_PMAP_ID]
2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2381 &nitems, &bytes_after, &prop) == Success);
2382
2383 if (!i || prop == NULL
2384#if TINTING
2385 || !rs[Rs_color + Color_tint]
2386#endif
2387 )
1927 have_pixmap = 0; 2388 have_pixmap = 0;
1928 else 2389 else
1929 { 2390 {
1930 have_pixmap = 1; 2391 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2392 rootpixmap = *(Pixmap *)prop;
1932 XFree (prop); 2393 XFree (prop);
1933 } 2394 }
2395
1934 if (have_pixmap) 2396 if (have_pixmap)
1935 { 2397 {
1936 /* 2398 /*
1937 * Copy display->root pixmap transparency 2399 * Copy display->root pixmap transparency
1938 */ 2400 */
1939 int sx, sy, nx, ny; 2401 int sx, sy, nx, ny;
1940 unsigned int nw, nh; 2402 unsigned int nw, nh;
1941 Window cr; 2403 Window cr;
1942 XImage *image; 2404 XImage *image;
1943 GC gc; 2405 GC gc;
1944 XGCValues gcvalue; 2406 XGCValues gcvalue;
1945 2407
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2412 nx = ny = 0;
2413
1951 if (sx < 0) 2414 if (sx < 0)
1952 { 2415 {
1953 nw += sx; 2416 nw += sx;
1954 nx = -sx; 2417 nx = -sx;
1955 sx = 0; 2418 sx = 0;
1956 } 2419 }
2420
1957 if (sy < 0) 2421 if (sy < 0)
1958 { 2422 {
1959 nh += sy; 2423 nh += sy;
1960 ny = -sy; 2424 ny = -sy;
1961 sy = 0; 2425 sy = 0;
1962 } 2426 }
2427
1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
1965 allowedxerror = -1; 2432 allowedxerror = -1;
1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1967 ZPixmap); 2434
1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1969 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
1970 allowedxerror = 0; 2437 allowedxerror = 0;
2438
1971 if (image == NULL) 2439 if (image == NULL)
1972 { 2440 {
1973 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
1974 { 2442 {
1975 pchanged = 1; 2443 pchanged = 1;
1976 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
1977 { 2445 {
1978 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
1979 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
1980 } 2448 }
1981 } 2449 }
2450
1982 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
1983 } 2452 }
1984 else 2453 else
1985 { 2454 {
1986 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
1987 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2457
2458#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint))
2460 {
2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2463
2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2465
2466 ShadeXImage (display, image, shade, rm, gm, bm);
2467 }
2468#endif
2469
1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1989 (unsigned int)szHint.width,
1990 (unsigned int)szHint.height, 2471 szHint.width, szHint.height, image->depth);
1991 (unsigned int)image->depth);
1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1994 nx, ny, (unsigned int)image->width,
1995 (unsigned int)image->height); 2474 nx, ny, image->width, image->height);
1996 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
1997 XDestroyImage (image); 2476 XDestroyImage (image);
1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1999 TermWin.pixmap); 2478 XClearWindow (disp, TermWin.parent[0]);
2479
2000 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2001 pchanged = 1; 2481 pchanged = 1;
2482
2002 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2003 } 2484 }
2004 } 2485 }
2486
2005 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2006 { 2490 {
2007 unsigned int n; 2491 unsigned int n;
2008 /* 2492 /*
2009 * InheritPixmap transparency 2493 * InheritPixmap transparency
2010 */ 2494 */
2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2013 i++)
2014 { 2496 {
2015 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2016 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2017 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2018 XFree (list); 2500 XFree (list);
2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2501
2020 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2021 { 2503 {
2022 if (oldp != None) 2504 if (oldp != None)
2023 pchanged = 1; 2505 pchanged = 1;
2506
2024 break; 2507 break;
2025 } 2508 }
2509
2026 if (oldp != TermWin.parent[i]) 2510 if (oldp != TermWin.parent[i])
2027 pchanged = 1; 2511 pchanged = 1;
2028 } 2512 }
2513
2029 n = 0; 2514 n = 0;
2515
2030 if (pchanged) 2516 if (pchanged)
2031 { 2517 {
2032 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2033 { 2519 {
2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 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) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2037 { 2522 {
2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2039 break; 2524 break;
2040 } 2525 }
2041 } 2526 }
2042 } 2527 }
2043 if (n > (int) (sizeof (TermWin.parent) 2528
2044 / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2045 { 2530 {
2046 D_X ((stderr, "InheritPixmap Turning off")); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2047 XSetWindowBackground (display->display, TermWin.parent[0], 2532 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; 2533 am_transparent = 0;
2052 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2053 } 2535 }
2054 else 2536 else
2055 { 2537 {
2538#if WAIT_FOR_WM
2056 /* wait (an arbitrary period) for the WM to do its thing 2539 /* wait (an arbitrary period) for the WM to do its thing
2057 * needed for fvwm2.2.2 (and before?) */ 2540 * 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); 2541 sleep (1);
2066# endif 2542#endif
2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2068 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2544 {
2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2070 ParentRelative); 2546 XClearWindow (disp, TermWin.parent[n]);
2547 }
2548
2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2072 ParentRelative);
2073 am_transparent = 1; 2550 am_transparent = 1;
2074 } 2551 }
2552
2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2076 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2077 } 2555 }
2556
2557 if (scrollBar.win)
2558 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle ();
2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2569 }
2570
2078 return pchanged; 2571 return pchanged;
2079} 2572}
2080#endif 2573#endif
2081 2574
2082/*}}} */ 2575/*}}} */
2576
2577bool
2578rxvt_term::cmd_parse ()
2579{
2580 bool flag = false;
2581 unicode_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here
2583
2584 for (;;)
2585 {
2586 if (ch == NOCHAR)
2587 {
2588 seq_begin = cmdbuf_ptr;
2589 ch = next_char ();
2590 }
2591
2592 if (ch == NOCHAR) // TODO: improve
2593 break;
2594
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 {
2597 if (!seen_input)
2598 {
2599 seen_input = 1;
2600 // many badly-written programs (e.g. jed) contain a race condition:
2601 // they first read the screensize and then install a SIGWINCH handler.
2602 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized.
2607 if (seen_resize)
2608 kill (-cmd_pid, SIGWINCH);
2609 }
2610
2611 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false;
2614 int nlines = 0;
2615 unicode_t *str = buf;
2616
2617 for (;;)
2618 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break;
2621
2622 *str++ = ch;
2623
2624 if (ch == C0_LF)
2625 {
2626 nlines++;
2627 refresh_count++;
2628
2629 if (!(options & Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2631 {
2632 refreshnow = true;
2633 ch = NOCHAR;
2634 break;
2635 }
2636
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2638 if (nlines >= TermWin.nrow - 1)
2639 {
2640 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0;
2642 str = buf;
2643 }
2644 }
2645
2646 if (str >= buf + UBUFSIZ)
2647 {
2648 ch = NOCHAR;
2649 break;
2650 }
2651
2652 seq_begin = cmdbuf_ptr;
2653 ch = next_char ();
2654 }
2655
2656 scr_add_lines (buf, nlines, str - buf);
2657
2658 /*
2659 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling.
2663 */
2664 if (refreshnow)
2665 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++;
2668 else
2669 {
2670 flag = true;
2671 scr_refresh (refresh_type);
2672 }
2673 }
2674
2675 }
2676 else
2677 {
2678 try
2679 {
2680 process_nonprinting (ch);
2681 }
2682 catch (const class out_of_input &o)
2683 {
2684 // we ran out of input, retry later
2685 cmdbuf_ptr = seq_begin;
2686 break;
2687 }
2688
2689 ch = NOCHAR;
2690 }
2691 }
2692
2693 return flag;
2694}
2695
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character
2706unicode_t
2707rxvt_term::next_char ()
2708{
2709 while (cmdbuf_ptr < cmdbuf_endp)
2710 {
2711 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++;
2714
2715 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717
2718 if (len == (size_t)-2)
2719 {
2720 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp;
2722 break;
2723 }
2724
2725 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727
2728 // assume wchar == unicode
2729 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK;
2731 }
2732
2733 return NOCHAR;
2734}
2735
2736/* rxvt_cmd_getc () - Return next input character */
2737/*
2738 * Return the next input character after first passing any keyboard input
2739 * to the command.
2740 */
2741unicode_t
2742rxvt_term::cmd_getc ()
2743{
2744 unicode_t c = next_char ();
2745
2746 if (c == NOCHAR)
2747 throw out_of_input;
2748
2749 return c;
2750}
2751
2752unicode_t
2753rxvt_term::cmd_get8 ()
2754{
2755 unicode_t c = next_octet ();
2756
2757 if (c == NOCHAR)
2758 throw out_of_input;
2759
2760 return c;
2761}
2083 2762
2084/*{{{ print pipe */ 2763/*{{{ print pipe */
2085/*----------------------------------------------------------------------*/ 2764/*----------------------------------------------------------------------*/
2086#ifdef PRINTPIPE 2765#ifdef PRINTPIPE
2087FILE * 2766FILE *
2088rxvt_term::popen_printer () 2767rxvt_term::popen_printer ()
2089{ 2768{
2090 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2769 FILE *stream = popen (rs[Rs_print_pipe], "w");
2091 2770
2092 if (stream == NULL) 2771 if (stream == NULL)
2093 rxvt_print_error ("can't open printer pipe"); 2772 rxvt_warn ("can't open printer pipe, not printing.\n");
2773
2094 return stream; 2774 return stream;
2095} 2775}
2096 2776
2097int 2777int
2098rxvt_term::pclose_printer (FILE *stream) 2778rxvt_term::pclose_printer (FILE *stream)
2099{ 2779{
2100 fflush (stream); 2780 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); 2781 return pclose (stream);
2107# endif
2108} 2782}
2109 2783
2110/* 2784/*
2111 * simulate attached vt100 printer 2785 * simulate attached vt100 printer
2112 */ 2786 */
2113void 2787void
2114rxvt_term::process_print_pipe () 2788rxvt_term::process_print_pipe ()
2115{ 2789{
2116 int done; 2790 int done;
2117 FILE *fd; 2791 FILE *fd;
2118 2792
2119 if ((fd = popen_printer ()) == NULL) 2793 if ((fd = popen_printer ()) == NULL)
2120 return; 2794 return;
2121 2795
2122 /* 2796 /*
2123 * Send all input to the printer until either ESC[4i or ESC[?4i 2797 * Send all input to the printer until either ESC[4i or ESC[?4i
2124 * is received. 2798 * is received.
2125 */ 2799 */
2126 for (done = 0; !done;) 2800 for (done = 0; !done;)
2127 { 2801 {
2128 unsigned char buf[8]; 2802 unsigned char buf[8];
2129 unsigned char ch; 2803 unicode_t ch;
2130 unsigned int i, len; 2804 unsigned int i, len;
2131 2805
2132 if ((ch = cmd_getc ()) != C0_ESC) 2806 if ((ch = cmd_getc ()) != C0_ESC)
2133 { 2807 {
2134 if (putc (ch, fd) == EOF) 2808 if (putc (ch, fd) == EOF)
2135 break; /* done = 1 */ 2809 break; /* done = 1 */
… …
2150 { 2824 {
2151 if ((buf[len++] = cmd_getc ()) == 'i') 2825 if ((buf[len++] = cmd_getc ()) == 'i')
2152 break; /* done = 1 */ 2826 break; /* done = 1 */
2153 } 2827 }
2154 } 2828 }
2829
2155 for (i = 0; i < len; i++) 2830 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF) 2831 if (putc (buf[i], fd) == EOF)
2157 { 2832 {
2158 done = 1; 2833 done = 1;
2159 break; 2834 break;
2160 } 2835 }
2161 } 2836 }
2162 } 2837 }
2838
2163 pclose_printer (fd); 2839 pclose_printer (fd);
2164} 2840}
2165#endif /* PRINTPIPE */ 2841#endif /* PRINTPIPE */
2166/*}}} */ 2842/*}}} */
2167 2843
2168/* *INDENT-OFF* */ 2844/* *INDENT-OFF* */
2169enum { 2845enum {
2170 C1_40 = 0x40, 2846 C1_40 = 0x40,
2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2847 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, 2848 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, 2849 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 2850 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2175}; 2851};
2176/* *INDENT-ON* */ 2852/* *INDENT-ON* */
2177 2853
2178/*{{{ process non-printing single characters */ 2854/*{{{ process non-printing single characters */
2179void 2855void
2180rxvt_term::process_nonprinting (unsigned char ch) 2856rxvt_term::process_nonprinting (unicode_t ch)
2181{ 2857{
2182 switch (ch) 2858 switch (ch)
2183 { 2859 {
2860 case C0_ESC:
2861 process_escape_seq ();
2862 break;
2184 case C0_ENQ: /* terminal Status */ 2863 case C0_ENQ: /* terminal Status */
2185 if (rs[Rs_answerbackstring]) 2864 if (rs[Rs_answerbackstring])
2186 tt_write (
2187 (const unsigned char *)rs[Rs_answerbackstring], 2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2188 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2189 else 2867 else
2190 tt_write ((unsigned char *)VT100_ANS, 2868 tt_write ((unsigned char *)VT100_ANS,
2191 (unsigned int)STRLEN (VT100_ANS)); 2869 (unsigned int)strlen (VT100_ANS));
2192 break; 2870 break;
2193 case C0_BEL: /* bell */ 2871 case C0_BEL: /* bell */
2194 scr_bell (); 2872 scr_bell ();
2195 break; 2873 break;
2196 case C0_BS: /* backspace */ 2874 case C0_BS: /* backspace */
… …
2211 scr_charset_choose (1); 2889 scr_charset_choose (1);
2212 break; 2890 break;
2213 case C0_SI: /* shift in - acs */ 2891 case C0_SI: /* shift in - acs */
2214 scr_charset_choose (0); 2892 scr_charset_choose (0);
2215 break; 2893 break;
2894
2895#ifdef EIGHT_BIT_CONTROLS
2896 // 8-bit controls
2897 case 0x90: /* DCS */
2898 process_dcs_seq ();
2899 break;
2900 case 0x9b: /* CSI */
2901 process_csi_seq ();
2902 break;
2903 case 0x9d: /* CSI */
2904 process_osc_seq ();
2905 break;
2906#endif
2216 } 2907 }
2217} 2908}
2218/*}}} */ 2909/*}}} */
2219 2910
2220 2911
2221/*{{{ process VT52 escape sequences */ 2912/*{{{ process VT52 escape sequences */
2222void 2913void
2223rxvt_term::process_escape_vt52 (unsigned char ch) 2914rxvt_term::process_escape_vt52 (unicode_t ch)
2224{ 2915{
2225 int row, col; 2916 int row, col;
2226 2917
2227 switch (ch) 2918 switch (ch)
2228 { 2919 {
… …
2280 2971
2281/*{{{ process escape sequences */ 2972/*{{{ process escape sequences */
2282void 2973void
2283rxvt_term::process_escape_seq () 2974rxvt_term::process_escape_seq ()
2284{ 2975{
2285 unsigned char ch = cmd_getc (); 2976 unicode_t ch = cmd_getc ();
2286 2977
2287 if (PrivateModes & PrivMode_vt52) 2978 if (priv_modes & PrivMode_vt52)
2288 { 2979 {
2289 process_escape_vt52 (ch); 2980 process_escape_vt52 (ch);
2290 return; 2981 return;
2291 } 2982 }
2292 2983
… …
2307 scr_charset_set (2, (unsigned int)cmd_getc ()); 2998 scr_charset_set (2, (unsigned int)cmd_getc ());
2308 break; 2999 break;
2309 case '+': 3000 case '+':
2310 scr_charset_set (3, (unsigned int)cmd_getc ()); 3001 scr_charset_set (3, (unsigned int)cmd_getc ());
2311 break; 3002 break;
2312#ifndef NO_FRILLS 3003#if ENABLE_FRILLS
2313 case '6': 3004 case '6':
2314 scr_backindex (); 3005 scr_backindex ();
2315 break; 3006 break;
2316#endif 3007#endif
2317 case '7': 3008 case '7':
2318 scr_cursor (SAVE); 3009 scr_cursor (SAVE);
2319 break; 3010 break;
2320 case '8': 3011 case '8':
2321 scr_cursor (RESTORE); 3012 scr_cursor (RESTORE);
2322 break; 3013 break;
2323#ifndef NO_FRILLS 3014#if ENABLE_FRILLS
2324 case '9': 3015 case '9':
2325 scr_forwardindex (); 3016 scr_forwardindex ();
2326 break; 3017 break;
2327#endif 3018#endif
2328 case '=': 3019 case '=':
… …
2338 break; 3029 break;
2339 3030
2340 /* 8.3.87: NEXT LINE */ 3031 /* 8.3.87: NEXT LINE */
2341 case C1_NEL: /* ESC E */ 3032 case C1_NEL: /* ESC E */
2342 { 3033 {
2343 uint32_t nlcr[] = { '\n', '\r' }; 3034 unicode_t nlcr[] = { C0_LF, C0_CR };
2344 scr_add_lines (nlcr, 1, 2); 3035 scr_add_lines (nlcr, 1, 2);
2345 } 3036 }
2346 break; 3037 break;
2347 3038
2348 /* kidnapped escape sequence: Should be 8.3.48 */ 3039 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2359 case C1_RI: /* ESC M */ 3050 case C1_RI: /* ESC M */
2360 scr_index (DN); 3051 scr_index (DN);
2361 break; 3052 break;
2362 3053
2363 /* 8.3.142: SINGLE-SHIFT TWO */ 3054 /* 8.3.142: SINGLE-SHIFT TWO */
2364 /*case C1_SS2: scr_single_shift (2); break; */ 3055 /*case C1_SS2: scr_single_shift (2); break; */
2365 3056
2366 /* 8.3.143: SINGLE-SHIFT THREE */ 3057 /* 8.3.143: SINGLE-SHIFT THREE */
2367 /*case C1_SS3: scr_single_shift (3); break; */ 3058 /*case C1_SS3: scr_single_shift (3); break; */
2368 3059
2369 /* 8.3.27: DEVICE CONTROL STRING */ 3060 /* 8.3.27: DEVICE CONTROL STRING */
2370 case C1_DCS: /* ESC P */ 3061 case C1_DCS: /* ESC P */
2371 process_dcs_seq (); 3062 process_dcs_seq ();
2372 break; 3063 break;
… …
2387 process_osc_seq (); 3078 process_osc_seq ();
2388 break; 3079 break;
2389 3080
2390 /* 8.3.106: RESET TO INITIAL STATE */ 3081 /* 8.3.106: RESET TO INITIAL STATE */
2391 case 'c': 3082 case 'c':
3083 mbstate.reset ();
2392 scr_poweron (); 3084 scr_poweron ();
2393 scrollbar_show (1); 3085 scrollbar_show (1);
2394 break; 3086 break;
2395 3087
2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3088 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2408 3100
2409/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3101/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2410/* *INDENT-OFF* */ 3102/* *INDENT-OFF* */
2411enum { 3103enum {
2412 CSI_ICH = 0x40, 3104 CSI_ICH = 0x40,
2413 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3105 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 , 3106 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, 3107 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, 3108 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, 3109 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, 3110 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, */ 3125 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, [, \, ], ^, _, */ 3126 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, */ 3127 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, */ 3128 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, */ 3129 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, {, |, }, ~, */ 3130 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2439 }; 3131 };
2440/* *INDENT-ON* */ 3132/* *INDENT-ON* */
2441 3133
2442void 3134void
2443rxvt_term::process_csi_seq () 3135rxvt_term::process_csi_seq ()
2444{ 3136{
2445 unsigned char ch, priv, i; 3137 unicode_t ch, priv, i;
2446 unsigned int nargs, p; 3138 unsigned int nargs, p;
2447 int n, ndef; 3139 int n, ndef;
2448 int arg[ESC_ARGS]; 3140 int arg[ESC_ARGS];
2449 3141
2450 for (nargs = ESC_ARGS; nargs > 0;) 3142 for (nargs = ESC_ARGS; nargs > 0;)
2451 arg[--nargs] = 0; 3143 arg[--nargs] = 0;
2452 3144
2453 priv = 0; 3145 priv = 0;
… …
2455 if (ch >= '<' && ch <= '?') 3147 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */ 3148 { /* '<' '=' '>' '?' */
2457 priv = ch; 3149 priv = ch;
2458 ch = cmd_getc (); 3150 ch = cmd_getc ();
2459 } 3151 }
3152
2460 /* read any numerical arguments */ 3153 /* read any numerical arguments */
2461 for (n = -1; ch < CSI_ICH; ) 3154 for (n = -1; ch < CSI_ICH; )
2462 { 3155 {
2463 if (isdigit (ch)) 3156 if (isdigit (ch))
2464 { 3157 {
… …
2471 { 3164 {
2472 if (nargs < ESC_ARGS) 3165 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 3166 arg[nargs++] = n;
2474 n = -1; 3167 n = -1;
2475 } 3168 }
2476 else if (ch == '\b') 3169 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); 3170 process_nonprinting (ch);
2488 } 3171
2489 ch = cmd_getc (); 3172 ch = cmd_getc ();
2490 } 3173 }
2491 3174
2492 if (ch > CSI_7F) 3175 if (ch > CSI_7F)
2493 return; 3176 return;
… …
2515 { 3198 {
2516 switch (priv) 3199 switch (priv)
2517 { 3200 {
2518 case '>': 3201 case '>':
2519 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
2520 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2521 break; 3204 break;
2522 case '?': 3205 case '?':
2523 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2524 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
2525 break; 3208 break;
… …
2635 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2636 break; 3319 break;
2637 3320
2638 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2639 tt_write ((const unsigned char *)VT100_ANS, 3322 tt_write ((const unsigned char *)VT100_ANS,
2640 (unsigned int) (sizeof (VT100_ANS) - 1)); 3323 (unsigned int) (sizeof (VT100_ANS) - 1));
2641 break; 3324 break;
2642 3325
2643 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2644 process_sgr_mode (nargs, arg); 3327 process_sgr_mode (nargs, arg);
2645 break; 3328 break;
… …
2651 tt_printf ("\033[0n"); 3334 tt_printf ("\033[0n");
2652 break; 3335 break;
2653 case 6: /* CPR requested */ 3336 case 6: /* CPR requested */
2654 scr_report_position (); 3337 scr_report_position ();
2655 break; 3338 break;
2656#if defined (ENABLE_DISPLAY_ANSWER)
2657 case 7: /* unofficial extension */ 3339 case 7: /* unofficial extension */
3340 if (options & Opt_insecure)
2658 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3341 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2659 break; 3342 break;
2660#endif
2661 case 8: /* unofficial extension */ 3343 case 8: /* unofficial extension */
2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break; 3345 break;
2664 } 3346 }
2665 break; 3347 break;
2666 3348
2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3349 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2700 break; 3382 break;
2701 3383
2702 case CSI_RM: /* 8.3.107: RESET MODE */ 3384 case CSI_RM: /* 8.3.107: RESET MODE */
2703 if (arg[0] == 4) 3385 if (arg[0] == 4)
2704 scr_insert_mode (0); 3386 scr_insert_mode (0);
3387 else if (arg[0] == 20)
3388 priv_modes &= ~PrivMode_LFNL;
2705 break; 3389 break;
2706 3390
2707 case CSI_SM: /* 8.3.126: SET MODE */ 3391 case CSI_SM: /* 8.3.126: SET MODE */
2708 if (arg[0] == 4) 3392 if (arg[0] == 4)
2709 scr_insert_mode (1); 3393 scr_insert_mode (1);
3394 else if (arg[0] == 20)
3395 priv_modes |= PrivMode_LFNL;
2710 break; 3396 break;
2711 3397
2712 /* 3398 /*
2713 * PRIVATE USE beyond this point. All CSI_7? sequences here 3399 * PRIVATE USE beyond this point. All CSI_7? sequences here
2714 */ 3400 */
… …
2726 break; 3412 break;
2727 case CSI_75: 3413 case CSI_75:
2728 scr_cursor (RESTORE); 3414 scr_cursor (RESTORE);
2729 break; 3415 break;
2730 3416
2731#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2732 case CSI_74: 3418 case CSI_74:
2733 process_window_ops (arg, nargs); 3419 process_window_ops (arg, nargs);
2734 break; 3420 break;
2735#endif 3421#endif
2736 3422
2737 case CSI_78: /* DECREQTPARM */ 3423 case CSI_78: /* DECREQTPARM */
2738 if (arg[0] == 0 || arg[0] == 1) 3424 if (arg[0] == 0 || arg[0] == 1)
2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3425 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2740 /* FALLTHROUGH */ 3426 break;
2741 3427
2742 default: 3428 default:
2743 break; 3429 break;
2744 } 3430 }
2745} 3431}
2746/*}}} */ 3432/*}}} */
2747 3433
2748#ifndef NO_FRILLS 3434#if ENABLE_FRILLS
2749/* ARGSUSED */ 3435/* ARGSUSED */
2750void 3436void
2751rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2752{ 3438{
2753 int x, y; 3439 int x, y;
2754#if 0
2755 char *s;
2756#endif
2757 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
2758 Window wdummy; 3441 Window wdummy;
3442 dDisp;
2759 3443
2760 if (nargs == 0) 3444 if (nargs == 0)
2761 return; 3445 return;
3446
2762 switch (args[0]) 3447 switch (args[0])
2763 { 3448 {
2764 /* 3449 /*
2765 * commands 3450 * commands
2766 */ 3451 */
2767 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
2768 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
2769 break; 3454 break;
2770 case 2: /* iconify window */ 3455 case 2: /* iconify window */
2771 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2772 DefaultScreen (display->display));
2773 break; 3457 break;
2774 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
2775 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2776 break; 3460 break;
2777 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
2778 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2779 break; 3463 break;
2780 case 5: /* raise window */ 3464 case 5: /* raise window */
2781 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
2782 break; 3466 break;
2783 case 6: /* lower window */ 3467 case 6: /* lower window */
2784 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
2785 break; 3469 break;
2786 case 7: /* refresh window */ 3470 case 7: /* refresh window */
2787 scr_touch (true); 3471 scr_touch (true);
2788 break; 3472 break;
2789 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2791 (unsigned int) (args[1] * TermWin.fheight)); 3475 (unsigned int) (args[1] * TermWin.fheight));
2792 break; 3476 break;
3477
3478 //case 9: NYI, TODO, restore maximized window or maximize window
2793 default: 3479 default:
2794 if (args[0] >= 24) /* set height (chars) */ 3480 if (args[0] >= 24) /* set height (chars) */
2795 set_widthheight ((unsigned int)TermWin.width, 3481 set_widthheight ((unsigned int)TermWin.width,
2796 (unsigned int) (args[1] * TermWin.fheight)); 3482 (unsigned int) (args[1] * TermWin.fheight));
2797 break; 3483 break;
3484
3485
2798 /* 3486 /*
2799 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
2800 */ 3488 */
2801 case 11: /* report window state */ 3489 case 11: /* report window state */
2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2804 break; 3492 break;
2805 case 13: /* report window position */ 3493 case 13: /* report window position */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2808 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
2809 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
2810 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
2811 break; 3499 break;
2812 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2815 break; 3503 break;
2816 case 18: /* report window size (chars) */ 3504 case 18: /* report text area size (chars) */
2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3506 break;
2819#if 0 /* XXX: currently disabled due to security concerns */ 3507 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3509 break;
2820 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3511 {
3512 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s);
3516 }
2823 break; 3517 break;
2824 case 21: /* report window title */ 3518 case 21: /* report window title */
3519 {
3520 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s);
3524 }
2827 break; 3525 break;
2828#endif
2829
2830 } 3526 }
2831} 3527}
2832#endif 3528#endif
2833 3529
2834/*----------------------------------------------------------------------*/ 3530/*----------------------------------------------------------------------*/
2835/* 3531/*
2836 * get input up until STRING TERMINATOR (or BEL) 3532 * get input up until STRING TERMINATOR (or BEL)
2837 * ends_how is terminator used. returned input must be free ()d 3533 * ends_how is terminator used. returned input must be free()'d
2838 */ 3534 */
2839unsigned char * 3535unsigned char *
2840rxvt_term::get_to_st (unsigned char *ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
2841{ 3537{
2842 int seen_esc = 0; /* seen escape? */ 3538 unicode_t ch;
3539 bool seen_esc = false;
2843 unsigned int n = 0; 3540 unsigned int n = 0;
2844 unsigned char *s; 3541 wchar_t string[STRING_MAX];
2845 unsigned char ch, string[STRING_MAX];
2846 3542
2847 for (; (ch = cmd_getc ());) 3543 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3544 {
2849 if (ch == C0_BEL 3545 if (seen_esc)
2850 || ch == CHAR_ST 3546 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3547 if (ch == 0x5c) /* 7bit ST */
2852 break; 3548 break;
3549 else
3550 return NULL;
3551 }
2853 if (ch == C0_ESC) 3552 else if (ch == C0_ESC)
2854 { 3553 {
2855 seen_esc = 1; 3554 seen_esc = true;
2856 continue; 3555 continue;
2857 } 3556 }
2858 else if (ch == '\t') 3557 else if (ch == C0_BEL || ch == CHAR_ST)
2859 ch = ' '; /* translate '\t' to space */ 3558 break;
2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3559 else if (ch < 0x20)
2861 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3561
3562 seen_esc = false;
3563
2862 if (n < sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3565 // stop at some sane length
3566 return NULL;
3567
3568 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 ();
3570 else
2863 string[n++] = ch; 3571 string[n++] = ch;
2864 seen_esc = 0;
2865 } 3572 }
3573
2866 string[n++] = '\0'; 3574 string[n++] = '\0';
2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3575
2868 return NULL;
2869 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
2870 STRNCPY (s, string, n); 3577
2871 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
2872} 3579}
2873 3580
2874/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
2875/* 3582/*
2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2877 */ 3584 */
2878void 3585void
2879rxvt_term::process_dcs_seq () 3586rxvt_term::process_dcs_seq ()
2880{ 3587{
2881 unsigned char eh, *s; 3588 unsigned char *s;
3589 unicode_t eh;
3590
2882 /* 3591 /*
2883 * Not handled yet 3592 * Not handled yet
2884 */ 3593 */
2885 s = get_to_st (&eh); 3594 s = get_to_st (eh);
2886 if (s) 3595 if (s)
2887 free (s); 3596 free (s);
3597
2888 return; 3598 return;
2889} 3599}
2890 3600
2891/*----------------------------------------------------------------------*/ 3601/*----------------------------------------------------------------------*/
2892/* 3602/*
2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3603 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2894 */ 3604 */
2895void 3605void
2896rxvt_term::process_osc_seq () 3606rxvt_term::process_osc_seq ()
2897{ 3607{
2898 unsigned char ch, eh, *s; 3608 unicode_t ch, eh;
2899 int arg; 3609 int arg;
2900 3610
2901 ch = cmd_getc (); 3611 ch = cmd_getc ();
2902 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3612 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2903 arg = arg * 10 + (ch - '0'); 3613 arg = arg * 10 + (ch - '0');
2904 3614
2905 if (ch == ';') 3615 if (ch == ';')
2906 { 3616 {
2907 s = get_to_st (&eh); 3617 unsigned char *s = get_to_st (eh);
3618
2908 if (s) 3619 if (s)
2909 { 3620 {
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); 3621 process_xterm_seq (arg, (char *)s, eh);
2922 free (s); 3622 free (s);
2923 } 3623 }
2924 } 3624 }
2925} 3625}
3626
3627void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3629{
3630 if (str[0] == '?' && !str[1])
3631 {
3632 unsigned short r, g, b;
3633 pix_colors_focused[color].get (display, r, g, b);
3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3635 }
3636 else
3637 set_window_color (color, str);
3638}
3639
2926/* 3640/*
2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2928 * 0 = change iconName/title 3642 * 0 = change iconName/title
2929 * 1 = change iconName 3643 * 1 = change iconName
2930 * 2 = change title 3644 * 2 = change title
2931 * 4 = change color 3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
2932 * 12 = change text color 3648 * 12 = change text color
2933 * 13 = change mouse foreground color 3649 * 13 = change mouse foreground color
2934 * 17 = change highlight character colour 3650 * 17 = change highlight character colour
2935 * 18 = change bold character color 3651 * 18 = change bold character color
2936 * 19 = change underlined character color 3652 * 19 = change underlined character color
2937 * 46 = change logfile (not implemented) 3653 * 46 = change logfile (not implemented)
2938 * 50 = change font 3654 * 50 = change font
2939 * 3655 *
2940 * rxvt extensions: 3656 * rxvt extensions:
2941 * 9 = change locale (NYI)
2942 * 10 = menu (may change in future)
2943 * 20 = bg pixmap 3657 * 20 = bg pixmap
2944 * 39 = change default fg color 3658 * 39 = change default fg color
2945 * 49 = change default bg color 3659 * 49 = change default bg color
2946 * 55 = dump scrollback buffer and all of screen 3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
2947 */ 3664 */
2948void 3665void
2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2950{ 3667{
2951 int changed = 0; 3668 int changed = 0;
2952 int color; 3669 int color;
2953 char *buf, *name; 3670 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1];
3672 int saveop = op;
3673 dDisp;
2954 3674
2955 assert (str != NULL); 3675 assert (str != NULL);
2956 switch (op) 3676 switch (op)
2957 { 3677 {
2958 case XTerm_name: 3678 case XTerm_name:
2959 set_title (str); 3679 set_title (str);
2960 /* FALLTHROUGH */ 3680 /* FALLTHROUGH */
2961 case XTerm_iconName: 3681 case XTerm_iconName:
2962 set_iconName (str); 3682 set_icon_name (str);
2963 break; 3683 break;
2964 case XTerm_title: 3684 case XTerm_title:
2965 set_title (str); 3685 set_title (str);
2966 break; 3686 break;
3687 case XTerm_property:
3688 if (str[0] == '?')
3689 {
3690 Atom prop = display->atom (str + 1);
3691 Atom actual_type;
3692 int actual_format;
3693 unsigned long nitems;
3694 unsigned long bytes_after;
3695 unsigned char *value = 0;
3696 const char *str = "";
3697
3698 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None
3704 && actual_format == 8)
3705 str = (const char *)(value);
3706
3707 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3708
3709 XFree (value);
3710 }
3711 else
3712 {
3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3714
3715 if (eq)
3716 {
3717 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1);
3719 }
3720 else
3721 XDeleteProperty (disp, TermWin.parent[0],
3722 display->atom (str));
3723 }
3724 break;
3725
2967 case XTerm_Color: 3726 case XTerm_Color:
2968 for (buf = (char *)str; buf && *buf;) 3727 for (buf = (char *)str; buf && *buf;)
2969 { 3728 {
2970 if ((name = STRCHR (buf, ';')) == NULL) 3729 if ((name = strchr (buf, ';')) == NULL)
2971 break; 3730 break;
3731
2972 *name++ = '\0'; 3732 *name++ = '\0';
2973 color = atoi (buf); 3733 color = atoi (buf);
3734
2974 if (color < 0 || color >= TOTAL_COLORS) 3735 if (color < 0 || color >= TOTAL_COLORS)
2975 break; 3736 break;
3737
2976 if ((buf = STRCHR (name, ';')) != NULL) 3738 if ((buf = strchr (name, ';')) != NULL)
2977 *buf++ = '\0'; 3739 *buf++ = '\0';
3740
3741 if (name[0] == '?' && !name[1])
3742 {
3743 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 }
3747 else
2978 set_window_color (color + minCOLOR, name); 3748 set_window_color (color + minCOLOR, name);
2979 } 3749 }
3750 break;
3751 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3753 break;
3754 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2980 break; 3756 break;
2981#ifndef NO_CURSORCOLOR 3757#ifndef NO_CURSORCOLOR
2982 case XTerm_Color_cursor: 3758 case XTerm_Color_cursor:
2983 set_window_color (Color_cursor, str); 3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2984 break; 3760 break;
2985#endif 3761#endif
2986 case XTerm_Color_pointer: 3762 case XTerm_Color_pointer_fg:
2987 set_window_color (Color_pointer, str); 3763 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3764 break;
3765 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2988 break; 3767 break;
2989#ifndef NO_BOLD_UNDERLINE_REVERSE 3768#ifndef NO_BOLD_UNDERLINE_REVERSE
2990 case XTerm_Color_BD: 3769 case XTerm_Color_BD:
2991 set_window_color (Color_BD, str); 3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
2992 break; 3774 break;
2993 case XTerm_Color_UL: 3775 case XTerm_Color_UL:
2994 set_window_color (Color_UL, str); 3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2995 break; 3777 break;
2996 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
2997 set_window_color (Color_RV, str); 3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2998 break; 3780 break;
2999#endif 3781#endif
3000 3782#if TRANSPARENT && TINTING
3001 case XTerm_Menu: 3783 case XTerm_Color_tint:
3002 /* 3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3003 * rxvt_menubar_dispatch () violates the constness of the string, 3785 check_our_parents ();
3004 * so DON'T do it here 3786 if (am_transparent)
3005 */ 3787 want_full_refresh = want_refresh = 1;
3006 break; 3788 break;
3789#endif
3790
3007 case XTerm_Pixmap: 3791 case XTerm_Pixmap:
3008 if (*str != ';') 3792 if (*str != ';')
3009 { 3793 {
3010#if XPM_BACKGROUND 3794#if XPM_BACKGROUND
3011 scale_pixmap (""); /* reset to default scaling */ 3795 scale_pixmap (""); /* reset to default scaling */
3012 set_bgPixmap (str); /* change pixmap */ 3796 set_bgPixmap (str); /* change pixmap */
3013#endif 3797#endif
3014 scr_touch (true); 3798 scr_touch (true);
3015 } 3799 }
3016 while ((str = STRCHR (str, ';')) != NULL) 3800 while ((str = strchr (str, ';')) != NULL)
3017 { 3801 {
3018 str++; 3802 str++;
3019#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3020 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3021#endif 3805#endif
3022
3023 } 3806 }
3807
3024 if (changed) 3808 if (changed)
3025 { 3809 {
3026#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3027 resize_pixmap (); 3811 resize_pixmap ();
3028#endif 3812#endif
… …
3034 set_window_color (Color_fg, str); 3818 set_window_color (Color_fg, str);
3035 break; 3819 break;
3036 case XTerm_restoreBG: 3820 case XTerm_restoreBG:
3037 set_window_color (Color_bg, str); 3821 set_window_color (Color_bg, str);
3038 break; 3822 break;
3823
3039 case XTerm_logfile: 3824 case XTerm_logfile:
3825 // TODO, when secure mode?
3040 break; 3826 break;
3827
3041 case XTerm_font: 3828 case XTerm_font:
3042 change_font (str); 3829 op = URxvt_font;
3830 case URxvt_font:
3831#if ENABLE_STYLES
3832 case URxvt_boldFont:
3833 case URxvt_italicFont:
3834 case URxvt_boldItalicFont:
3835#endif
3836 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3840 resp);
3841 else
3842 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844
3845 res = strdup (str);
3846 allocated.push_back ((void *)res);
3847 set_fonts ();
3848 }
3043 break; 3849 break;
3044#ifndef NO_FRILLS 3850
3851#if ENABLE_FRILLS
3045 case XTerm_locale: 3852 case XTerm_locale:
3046 if (str[0] == '?' && !str[1]) 3853 if (query)
3047 tt_printf ("%-.250s\n", locale); 3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3048 else 3855 else
3049 { 3856 {
3050 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3051# ifdef USE_XIM 3859# ifdef USE_XIM
3052 im_cb (); 3860 im_cb ();
3053# endif 3861# 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 } 3862 }
3059 break; 3863 break;
3864#endif
3865
3866#ifdef MENUBAR
3867 case XTerm_Menu:
3868 if (options & Opt_insecure)
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3870 break;
3060#endif 3871#endif
3061#if 0 3872#if 0
3062 case XTerm_dumpscreen: /* no error notices */ 3873 case XTerm_dumpscreen: /* no error notices */
3063 { 3874 {
3064 int fd; 3875 int fd;
3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3066 { 3877 {
3067 scr_dump (fd); 3878 scr_dump (fd);
3068 close (fd); 3879 close (fd);
3069 } 3880 }
3070 } 3881 }
3071 break; 3882 break;
3072#endif 3883#endif
3073
3074 } 3884 }
3075} 3885}
3076/*----------------------------------------------------------------------*/ 3886/*----------------------------------------------------------------------*/
3077 3887
3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3888/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3086 * so no need for fancy checking 3896 * so no need for fancy checking
3087 */ 3897 */
3088int 3898int
3089rxvt_term::privcases (int mode, unsigned long bit) 3899rxvt_term::privcases (int mode, unsigned long bit)
3090{ 3900{
3091 int state; 3901 int state;
3092 3902
3093 if (mode == 's') 3903 if (mode == 's')
3094 { 3904 {
3095 SavedModes |= (PrivateModes & bit); 3905 SavedModes |= (priv_modes & bit);
3096 return -1; 3906 return -1;
3097 } 3907 }
3098 else 3908 else
3099 { 3909 {
3100 if (mode == 'r') 3910 if (mode == 'r')
3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3911 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3102 else 3912 else
3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3913 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3104 PrivMode (state, bit); 3914 PrivMode (state, bit);
3105 } 3915 }
3916
3106 return state; 3917 return state;
3107} 3918}
3108 3919
3109/* we're not using priv _yet_ */ 3920/* we're not using priv _yet_ */
3110void 3921void
3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3922rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3112{ 3923{
3113 unsigned int i, j; 3924 unsigned int i, j;
3114 int state; 3925 int state;
3926
3115 static const struct 3927 static const struct
3116 { 3928 {
3117 const int argval; 3929 const int argval;
3118 const unsigned long bit; 3930 const unsigned long bit;
3119 } 3931 }
3932
3120 argtopriv[] = { 3933 argtopriv[] = {
3121 { 1, PrivMode_aplCUR }, 3934 { 1, PrivMode_aplCUR },
3122 { 2, PrivMode_vt52 }, 3935 { 2, PrivMode_vt52 },
3123 { 3, PrivMode_132 }, 3936 { 3, PrivMode_132 },
3124 { 4, PrivMode_smoothScroll }, 3937 { 4, PrivMode_smoothScroll },
3125 { 5, PrivMode_rVideo }, 3938 { 5, PrivMode_rVideo },
3126 { 6, PrivMode_relOrigin }, 3939 { 6, PrivMode_relOrigin },
3127 { 7, PrivMode_Autowrap }, 3940 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode
3128 { 9, PrivMode_MouseX10 }, 3942 { 9, PrivMode_MouseX10 },
3129#ifdef menuBar_esc 3943#ifdef menuBar_esc
3130 { menuBar_esc, PrivMode_menuBar }, 3944 { menuBar_esc, PrivMode_menuBar },
3131#endif 3945#endif
3946 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor },
3132#ifdef scrollBar_esc 3948#ifdef scrollBar_esc
3133 { scrollBar_esc, PrivMode_scrollBar }, 3949 { scrollBar_esc, PrivMode_scrollBar },
3134#endif 3950#endif
3135 { 25, PrivMode_VisibleCursor },
3136 { 35, PrivMode_ShiftKeys }, 3951 { 35, PrivMode_ShiftKeys }, // rxvt extension
3137 { 40, PrivMode_132OK }, 3952 { 40, PrivMode_132OK },
3953 // 41 xterm more fixes NYI
3954 // 45 margin bell NYI
3955 // 46 start logging
3138 { 47, PrivMode_Screen }, 3956 { 47, PrivMode_Screen },
3139 { 66, PrivMode_aplKP }, 3957 { 66, PrivMode_aplKP },
3140#ifndef NO_BACKSPACE_KEY 3958#ifndef NO_BACKSPACE_KEY
3141 { 67, PrivMode_BackSpace }, 3959 { 67, PrivMode_BackSpace },
3142#endif 3960#endif
3143 { 1000, PrivMode_MouseX11 }, 3961 { 1000, PrivMode_MouseX11 },
3962 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3963 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3964 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3144 { 1010, PrivMode_TtyOutputInh }, 3965 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3145 { 1011, PrivMode_Keypress }, 3966 { 1011, PrivMode_Keypress }, // rxvt extension
3967 // 1035 enable modifiers for alt, numlock NYI
3968 // 1036 send ESC for meta keys NYI
3969 // 1037 send DEL for keypad delete NYI
3146 { 1047, PrivMode_Screen }, 3970 { 1047, PrivMode_Screen },
3971 // 1048 save and restore cursor
3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3972 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3973 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3148 }; 3974 };
3149 3975
3150 if (nargs == 0) 3976 if (nargs == 0)
3151 return; 3977 return;
3152 3978
… …
3167 state = privcases (mode, argtopriv[j].bit); 3993 state = privcases (mode, argtopriv[j].bit);
3168 break; 3994 break;
3169 } 3995 }
3170 3996
3171 /* extra handling for values with state unkept */ 3997 /* extra handling for values with state unkept */
3172 if (state == -1)
3173 switch (arg[i]) 3998 switch (arg[i])
3174 { 3999 {
3175 case 1048: /* alternative cursor save */ 4000 case 1048: /* alternative cursor save */
4001 case 1049:
4002 if (options & Opt_secondaryScreen)
3176 if (mode == 0) 4003 if (mode == 0)
3177 scr_cursor (RESTORE); 4004 scr_cursor (RESTORE);
3178 else if (mode == 1) 4005 else if (mode == 1)
3179 scr_cursor (SAVE); 4006 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; 4007 break;
4008 }
4009
4010 if (state >= 0)
4011 /* extra handling for values with valid 0 or 1 state */
4012 switch (arg[i])
4013 {
4014 /* case 1: - application cursor keys */
4015 case 2: /* VT52 mode */
4016 /* oddball mode. should be set regardless of set/reset
4017 * parameter. Return from VT52 mode with an ESC < from
4018 * within VT52 mode
4019 */
4020 PrivMode (1, PrivMode_vt52);
4021 break;
3196 case 3: /* 80/132 */ 4022 case 3: /* 80/132 */
3197 if (PrivateModes & PrivMode_132OK) 4023 if (priv_modes & PrivMode_132OK)
3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3199 (unsigned int)TermWin.height);
3200 break; 4025 break;
3201 case 4: /* smooth scrolling */ 4026 case 4: /* smooth scrolling */
3202 if (state) 4027 if (state)
3203 Options &= ~Opt_jumpScroll; 4028 options &= ~Opt_jumpScroll;
3204 else 4029 else
3205 Options |= Opt_jumpScroll; 4030 options |= Opt_jumpScroll;
3206 break; 4031 break;
3207 case 5: /* reverse video */ 4032 case 5: /* reverse video */
3208 scr_rvideo_mode (state); 4033 scr_rvideo_mode (state);
3209 break; 4034 break;
3210 case 6: /* relative/absolute origins */ 4035 case 6: /* relative/absolute origins */
3211 scr_relative_origin (state); 4036 scr_relative_origin (state);
3212 break; 4037 break;
3213 case 7: /* autowrap */ 4038 case 7: /* autowrap */
3214 scr_autowrap (state); 4039 scr_autowrap (state);
3215 break; 4040 break;
3216 /* case 8: - auto repeat, can't do on a per window basis */ 4041 /* case 8: - auto repeat, can't do on a per window basis */
3217 case 9: /* X10 mouse reporting */ 4042 case 9: /* X10 mouse reporting */
3218 if (state) /* orthogonal */ 4043 if (state) /* orthogonal */
3219 PrivateModes &= ~ (PrivMode_MouseX11); 4044 priv_modes &= ~PrivMode_MouseX11;
3220 break; 4045 break;
3221#ifdef menuBar_esc 4046#ifdef menuBar_esc
3222 case menuBar_esc: 4047 case menuBar_esc:
3223#ifdef MENUBAR 4048#ifdef MENUBAR
3224 map_menuBar (state); 4049 map_menuBar (state);
3225#endif 4050#endif
3226 break; 4051 break;
3227#endif 4052#endif
3228#ifdef scrollBar_esc 4053#ifdef scrollBar_esc
3229 case scrollBar_esc: 4054 case scrollBar_esc:
3230 if (scrollbar_mapping (state)) 4055 if (scrollbar_mapping (state))
3231 { 4056 {
3232 resize_all_windows (0, 0, 0); 4057 resize_all_windows (0, 0, 0);
3233 scr_touch (true); 4058 scr_touch (true);
3234 } 4059 }
3235 break; 4060 break;
3236#endif 4061#endif
3237 case 25: /* visible/invisible cursor */ 4062 case 25: /* visible/invisible cursor */
3238 scr_cursor_visible (state); 4063 scr_cursor_visible (state);
3239 break; 4064 break;
3240 /* case 35: - shift keys */ 4065 /* case 35: - shift keys */
3241 /* case 40: - 80 <--> 132 mode */ 4066 /* case 40: - 80 <--> 132 mode */
3242 case 47: /* secondary screen */ 4067 case 47: /* secondary screen */
3243 scr_change_screen (state); 4068 scr_change_screen (state);
3244 break; 4069 break;
3245 /* case 66: - application key pad */ 4070 /* case 66: - application key pad */
3246 /* case 67: - backspace key */ 4071 /* case 67: - backspace key */
3247 case 1000: /* X11 mouse reporting */ 4072 case 1000: /* X11 mouse reporting */
3248 if (state) /* orthogonal */ 4073 if (state) /* orthogonal */
3249 PrivateModes &= ~ (PrivMode_MouseX10); 4074 priv_modes &= ~PrivMode_MouseX10;
3250 break; 4075 break;
3251#if 0 4076#if 0
3252 case 1001: 4077 case 1001:
3253 break; /* X11 mouse highlighting */ 4078 break; /* X11 mouse highlighting */
3254#endif 4079#endif
3255 case 1010: /* scroll to bottom on TTY output inhibit */ 4080 case 1010: /* scroll to bottom on TTY output inhibit */
3256 if (state) 4081 if (state)
3257 Options &= ~Opt_scrollTtyOutput; 4082 options &= ~Opt_scrollTtyOutput;
3258 else 4083 else
3259 Options |= Opt_scrollTtyOutput; 4084 options |= Opt_scrollTtyOutput;
3260 break; 4085 break;
3261 case 1011: /* scroll to bottom on key press */ 4086 case 1011: /* scroll to bottom on key press */
3262 if (state) 4087 if (state)
3263 Options |= Opt_scrollTtyKeypress; 4088 options |= Opt_scrollTtyKeypress;
3264 else 4089 else
3265 Options &= ~Opt_scrollTtyKeypress; 4090 options &= ~Opt_scrollTtyKeypress;
3266 break; 4091 break;
3267 case 1047: /* secondary screen w/ clearing */ 4092 case 1047: /* secondary screen w/ clearing last */
3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4093 if (options & Opt_secondaryScreen)
3269 if (current_screen != PRIMARY) 4094 if (current_screen != PRIMARY)
3270 scr_erase_screen (2); 4095 scr_erase_screen (2);
3271 scr_change_screen (state); 4096 scr_change_screen (state);
3272 /* FALLTHROUGH */
3273 default:
3274 break; 4097 break;
4098 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen)
4101 if (current_screen != PRIMARY)
4102 scr_erase_screen (2);
4103 break;
4104 default:
4105 break;
3275 } 4106 }
3276 } 4107 }
3277} 4108}
3278/*}}} */ 4109/*}}} */
3279 4110
3280/*{{{ process sgr sequences */ 4111/*{{{ process sgr sequences */
3281void 4112void
3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4113rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3283{ 4114{
3284 unsigned int i; 4115 unsigned int i;
3285 short rendset; 4116 short rendset;
3286 int rendstyle; 4117 int rendstyle;
3287 4118
3288 if (nargs == 0) 4119 if (nargs == 0)
3289 { 4120 {
3290 scr_rendition (0, ~RS_None); 4121 scr_rendition (0, ~RS_None);
3291 return; 4122 return;
3292 } 4123 }
4124
3293 for (i = 0; i < nargs; i++) 4125 for (i = 0; i < nargs; i++)
3294 { 4126 {
3295 rendset = -1; 4127 rendset = -1;
3296 switch (arg[i]) 4128 switch (arg[i])
3297 { 4129 {
… …
3299 rendset = 0, rendstyle = ~RS_None; 4131 rendset = 0, rendstyle = ~RS_None;
3300 break; 4132 break;
3301 case 1: 4133 case 1:
3302 rendset = 1, rendstyle = RS_Bold; 4134 rendset = 1, rendstyle = RS_Bold;
3303 break; 4135 break;
4136 //case 2: // low intensity
4137 case 3:
4138 rendset = 1, rendstyle = RS_Italic;
4139 break;
3304 case 4: 4140 case 4:
3305 rendset = 1, rendstyle = RS_Uline; 4141 rendset = 1, rendstyle = RS_Uline;
3306 break; 4142 break;
3307 case 5: 4143 case 5: // slowly blinking
4144 case 6: // rapidly blinking
3308 rendset = 1, rendstyle = RS_Blink; 4145 rendset = 1, rendstyle = RS_Blink;
3309 break; 4146 break;
4147 //case 6: // scoansi light background
3310 case 7: 4148 case 7:
3311 rendset = 1, rendstyle = RS_RVid; 4149 rendset = 1, rendstyle = RS_RVid;
3312 break; 4150 break;
3313 case 22: 4151 case 8:
4152 // invisible. NYI
4153 break;
4154 //case 9: // crossed out
4155 //case 10: // scoansi acs off, primary font
4156 //case 11: // scoansi acs on, first alt font
4157 //case 12: // scoansi acs on, |0x80, second alt font
4158 //...
4159 //case 19: // ninth alt font
4160 //case 20: // gothic
4161 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3314 rendset = 0, rendstyle = RS_Bold; 4162 rendset = 0, rendstyle = RS_Bold;
4163 break;
4164 case 22: // normal intensity
4165 rendset = 0, rendstyle = RS_Bold;
4166 break;
4167 case 23: // disable italic
4168 rendset = 0, rendstyle = RS_Italic;
3315 break; 4169 break;
3316 case 24: 4170 case 24:
3317 rendset = 0, rendstyle = RS_Uline; 4171 rendset = 0, rendstyle = RS_Uline;
3318 break; 4172 break;
3319 case 25: 4173 case 25:
3320 rendset = 0, rendstyle = RS_Blink; 4174 rendset = 0, rendstyle = RS_Blink;
3321 break; 4175 break;
4176 case 26: // variable spacing (iso 8613)
4177 rendset = 0, rendstyle = RS_Blink;
4178 break;
3322 case 27: 4179 case 27:
3323 rendset = 0, rendstyle = RS_RVid; 4180 rendset = 0, rendstyle = RS_RVid;
3324 break; 4181 break;
4182 //case 28: // visible. NYI
4183 //case 29: // not crossed-out
3325 } 4184 }
4185
3326 if (rendset != -1) 4186 if (rendset != -1)
3327 { 4187 {
3328 scr_rendition (rendset, rendstyle); 4188 scr_rendition (rendset, rendstyle);
3329 continue; /* for (;i;) */ 4189 continue; /* for (;i;) */
3330 } 4190 }
… …
3337 case 33: 4197 case 33:
3338 case 34: 4198 case 34:
3339 case 35: 4199 case 35:
3340 case 36: 4200 case 36:
3341 case 37: 4201 case 37:
3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3343 Color_fg);
3344 break; 4203 break;
3345#ifdef TTY_256COLOR 4204 case 38: // set fg color, ISO 8613-6
3346 case 38:
3347 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3348 { 4206 {
3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3350 Color_fg);
3351 i += 2; 4208 i += 2;
3352 } 4209 }
3353 break; 4210 break;
3354#endif
3355 case 39: /* default fg */ 4211 case 39: /* default fg */
3356 scr_color (Color_fg, Color_fg); 4212 scr_color (Color_fg, Color_fg);
3357 break; 4213 break;
3358 4214
3359 case 40: 4215 case 40:
… …
3362 case 43: 4218 case 43:
3363 case 44: 4219 case 44:
3364 case 45: 4220 case 45:
3365 case 46: 4221 case 46:
3366 case 47: 4222 case 47:
3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4223 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3368 Color_bg);
3369 break; 4224 break;
3370#ifdef TTY_256COLOR 4225 case 48: // set bg color, ISO 8613-6
3371 case 48:
3372 if (nargs > i + 2 && arg[i + 1] == 5) 4226 if (nargs > i + 2 && arg[i + 1] == 5)
3373 { 4227 {
3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4228 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3375 Color_bg);
3376 i += 2; 4229 i += 2;
3377 } 4230 }
3378 break; 4231 break;
3379#endif
3380 case 49: /* default bg */ 4232 case 49: /* default bg */
3381 scr_color (Color_bg, Color_bg); 4233 scr_color (Color_bg, Color_bg);
3382 break; 4234 break;
4235
4236 //case 50: // not variable spacing
3383 4237
3384#ifndef NO_BRIGHTCOLOR 4238#ifndef NO_BRIGHTCOLOR
3385 case 90: 4239 case 90:
3386 case 91: /* set bright fg color */ 4240 case 91: /* set bright fg color */
3387 case 92: 4241 case 92:
3388 case 93: 4242 case 93:
3389 case 94: 4243 case 94:
3390 case 95: 4244 case 95:
3391 case 96: 4245 case 96:
3392 case 97: 4246 case 97:
3393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4247 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3394 Color_fg);
3395 break; 4248 break;
3396 case 100: 4249 case 100:
3397 case 101: /* set bright bg color */ 4250 case 101: /* set bright bg color */
3398 case 102: 4251 case 102:
3399 case 103: 4252 case 103:
3400 case 104: 4253 case 104:
3401 case 105: 4254 case 105:
3402 case 106: 4255 case 106:
3403 case 107: 4256 case 107:
3404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3405 Color_bg);
3406 break; 4258 break;
3407#endif 4259#endif
3408 4260
3409 } 4261 }
3410 } 4262 }
3411} 4263}
3412/*}}} */ 4264/*}}} */
3413 4265
3414/*{{{ process Rob Nation's own graphics mode sequences */ 4266/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3415void 4267void
3416rxvt_term::process_graphics () 4268rxvt_term::process_graphics ()
3417{ 4269{
3418 unsigned char ch, cmd = cmd_getc (); 4270 unicode_t ch, cmd = cmd_getc ();
3419 4271
3420 if (cmd == 'Q') 4272 if (cmd == 'Q')
3421 { /* query graphics */ 4273 { /* query graphics */
3422 tt_printf ("\033G0\n"); /* no graphics */ 4274 tt_printf ("\033G0\012"); /* no graphics */
3423 return; 4275 return;
3424 } 4276 }
3425 /* swallow other graphics sequences until terminating ':' */ 4277 /* swallow other graphics sequences until terminating ':' */
3426 do 4278 do
3427 ch = cmd_getc (); 4279 ch = cmd_getc ();
… …
3442 unsigned char buf[256]; 4294 unsigned char buf[256];
3443 4295
3444 va_start (arg_ptr, fmt); 4296 va_start (arg_ptr, fmt);
3445 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3446 va_end (arg_ptr); 4298 va_end (arg_ptr);
3447 tt_write (buf, STRLEN (buf)); 4299 tt_write (buf, strlen (buf));
3448} 4300}
3449 4301
3450/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
3451/* Write data to the pty as typed by the user, pasted with the mouse, 4303/* 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. 4304 * or generated by us in response to a query ESC sequence.
3453 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
3454void 4308void
3455rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3456{ 4310{
3457 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4311 if (v_buflen == 0)
4312 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3458 4314
3459 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
3460 { 4320 }
4321
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4323
4324 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len;
4326
4327 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328}
4329
4330void rxvt_term::pty_write ()
4331{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333
4334 if (written > 0)
4335 {
4336 v_buflen -= written;
4337
3461 if (v_buflen == 0) 4338 if (v_buflen == 0)
3462 { 4339 {
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); 4340 free (v_buffer);
3490 v_buffer = 0; 4341 v_buffer = 0;
3491 v_buflen = 0; 4342 v_buflen = 0;
3492 4343
3493 pty_ev.set (EVENT_READ); 4344 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; 4345 return;
3506 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
3507 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
3508} 4353}
3509 4354
3510/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
3511 4356

Diff Legend

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