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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.201 by root, Mon Feb 21 19:26:07 2005 UTC

… …
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/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 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
61 269
62/*{{{ Convert the keypress event into a string */ 270/*{{{ Convert the keypress event into a string */
63void 271void
64rxvt_term::lookup_key (XKeyEvent &ev) 272rxvt_term::lookup_key (XKeyEvent &ev)
65{ 273{
… …
76 * 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
77 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
78 * 286 *
79 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
80 */ 288 */
81 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
84 292
85 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
86 { 294 {
87 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
147 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
148 } 356 }
149 357
150 if (valid_keysym) 358 if (valid_keysym)
151 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
152 if (TermWin.saveLines) 365 if (TermWin.saveLines)
153 { 366 {
154#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 368 if (!ctrl && !meta)
156 {
157#else 369#else
158 if (IS_SCROLL_MOD) 370 if (IS_SCROLL_MOD)
371#endif
159 { 372 {
160#endif
161 int lnsppg; 373 int lnsppg;
162 374
163#ifdef PAGING_CONTEXT_LINES 375#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 377#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 426 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 427 {
216 keysym += (XK_F11 - XK_F1); 428 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 429 shft = 0; /* turn off Shift */
218 } 430 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 431 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 432 {
221 switch (keysym) 433 switch (keysym)
222 { 434 {
223 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
226 return; 438 return;
439#if TODO
227 /* rxvt extras */ 440 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 442 change_font (FONT_UP);
230 return; 443 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 445 change_font (FONT_DN);
233 return; 446 return;
447#endif
234 } 448 }
235 } 449 }
236 } 450 }
237#ifdef PRINTPIPE 451
238 if (keysym == XK_Print) 452#if ENABLE_FRILLS || ISO_14755
239 { 453 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 454 if (shft && ctrl)
241 return;
242 } 455 {
243#endif 456 int hv;
244 457
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 458 if (iso14755buf & ISO_14755_51
246 { 459 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 460 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 461 {
250 unsigned int l; 462 commit_iso14755 ();
251 const unsigned char *kbuf0; 463 iso14755buf = ISO_14755_51;
252 464# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 465 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 466# endif
261 ) 467 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 468 }
266 469 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 470 {
471 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
472 | hv | ISO_14755_51;
473# if ISO_14755
474 iso14755_51 (iso14755buf & ISO_14755_MASK);
475# endif
268 return; 476 return;
269 } 477 }
270 else 478 else
479 {
480# if ENABLE_OVERLAY
481 scr_overlay_off ();
271#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 {
272 { 508 {
273 newlen = 1; 509 newlen = 1;
274 switch (keysym) 510 switch (keysym)
275 { 511 {
276#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 513 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 514 if (priv_modes & PrivMode_HaveBackSpace)
279 { 515 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 517 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 518 kbuf[1] = '\0';
283 } 519 }
284 else 520 else
285 STRCPY (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
286 break; 522 break;
287#endif 523#endif
288#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
289 case XK_Delete: 535 case XK_Delete:
290 STRCPY (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
291 break; 537 break;
292#endif 538#endif
293 case XK_Tab: 539 case XK_Tab:
294 if (shft) 540 if (shft)
295 STRCPY (kbuf, "\033[Z"); 541 strcpy (kbuf, "\033[Z");
296 else 542 else
297 { 543 {
298#ifdef CTRL_TAB_MAKES_META 544#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 545 if (ctrl)
300 meta = 1; 546 meta = 1;
… …
306 newlen = 0; 552 newlen = 0;
307 } 553 }
308 break; 554 break;
309 555
310#ifdef XK_KP_Left 556#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 557 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 558 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 559 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 560 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 562 {
317 STRCPY (kbuf, "\033OZ"); 563 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 564 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 565 break;
320 } 566 }
321 else 567 else
322 /* translate to std. cursor key */ 568 /* translate to std. cursor key */
… …
325#endif 571#endif
326 case XK_Up: /* "\033[A" */ 572 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 573 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 574 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 575 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 576 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 577 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 578 /* do Shift first */
333 if (shft) 579 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 580 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 581 else if (ctrl)
336 { 582 {
337 kbuf[1] = 'O'; 583 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 584 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 585 }
340 else if (PrivateModes & PrivMode_aplCUR) 586 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 587 kbuf[1] = 'O';
342 break; 588 break;
343 589
344#ifndef UNSHIFTED_SCROLLKEYS 590#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 591# ifdef XK_KP_Prior
346 case XK_KP_Prior: 592 case XK_KP_Prior:
347 /* allow shift to override */ 593 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 595 {
350 STRCPY (kbuf, "\033Oy"); 596 strcpy (kbuf, "\033Oy");
351 break; 597 break;
352 } 598 }
353 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
354# endif 600# endif
355 case XK_Prior: 601 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 602 strcpy (kbuf, "\033[5~");
357 break; 603 break;
358# ifdef XK_KP_Next 604# ifdef XK_KP_Next
359 case XK_KP_Next: 605 case XK_KP_Next:
360 /* allow shift to override */ 606 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 608 {
363 STRCPY (kbuf, "\033Os"); 609 strcpy (kbuf, "\033Os");
364 break; 610 break;
365 } 611 }
366 /* FALLTHROUGH */ 612 /* FALLTHROUGH */
367# endif 613# endif
368 case XK_Next: 614 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 615 strcpy (kbuf, "\033[6~");
370 break; 616 break;
371#endif 617#endif
372 case XK_KP_Enter: 618 case XK_KP_Enter:
373 /* allow shift to override */ 619 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 621 {
376 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';
377 } 634 }
378 else 635 else
379 { 636 {
380 kbuf[0] = '\r'; 637 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 638 kbuf[1] = '\0';
382 } 639 }
383 break; 640 break;
384 641
385#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
386 case XK_KP_Begin: 643 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
388 break; 645 break;
389 646
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 647#endif
398 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 652 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 653 kbuf[2] += (keysym - XK_KP_F1);
404 break; 654 break;
405 655
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 656 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 657 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 668 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 669 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 670 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 671 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 672 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 673 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 674 {
425 STRCPY (kbuf, "\033Oj"); 675 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 676 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 677 }
428 else 678 else
429 { 679 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 680 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
432 } 682 }
433 break; 683 break;
434 684
435 case XK_Find: 685 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
437 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
438 case XK_Insert: 699 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
440 break; 701 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 703 case DXK_Remove:
443 /* FALLTHROUGH */ 704 /* FALLTHROUGH */
444#endif 705#endif
445 case XK_Execute: 706 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 707 strcpy (kbuf, "\033[3~");
447 break; 708 break;
448 case XK_Select: 709 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 710 strcpy (kbuf, "\033[4~");
450 break; 711 break;
451#ifdef XK_KP_End 712#ifdef XK_KP_End
452 case XK_KP_End: 713 case XK_KP_End:
453 /* allow shift to override */ 714 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 715 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 716 {
456 STRCPY (kbuf, "\033Oq"); 717 strcpy (kbuf, "\033Oq");
457 break; 718 break;
458 } 719 }
459 /* FALLTHROUGH */ 720 /* FALLTHROUGH */
460#endif 721#endif
461 case XK_End: 722 case XK_End:
462 STRCPY (kbuf, KS_END); 723 strcpy (kbuf, KS_END);
463 break; 724 break;
464#ifdef XK_KP_Home 725#ifdef XK_KP_Home
465 case XK_KP_Home: 726 case XK_KP_Home:
466 /* allow shift to override */ 727 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 729 {
469 STRCPY (kbuf, "\033Ow"); 730 strcpy (kbuf, "\033Ow");
470 break; 731 break;
471 } 732 }
472 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
473#endif 734#endif
474 case XK_Home: 735 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 736 strcpy (kbuf, KS_HOME);
476 break; 737 break;
477 738
478#define FKEY(n, fkey) \ 739#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 740 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 741
… …
532#undef FKEY 793#undef FKEY
533 default: 794 default:
534 newlen = 0; 795 newlen = 0;
535 break; 796 break;
536 } 797 }
798
537 if (newlen) 799 if (newlen)
538 len = STRLEN (kbuf); 800 len = strlen (kbuf);
539 } 801 }
540 802
541 /* 803 /*
542 * Pass meta for all function keys, if 'meta' option set 804 * Pass meta for all function keys, if 'meta' option set
543 */ 805 */
… …
550 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
551 { 813 {
552 len = 1; 814 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
821 }
555 else 822 else
556 { 823 {
557#ifdef META8_OPTION 824#ifdef META8_OPTION
558 /* set 8-bit on */ 825 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 826 if (meta && (meta_char == 0x80))
… …
571 } 838 }
572 839
573 if (len <= 0) 840 if (len <= 0)
574 return; /* not mapped */ 841 return; /* not mapped */
575 842
576 if (Options & Opt_scrollTtyKeypress) 843 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 844 if (TermWin.view_start)
578 { 845 {
579 TermWin.view_start = 0; 846 TermWin.view_start = 0;
580 want_refresh = 1; 847 want_refresh = 1;
581 } 848 }
… …
617#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
619} 886}
620/*}}} */ 887/*}}} */
621 888
622#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
625unsigned int 892unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 894{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 897 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 899
633 if (n > 0 && s < count) 900 if (n > 0 && s < count)
634 { 901 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 902 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 904 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 905 cmdbuf_endp -= n;
639 s += n; 906 s += n;
640 } 907 }
… …
650 917
651 cmd_parse (); 918 cmd_parse ();
652 919
653 return 0; 920 return 0;
654} 921}
655#endif /* MENUBAR_MAX */ 922#endif
656 923
657void 924void
658rxvt_term::flush () 925rxvt_term::flush ()
659{ 926{
927 flush_ev.stop ();
928
660#ifdef TRANSPARENT 929#ifdef TRANSPARENT
661 if (want_full_refresh) 930 if (want_full_refresh)
662 { 931 {
663 want_full_refresh = 0; 932 want_full_refresh = 0;
664 scr_clear (); 933 scr_clear ();
665 scr_touch (false); 934 scr_touch (false);
666 want_refresh = 1;
667 } 935 }
668#endif 936#endif
669 937
670 if (want_refresh) 938 if (want_refresh)
671 { 939 {
… …
675 IMSendSpot (); 943 IMSendSpot ();
676#endif 944#endif
677 } 945 }
678 946
679 display->flush (); 947 display->flush ();
680
681 flush_ev.stop ();
682} 948}
683 949
684void 950void
685rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
686{ 952{
687 SET_R (this); 953 SET_R (this);
688 SET_LOCALE (locale); 954 SET_LOCALE (locale);
689 955
690 display->flush (); 956 display->flush ();
691 957
692 if (!flush_ev.active) 958 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 959 flush_ev.start (NOW + 0.01);
694} 960}
695 961
696void 962void
697rxvt_term::flush_cb (time_watcher &w) 963rxvt_term::flush_cb (time_watcher &w)
… …
762{ 1028{
763 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
767 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1038 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1040 }
771} 1041}
… …
784 1054
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
788 1058
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1060
791 if (n > 0) 1061 if (n > 0)
792 { 1062 {
793 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
794 return true; 1064 return true;
… …
803rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1074{
805 SET_R (this); 1075 SET_R (this);
806 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
807 1077
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1080 while (pty_fill ())
813 if (cmd_parse ()) 1081 if (cmd_parse ())
814 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
815} 1086}
816 1087
817void 1088void
818rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
819{ 1090{
… …
821 recolour_cursor (); 1092 recolour_cursor ();
822 1093
823#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1095 hidden_pointer = 0;
825 1096
826 if (Options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1098 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1099#endif
829} 1100}
830 1101
831#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
832void 1103void
833rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
834{ 1105{
835 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
836 return; 1107 return;
837 1108
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
839 XFlush (display->display); 1110 XFlush (display->display);
840 1111
841 hidden_pointer = 1; 1112 hidden_pointer = 1;
842} 1113}
843 1114
… …
860 x = ev.x; 1131 x = ev.x;
861 y = ev.y; 1132 y = ev.y;
862 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
863 1134
864 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1136 button_number = 3;
867 }
868 else 1137 else
869 { 1138 {
870 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1141 if (button_number >= 3)
873 button_number += (64 - 3); 1142 button_number += (64 - 3);
874 } 1143 }
875 1144
876 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
877 { 1146 {
878 /* 1147 /*
879 * do not report ButtonRelease 1148 * do not report ButtonRelease
880 * no state info allowed 1149 * no state info allowed
881 */ 1150 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1169#endif
901
902 } 1170 }
903 1171
904#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1174 if (key_state & 16)
907 fputc ('C', stderr); 1175 fputc ('C', stderr);
908 if (key_state & 4) 1176 if (key_state & 4)
909 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1181 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1183 button_number,
916 x + 1, 1184 x + 1,
917 y + 1); 1185 y + 1);
918#else 1186#endif
1187
919 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
921 (32 + x + 1), 1190 (32 + x + 1),
922 (32 + y + 1)); 1191 (32 + y + 1));
923#endif
924} 1192}
925 1193
926#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
927void 1195void
928rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
935 1203
936/*{{{ process an X event */ 1204/*{{{ process an X event */
937void 1205void
938rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
939{ 1207{
1208 dDisp;
1209
940 SET_R (this); 1210 SET_R (this);
941 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
942 1212
943#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1215 {
946 if (hidden_cursor) 1216 if (hidden_cursor)
947 { 1217 {
948 hidden_cursor = 0; 1218 hidden_cursor = 0;
949 want_refresh = 1; 1219 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1223 }
954#endif 1224#endif
955 1225
956#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1228 {
959 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1232 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1236 pointer_blank ();
967 } 1237 }
968#endif 1238#endif
969 1239
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1242 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1243
1028 switch (ev.type) 1244 switch (ev.type)
1029 { 1245 {
1030 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1031 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;
1032 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
1033 1315
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1318 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
1046 } 1321#endif
1047 break; 1322 break;
1048 } 1323 }
1049#endif
1050 1324
1051 case ButtonPress: 1325 case ButtonPress:
1052 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1053 break; 1327 break;
1054 1328
… …
1056 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1057 break; 1331 break;
1058 1332
1059 case ClientMessage: 1333 case ClientMessage:
1060 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1336 {
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1337 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1062 destroy (); 1338 destroy ();
1339#if ENABLE_EWMH
1340 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1341 XSendEvent (disp, ev.xclient.window = display->root,
1342 False, SubstructureRedirectMask | SubstructureNotifyMask,
1343 &ev);
1344#endif
1345 }
1346#if ENABLE_XEMBED
1347 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1348 {
1349 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1350 focus_in ();
1351 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1352 focus_out ();
1353 }
1354#endif
1063#ifdef OFFIX_DND 1355#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */ 1356 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1357 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile 1358 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir 1359 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink)) 1360 || ev.xclient.data.l[0] == DndLink))
1069 { 1361 {
1070 /* Get Dnd data */ 1362 /* Get Dnd data */
1071 Atom ActualType; 1363 Atom ActualType;
1072 int ActualFormat; 1364 int ActualFormat;
1073 unsigned char *data; 1365 unsigned char *data;
1074 unsigned long Size, RemainingBytes; 1366 unsigned long Size, RemainingBytes;
1075 1367
1076 XGetWindowProperty (display->display, display->root, 1368 XGetWindowProperty (disp, display->root,
1077 xa[XA_DNDSELECTION], 1369 xa[XA_DNDSELECTION],
1078 0L, 1000000L, 1370 0L, 1000000L,
1079 False, AnyPropertyType, 1371 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1372 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1373 &Size, &RemainingBytes,
1082 &data); 1374 &data);
1083 XChangeProperty (display->display, display->root, 1375 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1376 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1377 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1378 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1090 } 1379 }
1091#endif /* OFFIX_DND */ 1380#endif /* OFFIX_DND */
1092 break; 1381 break;
1093 1382
1094 case MappingNotify: 1383 case MappingNotify:
… …
1119 break; 1408 break;
1120 } 1409 }
1121 break; 1410 break;
1122 1411
1123 case FocusIn: 1412 case FocusIn:
1124 if (!TermWin.focus) 1413 focus_in ();
1125 {
1126 TermWin.focus = 1;
1127 want_refresh = 1;
1128#ifdef USE_XIM
1129 if (Input_Context != NULL)
1130 XSetICFocus (Input_Context);
1131#endif
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 {
1139 PixColors = PixColorsFocused;
1140 set_colorfgbg ();
1141 scr_clear ();
1142 scr_touch (true);
1143 }
1144#endif
1145
1146 }
1147 break; 1414 break;
1148 1415
1149 case FocusOut: 1416 case FocusOut:
1150 if (TermWin.focus) 1417 focus_out ();
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break; 1418 break;
1175 1419
1176 case ConfigureNotify: 1420 case ConfigureNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1421 if (ev.xconfigure.window == TermWin.parent[0])
1178 { 1422 {
… …
1182 { /* Wrap lots of configures into one */ 1426 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width; 1427 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height; 1428 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 } 1430 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1188 1432
1189 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != width || szHint.height != height)
1434 {
1435 seen_resize = 1;
1190 resize_all_windows (width, height, 1); 1436 resize_all_windows (width, height, 1);
1437 }
1191 1438
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent) 1440 if (options & Opt_transparent)
1194 {
1195 check_our_parents (); 1441 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif 1442#endif
1200 } 1443 }
1444 break;
1445
1446 case PropertyNotify:
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450
1201 break; 1451 break;
1202 1452
1203 case SelectionClear: 1453 case SelectionClear:
1204 selection_clear (); 1454 selection_clear ();
1205 break; 1455 break;
1206 1456
1207 case SelectionNotify: 1457 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1458 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1460 break;
1212 1461
1213 case SelectionRequest: 1462 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1215 break; 1464 break;
… …
1239 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == TermWin.vt)
1240 { 1489 {
1241 do 1490 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1245 1494
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1496
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1251 1500
1252 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1253 } 1502 }
1254 else 1503 else
1255 { 1504 {
1256 XEvent unused_event; 1505 XEvent unused_event;
1257 1506
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1259 ; 1508 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1510 ;
1262 1511
1263 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1264 { 1513 {
1265 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1270 menubar_expose (); 1519 menubar_expose ();
1271#endif 1520#endif
1272 1521
1273#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1276#endif 1525#endif
1277 } 1526 }
1278 break; 1527 break;
1279 1528
1280 case MotionNotify: 1529 case MotionNotify:
… …
1287 { 1536 {
1288 menubar_control (ev.xbutton); 1537 menubar_control (ev.xbutton);
1289 break; 1538 break;
1290 } 1539 }
1291#endif 1540#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1542 break;
1294 1543
1295 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == TermWin.vt)
1296 { 1545 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1547 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1300 ; 1549 ;
1301 1550
1302 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, TermWin.vt,
1303 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1555 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1559 {
1311#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1314#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < TermWin.int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1317 { 1575 {
1318 int dist; 1576 int dist;
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1583
1326 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1328 */ 1586 */
1329 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1590
1334 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < TermWin.int_bwidth)
1336 { 1593 {
1337 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = TermWin.int_bwidth - ev.xbutton.y;
1339 } 1596 }
1340 else 1597 else
1341 { 1598 {
1342 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y -
1344 (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1345 } 1601 }
1602
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1348 MIN_IT (scroll_selection_lines, 1606 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1350 } 1608 }
1351 else 1609 else
1352 { 1610 {
1353 /* we are within the text window, so we 1611 /* we are within the text window, so we
1354 * shouldn't be scrolling 1612 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1614 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1358 } 1616 }
1359#endif 1617#endif
1360#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1361
1362 } 1619 }
1363#endif 1620#endif
1364
1365 } 1621 }
1366 } 1622 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1624 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1371 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1372 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1633 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1635 scrollbar_size ());
1378 scr_refresh (refresh_type); 1636 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1637 refresh_limit = 0;
… …
1382 break; 1640 break;
1383 } 1641 }
1384} 1642}
1385 1643
1386void 1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!TermWin.focus)
1648 {
1649 TermWin.focus = 1;
1650 want_refresh = 1;
1651#ifdef USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#ifdef CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#ifdef OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (TermWin.focus)
1676 {
1677 TermWin.focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#ifdef USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#ifdef CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#ifdef OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1705#if TRANSPARENT
1706void
1387rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1708{
1389 SET_R (this); 1709 SET_R (this);
1390 SET_LOCALE (locale); 1710 SET_LOCALE (locale);
1391 1711
1392 switch (ev.type) 1712 switch (ev.type)
1393 { 1713 {
1394 case PropertyNotify: 1714 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1715 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1716 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1717 * use the property to determine the pixmap. We use it later on.
1407 */ 1718 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1721 return;
1413 }
1414 1722
1415 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1416 case ReparentNotify: 1724 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1726 want_refresh = want_full_refresh = 1;
1419 break; 1727 break;
1420#endif
1421 } 1728 }
1422} 1729}
1730#endif
1423 1731
1424void 1732void
1425rxvt_term::button_press (XButtonEvent &ev) 1733rxvt_term::button_press (XButtonEvent &ev)
1426{ 1734{
1427 int reportmode = 0, clickintime; 1735 int reportmode = 0, clickintime;
1428 1736
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1738 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740
1432 /* 1741 /*
1433 * VT window processing of button press 1742 * VT window processing of button press
1434 */ 1743 */
1435 if (ev.window == TermWin.vt) 1744 if (ev.window == TermWin.vt)
1436 { 1745 {
1746#if ISO_14755
1747 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 {
1750 iso14755_54 (ev.x, ev.y);
1751 return;
1752 }
1753#endif
1754
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1755 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1756
1438 if (reportmode) 1757 if (reportmode)
1439 { 1758 {
1440 /* mouse report from vt window */ 1759 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1760 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1761 MEvent.state = ev.state;
… …
1471 } 1790 }
1472 else 1791 else
1473 { 1792 {
1474 if (ev.button != MEvent.button) 1793 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1794 MEvent.clicks = 0;
1795
1476 switch (ev.button) 1796 switch (ev.button)
1477 { 1797 {
1478 case Button1: 1798 case Button1:
1799 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */
1801#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask);
1803#else
1804 selection.rect = false;
1805#endif
1806
1479 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1809 {
1482 if (MEvent.button == Button1 && clickintime) 1810 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1811 selection_rotate (ev.x, ev.y);
1484 else 1812 else
1485 selection_extend (ev.x, ev.y, 1); 1813 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1828 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1829 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1830 selection_rotate (ev.x, ev.y);
1503 else 1831 else
1504 selection_extend (ev.x, ev.y, 1); 1832 selection_extend (ev.x, ev.y, 1);
1833
1505 MEvent.button = Button3; 1834 MEvent.button = Button3;
1506 break; 1835 break;
1507 } 1836 }
1508 } 1837 }
1838
1509 MEvent.time = ev.time; 1839 MEvent.time = ev.time;
1510 return; 1840 return;
1511 } 1841 }
1512 1842
1513 /* 1843 /*
… …
1605 break; 1935 break;
1606 case R_SB_ALIGN_BOTTOM: 1936 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1937 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1938 break;
1609 } 1939 }
1940
1610 if (scrollBar.style == R_SB_XTERM 1941 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1942 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1943 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1944 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1945
1615 scrollBar.setMotion (); 1946 scrollBar.setMotion ();
1616 break; 1947 break;
1617 1948
1618 case Button1: 1949 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1950 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1643 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1975 (TermWin.nrow
1645 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1977 / scrollbar_size ()));
1647 } 1978 }
1979
1648 break; 1980 break;
1649 } 1981 }
1650 } 1982 }
1651 return; 1983 return;
1652 } 1984 }
… …
1664{ 1996{
1665 int reportmode = 0; 1997 int reportmode = 0;
1666 1998
1667 csrO = 0; /* reset csr Offset */ 1999 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2000 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2001 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2002
1671 if (scrollbar_isUpDn ()) 2003 if (scrollbar_isUpDn ())
1672 { 2004 {
1673 scrollBar.setIdle (); 2005 scrollBar.setIdle ();
1674 scrollbar_show (0); 2006 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 2008 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 2009#endif
1678
1679 } 2010 }
2011
1680#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1683#endif 2015#endif
2016
1684 if (ev.window == TermWin.vt) 2017 if (ev.window == TermWin.vt)
1685 { 2018 {
2019#if ISO_14755
2020 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return;
2023#endif
1686 if (reportmode) 2024 if (reportmode)
1687 { 2025 {
1688 /* mouse report from vt window */ 2026 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2027 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2028 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2042 MEvent.button = AnyButton;
1705 mouse_report (ev); 2043 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2044#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2045 return;
1708 } 2046 }
2047
1709 /* 2048 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2049 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2050 * when overriding mouse reporting
1712 */ 2051 */
1713 if (PrivateModes & PrivMode_mouse_report 2052 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2053 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2054 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2055 selection_extend (ev.x, ev.y, 0);
1717 2056
1718 switch (ev.button) 2057 switch (ev.button)
… …
1733 2072
1734 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
1735 2074
1736 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
1737 i = 1; 2076 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2078 i = TermWin.nrow - 1;
1740 else 2079 else
1741 i = 5; 2080 i = 5;
1742 2081
1743# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
… …
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2136 int i;
1798 2137
1799 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
1800 2139
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2141
1803 /* for convenience */ 2142 /* for convenience */
1804 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2025 Atom atype; 2364 Atom atype;
2026 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2027 Window root, oldp, *list; 2366 Window root, oldp, *list;
2028 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2030 2370
2031 pchanged = 0; 2371 pchanged = 0;
2032 2372
2033 if (!(Options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2035 2375
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2038 2378
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2040 2380
2041 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2042 { 2382 {
2043 if (am_transparent) 2383 if (am_transparent)
2044 { 2384 {
2045 pchanged = 1; 2385 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2048 } 2388 }
2049 2389
2050 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2051 } 2391 }
2052 2392
2053 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False); 2394 XSync (disp, False);
2055 2395
2056 /* 2396 /*
2057 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
2060 */ 2400 */
2061 i = (xa[XA_XROOTPMAPID] 2401 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2065 2405
2066 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2071 2411
2072 if (!i || prop == NULL 2412 if (!i || prop == NULL
2073#if TINTING 2413#if TINTING
… …
2092 Window cr; 2432 Window cr;
2093 XImage *image; 2433 XImage *image;
2094 GC gc; 2434 GC gc;
2095 XGCValues gcvalue; 2435 XGCValues gcvalue;
2096 2436
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2441 nx = ny = 0;
2102 2442
… …
2114 sy = 0; 2454 sy = 0;
2115 } 2455 }
2116 2456
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2119 allowedxerror = -1; 2461 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2463
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2466 allowedxerror = 0;
2125 2467
… …
2128 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2129 { 2471 {
2130 pchanged = 1; 2472 pchanged = 1;
2131 if (TermWin.pixmap != None) 2473 if (TermWin.pixmap != None)
2132 { 2474 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, TermWin.pixmap);
2134 TermWin.pixmap = None; 2476 TermWin.pixmap = None;
2135 } 2477 }
2136 } 2478 }
2137 2479
2138 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2139 } 2481 }
2140 else 2482 else
2141 { 2483 {
2142 if (TermWin.pixmap != None) 2484 if (TermWin.pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, TermWin.pixmap);
2144 2486
2145#if TINTING 2487#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2489 {
2148 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2492
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2494
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2496 }
2155#endif 2497#endif
2156 2498
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2158 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2163 XDestroyImage (image); 2505 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, TermWin.parent[0]);
2166 2508
2167 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2510 pchanged = 1;
2169 2511
2170 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2171 } 2513 }
2172 } 2514 }
2173 2515
2174 if (!am_pixmap_trans) 2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2518 else
2175 { 2519 {
2176 unsigned int n; 2520 unsigned int n;
2177 /* 2521 /*
2178 * InheritPixmap transparency 2522 * InheritPixmap transparency
2179 */ 2523 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 { 2525 {
2183 oldp = TermWin.parent[i]; 2526 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2528 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2529 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2530
2189 if (TermWin.parent[i] == display->root) 2531 if (TermWin.parent[i] == display->root)
2190 { 2532 {
2191 if (oldp != None) 2533 if (oldp != None)
2192 pchanged = 1; 2534 pchanged = 1;
… …
2202 2544
2203 if (pchanged) 2545 if (pchanged)
2204 { 2546 {
2205 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2206 { 2548 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2551 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break; 2553 break;
2213 } 2554 }
2214 } 2555 }
2215 } 2556 }
2216 2557
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 { 2559 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2562 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2224 } 2564 }
2225 else 2565 else
2226 { 2566 {
2227#if WAIT_FOR_WM 2567#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2568 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2570 sleep (1);
2231#endif 2571#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2234 { 2573 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, TermWin.parent[n]);
2237 } 2576 }
2238 2577
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2240 am_transparent = 1; 2579 am_transparent = 1;
2241 } 2580 }
2242 2581
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2583 TermWin.parent[i] = None;
2245 } 2584 }
2246 2585
2247 // this is experimental
2248 if (scrollBar.win) 2586 if (scrollBar.win)
2249 { 2587 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2253 scrollbar_show (0); 2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2254 } 2598 }
2255 2599
2256 return pchanged; 2600 return pchanged;
2257} 2601}
2258#endif 2602#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2621 if (ch == NOCHAR) // TODO: improve
2278 break; 2622 break;
2279 2623
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2625 {
2626 if (!seen_input)
2627 {
2628 seen_input = 1;
2629 // many badly-written programs (e.g. jed) contain a race condition:
2630 // they first read the screensize and then install a SIGWINCH handler.
2631 // some window managers resize the window early, and these programs
2632 // then sometimes get the size wrong.
2633 // unfortunately other programs are even more buggy and dislike
2634 // being sent SIGWINCH, so only do it when we were in fact being
2635 // resized.
2636 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH);
2638 }
2639
2282 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2642 bool refreshnow = false;
2285 int nlines = 0; 2643 int nlines = 0;
2286 unicode_t *str = buf; 2644 unicode_t *str = buf;
2287 2645
2288 *str++ = ch;
2289
2290 for (;;) 2646 for (;;)
2291 { 2647 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2649 break;
2297 2650
2298 *str++ = ch; 2651 *str++ = ch;
2299 2652
2300 if (ch == C0_LF) 2653 if (ch == C0_LF)
2301 { 2654 {
2302 nlines++; 2655 nlines++;
2303 refresh_count++; 2656 refresh_count++;
2304 2657
2305 if (! (Options & Opt_jumpScroll) 2658 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 { 2660 {
2308 refreshnow = true; 2661 refreshnow = true;
2309 ch = NOCHAR; 2662 ch = NOCHAR;
2310 break; 2663 break;
2311 } 2664 }
2312 2665
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2667 if (nlines >= TermWin.nrow - 1)
2315 { 2668 {
2316 scr_add_lines (buf, nlines, str - buf); 2669 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2670 nlines = 0;
2318 str = buf; 2671 str = buf;
… …
2322 if (str >= buf + UBUFSIZ) 2675 if (str >= buf + UBUFSIZ)
2323 { 2676 {
2324 ch = NOCHAR; 2677 ch = NOCHAR;
2325 break; 2678 break;
2326 } 2679 }
2680
2681 seq_begin = cmdbuf_ptr;
2682 ch = next_char ();
2327 } 2683 }
2328 2684
2329 scr_add_lines (buf, nlines, str - buf); 2685 scr_add_lines (buf, nlines, str - buf);
2330 2686
2331 /* 2687 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2690 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2691 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2692 */
2337 if (refreshnow) 2693 if (refreshnow)
2338 { 2694 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2696 refresh_limit++;
2341 else 2697 else
2342 { 2698 {
2343 flag = true; 2699 flag = true;
2344 scr_refresh (refresh_type); 2700 scr_refresh (refresh_type);
… …
2398 if (len == (size_t)-1) 2754 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2756
2401 // assume wchar == unicode 2757 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2758 cmdbuf_ptr += len;
2403 return wc; 2759 return wc & UNICODE_MASK;
2404 } 2760 }
2405 2761
2406 return NOCHAR; 2762 return NOCHAR;
2407} 2763}
2408 2764
… …
2534 process_escape_seq (); 2890 process_escape_seq ();
2535 break; 2891 break;
2536 case C0_ENQ: /* terminal Status */ 2892 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2893 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2896 else
2541 tt_write ((unsigned char *)VT100_ANS, 2897 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2898 (unsigned int)strlen (VT100_ANS));
2543 break; 2899 break;
2544 case C0_BEL: /* bell */ 2900 case C0_BEL: /* bell */
2545 scr_bell (); 2901 scr_bell ();
2546 break; 2902 break;
2547 case C0_BS: /* backspace */ 2903 case C0_BS: /* backspace */
… …
2646void 3002void
2647rxvt_term::process_escape_seq () 3003rxvt_term::process_escape_seq ()
2648{ 3004{
2649 unicode_t ch = cmd_getc (); 3005 unicode_t ch = cmd_getc ();
2650 3006
2651 if (PrivateModes & PrivMode_vt52) 3007 if (priv_modes & PrivMode_vt52)
2652 { 3008 {
2653 process_escape_vt52 (ch); 3009 process_escape_vt52 (ch);
2654 return; 3010 return;
2655 } 3011 }
2656 3012
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3027 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3028 break;
2673 case '+': 3029 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3030 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3031 break;
2676#ifndef NO_FRILLS 3032#if ENABLE_FRILLS
2677 case '6': 3033 case '6':
2678 scr_backindex (); 3034 scr_backindex ();
2679 break; 3035 break;
2680#endif 3036#endif
2681 case '7': 3037 case '7':
2682 scr_cursor (SAVE); 3038 scr_cursor (SAVE);
2683 break; 3039 break;
2684 case '8': 3040 case '8':
2685 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
2686 break; 3042 break;
2687#ifndef NO_FRILLS 3043#if ENABLE_FRILLS
2688 case '9': 3044 case '9':
2689 scr_forwardindex (); 3045 scr_forwardindex ();
2690 break; 3046 break;
2691#endif 3047#endif
2692 case '=': 3048 case '=':
… …
2871 { 3227 {
2872 switch (priv) 3228 switch (priv)
2873 { 3229 {
2874 case '>': 3230 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3231 if (ch == CSI_DA) /* secondary device attributes */
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3232 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2877 break; 3233 break;
2878 case '?': 3234 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3235 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3236 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3237 break;
… …
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2992 break; 3348 break;
2993 3349
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3351 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3352 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3353 break;
2998 3354
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3356 process_sgr_mode (nargs, arg);
3001 break; 3357 break;
… …
3008 break; 3364 break;
3009 case 6: /* CPR requested */ 3365 case 6: /* CPR requested */
3010 scr_report_position (); 3366 scr_report_position ();
3011 break; 3367 break;
3012 case 7: /* unofficial extension */ 3368 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3369 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3370 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3371 break;
3016 case 8: /* unofficial extension */ 3372 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3374 break;
3019 } 3375 }
… …
3055 break; 3411 break;
3056 3412
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3413 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3414 if (arg[0] == 4)
3059 scr_insert_mode (0); 3415 scr_insert_mode (0);
3416 else if (arg[0] == 20)
3417 priv_modes &= ~PrivMode_LFNL;
3060 break; 3418 break;
3061 3419
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3420 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3421 if (arg[0] == 4)
3064 scr_insert_mode (1); 3422 scr_insert_mode (1);
3423 else if (arg[0] == 20)
3424 priv_modes |= PrivMode_LFNL;
3065 break; 3425 break;
3066 3426
3067 /* 3427 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3428 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3429 */
… …
3081 break; 3441 break;
3082 case CSI_75: 3442 case CSI_75:
3083 scr_cursor (RESTORE); 3443 scr_cursor (RESTORE);
3084 break; 3444 break;
3085 3445
3086#ifndef NO_FRILLS 3446#if ENABLE_FRILLS
3087 case CSI_74: 3447 case CSI_74:
3088 process_window_ops (arg, nargs); 3448 process_window_ops (arg, nargs);
3089 break; 3449 break;
3090#endif 3450#endif
3091 3451
… …
3098 break; 3458 break;
3099 } 3459 }
3100} 3460}
3101/*}}} */ 3461/*}}} */
3102 3462
3103#ifndef NO_FRILLS 3463#if ENABLE_FRILLS
3104/* ARGSUSED */ 3464/* ARGSUSED */
3105void 3465void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3466rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3467{
3108 int x, y; 3468 int x, y;
3109 XWindowAttributes wattr; 3469 XWindowAttributes wattr;
3110 Window wdummy; 3470 Window wdummy;
3471 dDisp;
3111 3472
3112 if (nargs == 0) 3473 if (nargs == 0)
3113 return; 3474 return;
3114 3475
3115 switch (args[0]) 3476 switch (args[0])
3116 { 3477 {
3117 /* 3478 /*
3118 * commands 3479 * commands
3119 */ 3480 */
3120 case 1: /* deiconify window */ 3481 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3482 XMapWindow (disp, TermWin.parent[0]);
3122 break; 3483 break;
3123 case 2: /* iconify window */ 3484 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3485 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3486 break;
3127 case 3: /* set position (pixels) */ 3487 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3129 break; 3489 break;
3130 case 4: /* set size (pixels) */ 3490 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3492 break;
3133 case 5: /* raise window */ 3493 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3494 XRaiseWindow (disp, TermWin.parent[0]);
3135 break; 3495 break;
3136 case 6: /* lower window */ 3496 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3497 XLowerWindow (disp, TermWin.parent[0]);
3138 break; 3498 break;
3139 case 7: /* refresh window */ 3499 case 7: /* refresh window */
3140 scr_touch (true); 3500 scr_touch (true);
3141 break; 3501 break;
3142 case 8: /* set size (chars) */ 3502 case 8: /* set size (chars) */
… …
3154 3514
3155 /* 3515 /*
3156 * reports - some output format copied from XTerm 3516 * reports - some output format copied from XTerm
3157 */ 3517 */
3158 case 11: /* report window state */ 3518 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3521 break;
3162 case 13: /* report window position */ 3522 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3525 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3526 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3527 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3528 break;
3169 case 14: /* report window size (pixels) */ 3529 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3532 break;
3173 case 18: /* report text area size (chars) */ 3533 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3175 break; 3535 break;
3176 case 19: /* report window size (chars) */ 3536 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break; 3538 break;
3179 case 20: /* report icon label */ 3539 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3540 {
3182 char *s; 3541 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3542 XGetIconName (disp, TermWin.parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s);
3185 } 3545 }
3186 break; 3546 break;
3187 case 21: /* report window title */ 3547 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3548 {
3190 char *s; 3549 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3550 XFetchName (disp, TermWin.parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s);
3193 } 3553 }
3194 break; 3554 break;
3195 } 3555 }
3196} 3556}
3197#endif 3557#endif
3198 3558
… …
3202 * ends_how is terminator used. returned input must be free()'d 3562 * ends_how is terminator used. returned input must be free()'d
3203 */ 3563 */
3204unsigned char * 3564unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3565rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3566{
3207 unicode_t prev = 0, ch; 3567 unicode_t ch;
3568 bool seen_esc = false;
3208 unsigned int n = 0; 3569 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3570 wchar_t string[STRING_MAX];
3211 3571
3212 while ((ch = cmd_getc ()) != NOCHAR) 3572 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3573 {
3214 if (prev == C0_ESC) 3574 if (seen_esc)
3215 { 3575 {
3216 if (ch == 0x5c) /* 7bit ST */ 3576 if (ch == 0x5c) /* 7bit ST */
3217 break; 3577 break;
3218 else 3578 else
3219 return NULL; 3579 return NULL;
3220 } 3580 }
3581 else if (ch == C0_ESC)
3582 {
3583 seen_esc = true;
3584 continue;
3585 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3586 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3587 break;
3223 else if (ch < 0x20) 3588 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3589 return NULL; /* other control character - exit */
3590
3591 seen_esc = false;
3225 3592
3226 if (n >= sizeof (string) - 1) 3593 if (n >= sizeof (string) - 1)
3227 // stop at some sane length 3594 // stop at some sane length
3228 return NULL; 3595 return NULL;
3229 3596
3230 if (ch == C0_SYN) 3597 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3598 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3599 else
3236 string[n++] = prev = ch; 3600 string[n++] = ch;
3237 } 3601 }
3238 3602
3239 string[n++] = '\0'; 3603 string[n++] = '\0';
3240 3604
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3605 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3606
3246 return s; 3607 return (unsigned char *)rxvt_wcstombs (string);
3247} 3608}
3248 3609
3249/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
3250/* 3611/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3656void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3658{
3298 if (str[0] == '?' && !str[1]) 3659 if (str[0] == '?' && !str[1])
3299 { 3660 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3661 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3662 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3663 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3664 }
3307 else 3665 else
3308 set_window_color (color, str); 3666 set_window_color (color, str);
3309} 3667}
3310 3668
3311/* 3669/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3671 */
3336void 3672void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3673rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3338{ 3674{
3339 int changed = 0; 3675 int changed = 0;
3340 int color; 3676 int color;
3341 char *buf, *name; 3677 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3678 bool query = str[0] == '?' && !str[1];
3679 int saveop = op;
3680 dDisp;
3343 3681
3344 assert (str != NULL); 3682 assert (str != NULL);
3345 switch (op) 3683 switch (op)
3346 { 3684 {
3347 case XTerm_name: 3685 case XTerm_name:
… …
3354 set_title (str); 3692 set_title (str);
3355 break; 3693 break;
3356 case XTerm_property: 3694 case XTerm_property:
3357 if (str[0] == '?') 3695 if (str[0] == '?')
3358 { 3696 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3697 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3698 Atom actual_type;
3361 int actual_format; 3699 int actual_format;
3362 unsigned long nitems; 3700 unsigned long nitems;
3363 unsigned long bytes_after; 3701 unsigned long bytes_after;
3364 unsigned char *value = 0; 3702 unsigned char *value = 0;
3365 const char *str = ""; 3703 const char *str = "";
3366 3704
3367 if (prop 3705 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3706 && XGetWindowProperty (disp, TermWin.parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3707 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3708 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3709 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3710 && actual_type != None
3373 && actual_format == 8) 3711 && actual_format == 8)
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3720 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3721
3384 if (eq) 3722 if (eq)
3385 { 3723 {
3386 *eq = 0; 3724 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3725 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3726 }
3392 else 3727 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3728 XDeleteProperty (disp, TermWin.parent[0],
3394 display->atom (str)); 3729 display->atom (str));
3395 } 3730 }
3396 break; 3731 break;
3397 3732
3398 case XTerm_Color: 3733 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3734 for (buf = (char *)str; buf && *buf;)
3400 { 3735 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3736 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3737 break;
3403 3738
3404 *name++ = '\0'; 3739 *name++ = '\0';
3405 color = atoi (buf); 3740 color = atoi (buf);
3406 3741
3407 if (color < 0 || color >= TOTAL_COLORS) 3742 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3743 break;
3409 3744
3410 if ((buf = STRCHR (name, ';')) != NULL) 3745 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3746 *buf++ = '\0';
3412 3747
3413 if (name[0] == '?' && !name[1]) 3748 if (name[0] == '?' && !name[1])
3414 { 3749 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3750 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3751 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3752 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3753 }
3422 else 3754 else
3423 set_window_color (color + minCOLOR, name); 3755 set_window_color (color + minCOLOR, name);
3424 } 3756 }
3425 break; 3757 break;
… …
3447 case XTerm_Color_UL: 3779 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3780 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3781 break;
3450 case XTerm_Color_RV: 3782 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3783 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3784 break;
3785 case URxvt_Color_IT:
3786 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3787 break;
3788#endif
3789#if TRANSPARENT && TINTING
3790 case URxvt_Color_tint:
3791 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3792 check_our_parents ();
3793 if (am_transparent)
3794 want_full_refresh = want_refresh = 1;
3452 break; 3795 break;
3453#endif 3796#endif
3454 3797
3455 case XTerm_Pixmap: 3798 case XTerm_Pixmap:
3456 if (*str != ';') 3799 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3802 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3803 set_bgPixmap (str); /* change pixmap */
3461#endif 3804#endif
3462 scr_touch (true); 3805 scr_touch (true);
3463 } 3806 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3807 while ((str = strchr (str, ';')) != NULL)
3465 { 3808 {
3466 str++; 3809 str++;
3467#if XPM_BACKGROUND 3810#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3811 changed += scale_pixmap (str);
3469#endif 3812#endif
3470
3471 } 3813 }
3814
3472 if (changed) 3815 if (changed)
3473 { 3816 {
3474#ifdef XPM_BACKGROUND 3817#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3818 resize_pixmap ();
3476#endif 3819#endif
… …
3487 3830
3488 case XTerm_logfile: 3831 case XTerm_logfile:
3489 // TODO, when secure mode? 3832 // TODO, when secure mode?
3490 break; 3833 break;
3491 3834
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR 3835#ifdef MENUBAR
3533 case XTerm_Menu: 3836 case URxvt_Menu:
3534 if (Options & Opt_insecure) 3837 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3839 break;
3537#endif 3840#endif
3538#if 0 3841#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3842 case XTerm_dumpscreen: /* no error notices */
… …
3543 { 3846 {
3544 scr_dump (fd); 3847 scr_dump (fd);
3545 close (fd); 3848 close (fd);
3546 } 3849 }
3547 } 3850 }
3851 break;
3852#endif
3853 case XTerm_font:
3854 op = URxvt_font;
3855 case URxvt_font:
3856#if ENABLE_STYLES
3857 case URxvt_boldFont:
3858 case URxvt_italicFont:
3859 case URxvt_boldItalicFont:
3860#endif
3861 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3865 resp);
3866 else
3867 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869
3870 res = strdup (str);
3871 allocated.push_back ((void *)res);
3872 set_fonts ();
3873 }
3874 break;
3875
3876#if ENABLE_FRILLS
3877 case URxvt_locale:
3878 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3880 else
3881 {
3882 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8);
3884 init_xlocale ();
3885 }
3886 break;
3887
3888 case URxvt_view_up:
3889 case URxvt_view_down:
3890 int lines = atoi (str);
3891
3892 if (lines)
3893 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894 else
3895 {
3896 scr_erase_savelines ();
3897 }
3898
3548 break; 3899 break;
3549#endif 3900#endif
3550 } 3901 }
3551} 3902}
3552/*----------------------------------------------------------------------*/ 3903/*----------------------------------------------------------------------*/
… …
3566{ 3917{
3567 int state; 3918 int state;
3568 3919
3569 if (mode == 's') 3920 if (mode == 's')
3570 { 3921 {
3571 SavedModes |= (PrivateModes & bit); 3922 SavedModes |= (priv_modes & bit);
3572 return -1; 3923 return -1;
3573 } 3924 }
3574 else 3925 else
3575 { 3926 {
3576 if (mode == 'r') 3927 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3928 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3929 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3930 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3931 PrivMode (state, bit);
3581 } 3932 }
3582 3933
3583 return state; 3934 return state;
3584} 3935}
… …
3602 { 3, PrivMode_132 }, 3953 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3954 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3955 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3956 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3957 { 7, PrivMode_Autowrap },
3958 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3959 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3960#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3961 { menuBar_esc, PrivMode_menuBar },
3610#endif 3962#endif
3963 // 18, 19 printing-related
3964 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3965#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3966 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3967#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3968 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3969 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3970 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3971 // 45 margin bell NYI
3621 // 46 start logging 3972 // 46 start logging
… …
3662 4013
3663 /* extra handling for values with state unkept */ 4014 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4015 switch (arg[i])
3665 { 4016 {
3666 case 1048: /* alternative cursor save */ 4017 case 1048: /* alternative cursor save */
4018 case 1049:
3667 if (Options & Opt_secondaryScreen) 4019 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 4020 if (mode == 0)
3669 scr_cursor (RESTORE); 4021 scr_cursor (RESTORE);
3670 else if (mode == 1) 4022 else if (mode == 1)
3671 scr_cursor (SAVE); 4023 scr_cursor (SAVE);
3672 break; 4024 break;
… …
3683 * within VT52 mode 4035 * within VT52 mode
3684 */ 4036 */
3685 PrivMode (1, PrivMode_vt52); 4037 PrivMode (1, PrivMode_vt52);
3686 break; 4038 break;
3687 case 3: /* 80/132 */ 4039 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4040 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3690 break; 4042 break;
3691 case 4: /* smooth scrolling */ 4043 case 4: /* smooth scrolling */
3692 if (state) 4044 if (state)
3693 Options &= ~Opt_jumpScroll; 4045 options &= ~Opt_jumpScroll;
3694 else 4046 else
3695 Options |= Opt_jumpScroll; 4047 options |= Opt_jumpScroll;
3696 break; 4048 break;
3697 case 5: /* reverse video */ 4049 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4050 scr_rvideo_mode (state);
3699 break; 4051 break;
3700 case 6: /* relative/absolute origins */ 4052 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4056 scr_autowrap (state);
3705 break; 4057 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4058 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4059 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4060 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4061 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4062 break;
3711#ifdef menuBar_esc 4063#ifdef menuBar_esc
3712 case menuBar_esc: 4064 case menuBar_esc:
3713#ifdef MENUBAR 4065#ifdef MENUBAR
3714 map_menuBar (state); 4066 map_menuBar (state);
… …
3734 break; 4086 break;
3735 /* case 66: - application key pad */ 4087 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4088 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4089 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4090 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4091 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4092 break;
3741#if 0 4093#if 0
3742 case 1001: 4094 case 1001:
3743 break; /* X11 mouse highlighting */ 4095 break; /* X11 mouse highlighting */
3744#endif 4096#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4097 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4098 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4099 options &= ~Opt_scrollTtyOutput;
3748 else 4100 else
3749 Options |= Opt_scrollTtyOutput; 4101 options |= Opt_scrollTtyOutput;
3750 break; 4102 break;
3751 case 1011: /* scroll to bottom on key press */ 4103 case 1011: /* scroll to bottom on key press */
3752 if (state) 4104 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4105 options |= Opt_scrollTtyKeypress;
3754 else 4106 else
3755 Options &= ~Opt_scrollTtyKeypress; 4107 options &= ~Opt_scrollTtyKeypress;
3756 break; 4108 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4109 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4110 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4111 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4112 scr_erase_screen (2);
3761 scr_change_screen (state); 4113 scr_change_screen (state);
3762 break; 4114 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4115 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4116 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4117 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4118 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4119 scr_erase_screen (2);
3768 break; 4120 break;
3769 default: 4121 default:
3770 break; 4122 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4148 rendset = 0, rendstyle = ~RS_None;
3797 break; 4149 break;
3798 case 1: 4150 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4151 rendset = 1, rendstyle = RS_Bold;
3800 break; 4152 break;
3801 //case 2: // faint or second colour 4153 //case 2: // low intensity
4154 case 3:
4155 rendset = 1, rendstyle = RS_Italic;
4156 break;
3802 case 4: 4157 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4158 rendset = 1, rendstyle = RS_Uline;
3804 break; 4159 break;
3805 case 5: // slowly blinking 4160 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4161 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4173 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4174 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4175 //...
3821 //case 19: // ninth alt font 4176 //case 19: // ninth alt font
3822 //case 20: // gothic 4177 //case 20: // gothic
3823 case 21: // disable bold, faint 4178 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4179 rendset = 0, rendstyle = RS_Bold;
3825 break; 4180 break;
3826 case 22: 4181 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4182 rendset = 0, rendstyle = RS_Bold;
3828 break; 4183 break;
3829 //case 23: disable italic 4184 case 23: // disable italic
4185 rendset = 0, rendstyle = RS_Italic;
4186 break;
3830 case 24: 4187 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4188 rendset = 0, rendstyle = RS_Uline;
3832 break; 4189 break;
3833 case 25: 4190 case 25:
4191 rendset = 0, rendstyle = RS_Blink;
4192 break;
4193 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4194 rendset = 0, rendstyle = RS_Blink;
3835 break; 4195 break;
3836 case 27: 4196 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4197 rendset = 0, rendstyle = RS_RVid;
3838 break; 4198 break;
… …
3856 case 35: 4216 case 35:
3857 case 36: 4217 case 36:
3858 case 37: 4218 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4220 break;
3861#ifdef TTY_256COLOR 4221 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4223 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4225 i += 2;
3867 } 4226 }
3868 break; 4227 break;
3869#endif
3870 case 39: /* default fg */ 4228 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4229 scr_color (Color_fg, Color_fg);
3872 break; 4230 break;
3873 4231
3874 case 40: 4232 case 40:
… …
3879 case 45: 4237 case 45:
3880 case 46: 4238 case 46:
3881 case 47: 4239 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4240 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4241 break;
3884#ifdef TTY_256COLOR 4242 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4243 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4244 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4245 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4246 i += 2;
3890 } 4247 }
3891 break; 4248 break;
3892#endif
3893 case 49: /* default bg */ 4249 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4250 scr_color (Color_bg, Color_bg);
3895 break; 4251 break;
4252
4253 //case 50: // not variable spacing
3896 4254
3897#ifndef NO_BRIGHTCOLOR 4255#ifndef NO_BRIGHTCOLOR
3898 case 90: 4256 case 90:
3899 case 91: /* set bright fg color */ 4257 case 91: /* set bright fg color */
3900 case 92: 4258 case 92:
3901 case 93: 4259 case 93:
3902 case 94: 4260 case 94:
3903 case 95: 4261 case 95:
3904 case 96: 4262 case 96:
3905 case 97: 4263 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4264 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4265 break;
3909 case 100: 4266 case 100:
3910 case 101: /* set bright bg color */ 4267 case 101: /* set bright bg color */
3911 case 102: 4268 case 102:
3912 case 103: 4269 case 103:
3913 case 104: 4270 case 104:
3914 case 105: 4271 case 105:
3915 case 106: 4272 case 106:
3916 case 107: 4273 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4275 break;
3920#endif 4276#endif
3921 4277
3922 } 4278 }
3923 } 4279 }
… …
3930{ 4286{
3931 unicode_t ch, cmd = cmd_getc (); 4287 unicode_t ch, cmd = cmd_getc ();
3932 4288
3933 if (cmd == 'Q') 4289 if (cmd == 'Q')
3934 { /* query graphics */ 4290 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4291 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4292 return;
3937 } 4293 }
3938 /* swallow other graphics sequences until terminating ':' */ 4294 /* swallow other graphics sequences until terminating ':' */
3939 do 4295 do
3940 ch = cmd_getc (); 4296 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4311 unsigned char buf[256];
3956 4312
3957 va_start (arg_ptr, fmt); 4313 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4314 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4315 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4316 tt_write (buf, strlen (buf));
3961} 4317}
3962 4318
3963/* ---------------------------------------------------------------------- */ 4319/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4320/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4321 * or generated by us in response to a query ESC sequence.
3966 */ 4322 */
4323const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4324
3967void 4325void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4326rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4327{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4328 if (v_buflen == 0)
4329 {
4330 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4331
3972 if (len) 4332 if ((unsigned int)written == len)
4333 return;
4334
4335 data += written;
4336 len -= written;
3973 { 4337 }
4338
4339 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4340
4341 memcpy (v_buffer + v_buflen, data, len);
4342 v_buflen += len;
4343
4344 pty_ev.set (EVENT_READ | EVENT_WRITE);
4345}
4346
4347void rxvt_term::pty_write ()
4348{
4349 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4350
4351 if (written > 0)
4352 {
4353 v_buflen -= written;
4354
3974 if (v_buflen == 0) 4355 if (v_buflen == 0)
3975 { 4356 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4357 free (v_buffer);
4003 v_buffer = 0; 4358 v_buffer = 0;
4004 v_buflen = 0; 4359 v_buflen = 0;
4005 4360
4006 pty_ev.set (EVENT_READ); 4361 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4362 return;
4019 } 4363 }
4364
4365 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4366 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this...
4369 destroy ();
4021} 4370}
4022 4371
4023/*----------------------- end-of-file (C source) -----------------------*/ 4372/*----------------------- end-of-file (C source) -----------------------*/
4024 4373

Diff Legend

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