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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.199 by root, Sun Feb 20 02:00:43 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 {
… …
683rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
684{ 952{
685 SET_R (this); 953 SET_R (this);
686 SET_LOCALE (locale); 954 SET_LOCALE (locale);
687 955
956 display->flush ();
957
958 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01);
960}
961
962void
963rxvt_term::flush_cb (time_watcher &w)
964{
965 SET_R (this);
966 SET_LOCALE (locale);
967
968 refresh_limit = 1;
969 refresh_count = 0;
688 flush (); 970 flush ();
689} 971}
690 972
691#ifdef CURSOR_BLINK 973#ifdef CURSOR_BLINK
692void 974void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 992 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 993 }
712} 994}
713#endif 995#endif
714 996
997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
998void
999rxvt_term::cont_scroll_cb (time_watcher &w)
1000{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 }
1008}
1009#endif
1010
1011#ifdef SELECTION_SCROLLING
1012void
1013rxvt_term::sel_scroll_cb (time_watcher &w)
1014{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 }
1022}
1023#endif
1024
1025#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1026void
1027rxvt_term::slip_wheel_cb (time_watcher &w)
1028{
1029 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed))
1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 }
1041}
1042#endif
1043
715bool 1044bool
716rxvt_term::pty_fill () 1045rxvt_term::pty_fill ()
717{ 1046{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1048
… …
725 1054
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
729 1058
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1060
732 if (n > 0) 1061 if (n > 0)
733 { 1062 {
734 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
735 return true; 1064 return true;
… …
744rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1074{
746 SET_R (this); 1075 SET_R (this);
747 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
748 1077
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1080 while (pty_fill ())
754 if (cmd_parse ()) 1081 if (cmd_parse ())
755 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
1086}
1087
1088void
1089rxvt_term::pointer_unblank ()
1090{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1092 recolour_cursor ();
1093
1094#ifdef POINTER_BLANK
1095 hidden_pointer = 0;
1096
1097 if (options & Opt_pointerBlank)
1098 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif
756} 1100}
757 1101
758#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
759void 1103void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
773{ 1105{
774 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
775 return; 1107 return;
776 1108
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
778 XFlush (display->display); 1110 XFlush (display->display);
779 1111
780 hidden_pointer = 1; 1112 hidden_pointer = 1;
781} 1113}
782 1114
… …
799 x = ev.x; 1131 x = ev.x;
800 y = ev.y; 1132 y = ev.y;
801 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
802 1134
803 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1136 button_number = 3;
806 }
807 else 1137 else
808 { 1138 {
809 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1141 if (button_number >= 3)
812 button_number += (64 - 3); 1142 button_number += (64 - 3);
813 } 1143 }
814 1144
815 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
816 { 1146 {
817 /* 1147 /*
818 * do not report ButtonRelease 1148 * do not report ButtonRelease
819 * no state info allowed 1149 * no state info allowed
820 */ 1150 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1169#endif
840
841 } 1170 }
842 1171
843#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1174 if (key_state & 16)
846 fputc ('C', stderr); 1175 fputc ('C', stderr);
847 if (key_state & 4) 1176 if (key_state & 4)
848 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1181 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1183 button_number,
855 x + 1, 1184 x + 1,
856 y + 1); 1185 y + 1);
857#else 1186#endif
1187
858 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
860 (32 + x + 1), 1190 (32 + x + 1),
861 (32 + y + 1)); 1191 (32 + y + 1));
862#endif
863} 1192}
864 1193
865#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
866void 1195void
867rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
874 1203
875/*{{{ process an X event */ 1204/*{{{ process an X event */
876void 1205void
877rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
878{ 1207{
1208 dDisp;
1209
879 SET_R (this); 1210 SET_R (this);
880 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
881 1212
882#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1215 {
885 if (hidden_cursor) 1216 if (hidden_cursor)
886 { 1217 {
887 hidden_cursor = 0; 1218 hidden_cursor = 0;
888 want_refresh = 1; 1219 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1223 }
893#endif 1224#endif
894 1225
895#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1228 {
898 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1232 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1236 pointer_blank ();
906 } 1237 }
907#endif 1238#endif
908 1239
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1242 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966 1243
967 switch (ev.type) 1244 switch (ev.type)
968 { 1245 {
969 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
970 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;
971 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
972 1315
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
978 else 1321#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1322 break;
987 } 1323 }
988#endif
989 1324
990 case ButtonPress: 1325 case ButtonPress:
991 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
992 break; 1327 break;
993 1328
… …
995 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
996 break; 1331 break;
997 1332
998 case ClientMessage: 1333 case ClientMessage:
999 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1001 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1002#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1008 { 1354 {
1009 /* Get Dnd data */ 1355 /* Get Dnd data */
1010 Atom ActualType; 1356 Atom ActualType;
1011 int ActualFormat; 1357 int ActualFormat;
1012 unsigned char *data; 1358 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1014 1360
1015 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1363 0L, 1000000L,
1018 False, AnyPropertyType, 1364 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1021 &data); 1367 &data);
1022 XChangeProperty (display->display, display->root, 1368 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1369 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1372 }
1030#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1031 break; 1374 break;
1032 1375
1033 case MappingNotify: 1376 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1377 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1378 break;
1036 1379
1037 /* 1380 /*
1038 * XXX: this is not the _current_ arrangement 1381 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1382 * Here's my conclusion:
… …
1058 break; 1401 break;
1059 } 1402 }
1060 break; 1403 break;
1061 1404
1062 case FocusIn: 1405 case FocusIn:
1063 if (!TermWin.focus) 1406 focus_in ();
1064 {
1065 TermWin.focus = 1;
1066 want_refresh = 1;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075
1076 }
1077 break; 1407 break;
1078 1408
1079 case FocusOut: 1409 case FocusOut:
1080 if (TermWin.focus) 1410 focus_out ();
1081 {
1082 TermWin.focus = 0;
1083 want_refresh = 1;
1084#ifdef USE_XIM
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break; 1411 break;
1096 1412
1097 case ConfigureNotify: 1413 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1099 { 1415 {
… …
1103 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1423 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1425
1110 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1111 { 1427 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1428 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
1114 } 1430 }
1115#ifdef DEBUG_SIZE 1431
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1433 if (options & Opt_transparent)
1123 {
1124 check_our_parents (); 1434 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif 1435#endif
1129 } 1436 }
1437 break;
1438
1439 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1130 break; 1444 break;
1131 1445
1132 case SelectionClear: 1446 case SelectionClear:
1133 selection_clear (); 1447 selection_clear ();
1134 break; 1448 break;
1135 1449
1136 case SelectionNotify: 1450 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1451 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1453 break;
1141 1454
1142 case SelectionRequest: 1455 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1456 selection_send (ev.xselectionrequest);
1144 break; 1457 break;
… …
1165 1478
1166 case GraphicsExpose: 1479 case GraphicsExpose:
1167 case Expose: 1480 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1169 { 1482 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1483 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1487
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1493
1178 // ev.xexpose.width, TermWin.height, False); 1494 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1495 }
1182 else 1496 else
1183 { 1497 {
1184 XEvent unused_event; 1498 XEvent unused_event;
1185 1499
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1501 ;
1188 &unused_event)) ; 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1503 ;
1190 GraphicsExpose, 1504
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1193 { 1506 {
1194 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
1195 scrollbar_show (0); 1508 scrollbar_show (0);
1196 } 1509 }
1197#ifdef MENUBAR 1510#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1512 menubar_expose ();
1200#endif 1513#endif
1514
1515#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1517 XClearWindow (disp, ev.xany.window);
1518#endif
1201 } 1519 }
1202 break; 1520 break;
1203 1521
1204 case MotionNotify: 1522 case MotionNotify:
1205#ifdef POINTER_BLANK 1523#ifdef POINTER_BLANK
… …
1211 { 1529 {
1212 menubar_control (ev.xbutton); 1530 menubar_control (ev.xbutton);
1213 break; 1531 break;
1214 } 1532 }
1215#endif 1533#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1535 break;
1218 1536
1219 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1220 { 1538 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1540 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1224 ; 1542 ;
1225 1543
1226 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1227 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1547 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1548 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1550 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1551 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1552 {
1235#endif 1553#endif
1554#if ISO_14755
1555 // 5.4
1556 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1557 {
1558 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1559 break;
1560 }
1561#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1562 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1563 ev.xbutton.state & Button3Mask ? 2 : 0);
1564
1238#ifdef SELECTION_SCROLLING 1565#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1566 if (ev.xbutton.y < TermWin.int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1241 { 1568 {
1242 int dist; 1569 int dist;
1243 1570
1244 pending_scroll_selection=1;
1245
1246 /* don't clobber the current delay if we are 1571 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1572 * already in the middle of scrolling.
1248 */ 1573 */
1249 if (scroll_selection_delay<=0) 1574 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1576
1252 /* save the event params so we can highlight 1577 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1578 * the selection in the pending-scroll loop
1254 */ 1579 */
1255 selection_save_x=ev.xbutton.x; 1580 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1581 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1583
1260 /* calc number of lines to scroll */ 1584 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1585 if (ev.xbutton.y < TermWin.int_bwidth)
1262 { 1586 {
1263 scroll_selection_dir = UP; 1587 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1588 dist = TermWin.int_bwidth - ev.xbutton.y;
1265 } 1589 }
1266 else 1590 else
1267 { 1591 {
1268 scroll_selection_dir = DN; 1592 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y -
1270 (TermWin.int_bwidth + TermWin.height); 1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1271 } 1594 }
1595
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1596 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1597 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1;
1274 MIN_IT (scroll_selection_lines, 1599 MIN_IT (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1600 SELECTION_SCROLL_MAX_LINES);
1276 } 1601 }
1277 else 1602 else
1278 { 1603 {
1279 /* we are within the text window, so we 1604 /* we are within the text window, so we
1280 * shouldn't be scrolling 1605 * shouldn't be scrolling
1281 */ 1606 */
1282 pending_scroll_selection = 0; 1607 if (sel_scroll_ev.active)
1608 sel_scroll_ev.stop();
1283 } 1609 }
1284#endif 1610#endif
1285#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1286
1287 } 1612 }
1288#endif 1613#endif
1289
1290 } 1614 }
1291 } 1615 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1617 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1619 MotionNotify, &ev))
1620 ;
1621
1296 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1625 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1626 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1628 scrollbar_size ());
1303 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1630 refresh_limit = 0;
… …
1307 break; 1633 break;
1308 } 1634 }
1309} 1635}
1310 1636
1311void 1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698#if TRANSPARENT
1699void
1312rxvt_term::rootwin_cb (XEvent &ev) 1700rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1701{
1314 SET_R (this); 1702 SET_R (this);
1315 SET_LOCALE (locale); 1703 SET_LOCALE (locale);
1316 1704
1317 switch (ev.type) 1705 switch (ev.type)
1318 { 1706 {
1319 case PropertyNotify: 1707 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1708 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1709 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on. 1710 * use the property to determine the pixmap. We use it later on.
1332 */ 1711 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1337 return; 1714 return;
1338 }
1339 1715
1340 /* FALLTHROUGH */ 1716 /* FALLTHROUGH */
1341 case ReparentNotify: 1717 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1719 want_refresh = want_full_refresh = 1;
1344 break; 1720 break;
1345#endif
1346 } 1721 }
1347} 1722}
1723#endif
1348 1724
1349void 1725void
1350rxvt_term::button_press (XButtonEvent &ev) 1726rxvt_term::button_press (XButtonEvent &ev)
1351{ 1727{
1352 int reportmode = 0, clickintime; 1728 int reportmode = 0, clickintime;
1353 1729
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1731 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1732 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733
1357 /* 1734 /*
1358 * VT window processing of button press 1735 * VT window processing of button press
1359 */ 1736 */
1360 if (ev.window == TermWin.vt) 1737 if (ev.window == TermWin.vt)
1361 { 1738 {
1739#if ISO_14755
1740 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 {
1743 iso14755_54 (ev.x, ev.y);
1744 return;
1745 }
1746#endif
1747
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1748 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1749
1363 if (reportmode) 1750 if (reportmode)
1364 { 1751 {
1365 /* mouse report from vt window */ 1752 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1753 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1754 MEvent.state = ev.state;
… …
1396 } 1783 }
1397 else 1784 else
1398 { 1785 {
1399 if (ev.button != MEvent.button) 1786 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1788
1401 switch (ev.button) 1789 switch (ev.button)
1402 { 1790 {
1403 case Button1: 1791 case Button1:
1792 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */
1794#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask);
1796#else
1797 selection.rect = false;
1798#endif
1799
1404 /* allow shift+left click to extend selection */ 1800 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1802 {
1407 if (MEvent.button == Button1 && clickintime) 1803 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1804 selection_rotate (ev.x, ev.y);
1409 else 1805 else
1410 selection_extend (ev.x, ev.y, 1); 1806 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1821 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1822 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1823 selection_rotate (ev.x, ev.y);
1428 else 1824 else
1429 selection_extend (ev.x, ev.y, 1); 1825 selection_extend (ev.x, ev.y, 1);
1826
1430 MEvent.button = Button3; 1827 MEvent.button = Button3;
1431 break; 1828 break;
1432 } 1829 }
1433 } 1830 }
1831
1434 MEvent.time = ev.time; 1832 MEvent.time = ev.time;
1435 return; 1833 return;
1436 } 1834 }
1437 1835
1438 /* 1836 /*
… …
1504 upordown = 1; /* down */ 1902 upordown = 1; /* down */
1505 } 1903 }
1506 if (upordown) 1904 if (upordown)
1507 { 1905 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1906#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1907 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1908#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1909 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1910 {
1513 if (upordown < 0) 1911 if (upordown < 0)
1514 scrollBar.setUp (); 1912 scrollBar.setUp ();
… …
1530 break; 1928 break;
1531 case R_SB_ALIGN_BOTTOM: 1929 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1930 csrO = scrollBar.bot - scrollBar.top;
1533 break; 1931 break;
1534 } 1932 }
1933
1535 if (scrollBar.style == R_SB_XTERM 1934 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 1935 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 1936 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 1938
1540 scrollBar.setMotion (); 1939 scrollBar.setMotion ();
1541 break; 1940 break;
1542 1941
1543 case Button1: 1942 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1943 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1568 scr_page ((ev.button == Button1 ? DN : UP), 1967 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 1968 (TermWin.nrow
1570 * scrollbar_position (ev.y) 1969 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 1970 / scrollbar_size ()));
1572 } 1971 }
1972
1573 break; 1973 break;
1574 } 1974 }
1575 } 1975 }
1576 return; 1976 return;
1577 } 1977 }
… …
1589{ 1989{
1590 int reportmode = 0; 1990 int reportmode = 0;
1591 1991
1592 csrO = 0; /* reset csr Offset */ 1992 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 1993 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1994 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 1995
1596 if (scrollbar_isUpDn ()) 1996 if (scrollbar_isUpDn ())
1597 { 1997 {
1598 scrollBar.setIdle (); 1998 scrollBar.setIdle ();
1599 scrollbar_show (0); 1999 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 2001 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 2002#endif
1603
1604 } 2003 }
2004
1605#ifdef SELECTION_SCROLLING 2005#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2006 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop();
1607#endif 2008#endif
2009
1608 if (ev.window == TermWin.vt) 2010 if (ev.window == TermWin.vt)
1609 { 2011 {
2012#if ISO_14755
2013 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return;
2016#endif
1610 if (reportmode) 2017 if (reportmode)
1611 { 2018 {
1612 /* mouse report from vt window */ 2019 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2020 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2021 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2035 MEvent.button = AnyButton;
1629 mouse_report (ev); 2036 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2037#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2038 return;
1632 } 2039 }
2040
1633 /* 2041 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2042 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2043 * when overriding mouse reporting
1636 */ 2044 */
1637 if (PrivateModes & PrivMode_mouse_report 2045 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2046 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2047 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2048 selection_extend (ev.x, ev.y, 0);
1641 2049
1642 switch (ev.button) 2050 switch (ev.button)
… …
1653 case Button5: 2061 case Button5:
1654 { 2062 {
1655 int i; 2063 int i;
1656 page_dirn v; 2064 page_dirn v;
1657 2065
1658 v = (ev.button == Button4) ? UP : DN; 2066 v = ev.button == Button4 ? UP : DN;
2067
1659 if (ev.state & ShiftMask) 2068 if (ev.state & ShiftMask)
1660 i = 1; 2069 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2070 else if (options & Opt_mouseWheelScrollPage)
1662 i = TermWin.nrow - 1; 2071 i = TermWin.nrow - 1;
1663 else 2072 else
1664 i = 5; 2073 i = 5;
2074
1665# ifdef MOUSE_SLIP_WHEELING 2075# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2076 if (ev.state & ControlMask)
1667 { 2077 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2078 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2081
2082 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084
2085 slip_wheel_ev.start ();
1670 } 2086 }
2087 else
2088 {
1671# endif 2089# endif
1672# ifdef JUMP_MOUSE_WHEEL 2090# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2091 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2092 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2093 scrollbar_show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING
1682 } 2103 }
1683# endif 2104#endif
1684
1685 } 2105 }
1686 break; 2106 break;
1687#endif 2107#endif
1688
1689 } 2108 }
1690 } 2109 }
1691#ifdef MENUBAR 2110#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2111 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2112 menubar_control (ev);
1694#endif 2113#endif
1695} 2114}
1696 2115
1697#ifdef TRANSPARENT 2116#ifdef TRANSPARENT
1698#if TINTING 2117#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2118/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2119
1702static void 2120typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2121
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2122void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2123{
1710 /* No saturation */ 2124 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2125 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i;
1714 2130
1715 b = ((uint16_t *) ptr)[x]; 2131 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2132
1717 g = (b & 0x3e0) * gm; 2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2134
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2135 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2136 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2137 mask_g = visual->green_mask;
1722 } 2138 mask_b = visual->blue_mask;
1723 ptr += bpl; 2139
1724 } 2140 /* boring lookup table pre-initialization */
2141 switch (srcImage->bits_per_pixel) {
2142 case 15:
2143 if ((mask_r != 0x7c00) ||
2144 (mask_g != 0x03e0) ||
2145 (mask_b != 0x001f))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2148 lookup_r = lookup;
2149 lookup_g = lookup+32;
2150 lookup_b = lookup+32+32;
2151 sh_r = 10;
2152 sh_g = 5;
2153 sh_b = 0;
2154 break;
2155 case 16:
2156 if ((mask_r != 0xf800) ||
2157 (mask_g != 0x07e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+64;
2164 sh_r = 11;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 24:
2169 if ((mask_r != 0xff0000) ||
2170 (mask_g != 0x00ff00) ||
2171 (mask_b != 0x0000ff))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2174 lookup_r = lookup;
2175 lookup_g = lookup+256;
2176 lookup_b = lookup+256+256;
2177 sh_r = 16;
2178 sh_g = 8;
2179 sh_b = 0;
2180 break;
2181 case 32:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 default:
2195 return; /* we do not support this color depth */
2196 }
2197
2198 /* prepare limits for color transformation (each channel is handled separately) */
2199 if (shade < 0) {
2200 shade = -shade;
2201 if (shade < 0) shade = 0;
2202 if (shade > 100) shade = 100;
2203
2204 lower_lim_r = 65535-rm;
2205 lower_lim_g = 65535-gm;
2206 lower_lim_b = 65535-bm;
2207
2208 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2209 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2210 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2211
2212 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2213 } else {
1726 for (y = h; --y >= 0;) { 2214 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2215 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2216
1730 b = ((uint16_t *) ptr)[x]; 2217 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2218
1732 g = (b & 0x3e0) * gm; 2219 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2220 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2221 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2222 }
1736 b |= (!(b >> 5) - 1); 2223
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2224 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2225 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2226 {
1740 } 2227 unsigned int tmp;
1741 ptr += bpl; 2228
2229 tmp = lower_lim_r;
2230 lower_lim_r = lower_lim_b;
2231 lower_lim_b = tmp;
2232
2233 tmp = upper_lim_r;
2234 upper_lim_r = upper_lim_b;
2235 upper_lim_b = tmp;
2236 }
2237
2238 /* fill our lookup tables */
2239 for (i = 0; i <= mask_r>>sh_r; i++)
2240 {
2241 RUINT32T tmp;
2242 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2243 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2244 lookup_r[i] = (tmp/65535)<<sh_r;
2245 }
2246 for (i = 0; i <= mask_g>>sh_g; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2250 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2251 lookup_g[i] = (tmp/65535)<<sh_g;
2252 }
2253 for (i = 0; i <= mask_b>>sh_b; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2257 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2258 lookup_b[i] = (tmp/65535)<<sh_b;
2259 }
2260
2261 /* apply table to input image (replacing colors by newly calculated ones) */
2262 switch (srcImage->bits_per_pixel)
2263 {
2264 case 15:
2265 {
2266 unsigned short *p1, *pf, *p, *pl;
2267 p1 = (unsigned short *) srcImage->data;
2268 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width;
2273 for (; p < pl; p++)
1742 } 2274 {
2275 *p = lookup_r[(*p & 0x7c00)>>10] |
2276 lookup_g[(*p & 0x03e0)>> 5] |
2277 lookup_b[(*p & 0x001f)];
2278 }
2279 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2280 }
1744} 2281 break;
1745 2282 }
1746/* RGB 16 */ 2283 case 16:
1747static void 2284 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2285 unsigned short *p1, *pf, *p, *pl;
1749{ 2286 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2287 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2288 while (p1 < pf)
1752 2289 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2290 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2291 pl = p1 + srcImage->width;
1755 /* No saturation */ 2292 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2293 {
1770 } else { 2294 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2295 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2296 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2297 }
1786 ptr += bpl; 2298 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2299 }
2300 break;
2301 }
2302 case 24:
2303 {
2304 unsigned char *p1, *pf, *p, *pl;
2305 p1 = (unsigned char *) srcImage->data;
2306 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width * 3;
2311 for (; p < pl; p += 3)
1787 } 2312 {
2313 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2314 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2315 p[2] = lookup_r[(p[2] & 0x0000ff)];
2316 }
2317 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2318 }
1789} 2319 break;
2320 }
2321 case 32:
2322 {
2323 RUINT32T *p1, *pf, *p, *pl;
2324 p1 = (RUINT32T *) srcImage->data;
2325 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2326
1791/* RGB 24 */ 2327 while (p1 < pf)
1792static void 2328 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2329 p = p1;
1794{ 2330 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2331 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2332 {
1823 } else { 2333 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2334 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2335 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2336 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2337 }
1854 ptr += bpl; 2338 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2339 }
2340 break;
2341 }
1856 } 2342 }
1857}
1858 2343
1859/* RGB 32 */ 2344 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2345}
1930
1931#endif 2346#endif
1932 2347
1933/* 2348/*
1934 * Check our parents are still who we think they are. 2349 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2350 * Do transparency updates if required
… …
1942 Atom atype; 2357 Atom atype;
1943 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2359 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
1947 2363
1948 pchanged = 0; 2364 pchanged = 0;
1949 2365
1950 if (!(Options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
1952 2368
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
1955 2371
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1957 2373
1958 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
1959 { 2375 {
1960 if (am_transparent) 2376 if (am_transparent)
1961 { 2377 {
1962 pchanged = 1; 2378 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
1965 } 2381 }
1966 2382
1967 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
1968 } 2384 }
1969 2385
1970 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False); 2387 XSync (disp, False);
1972 2388
1973 /* 2389 /*
1974 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
1977 */ 2393 */
1978 i = (xa[XA_XROOTPMAPID] 2394 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2397 &nitems, &bytes_after, &prop) == Success);
1982 2398
1983 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2400 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
1988 2404
1989 if (!i || prop == NULL) 2405 if (!i || prop == NULL
2406#if TINTING
2407 || !rs[Rs_color + Color_tint]
2408#endif
2409 )
1990 have_pixmap = 0; 2410 have_pixmap = 0;
1991 else 2411 else
1992 { 2412 {
1993 have_pixmap = 1; 2413 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2414 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2425 Window cr;
2006 XImage *image; 2426 XImage *image;
2007 GC gc; 2427 GC gc;
2008 XGCValues gcvalue; 2428 XGCValues gcvalue;
2009 2429
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2434 nx = ny = 0;
2015 2435
… …
2027 sy = 0; 2447 sy = 0;
2028 } 2448 }
2029 2449
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2032 allowedxerror = -1; 2454 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2456
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2459 allowedxerror = 0;
2038 2460
… …
2041 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
2042 { 2464 {
2043 pchanged = 1; 2465 pchanged = 1;
2044 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
2045 { 2467 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
2047 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
2048 } 2470 }
2049 } 2471 }
2050 2472
2051 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
2052 } 2474 }
2053 else 2475 else
2054 { 2476 {
2055 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2057 2479
2058#if TINTING 2480#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2481 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2482 {
2061 unsigned short shade, rm, gm, bm; 2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2485
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2487
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2488 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2489 }
2076#endif 2490#endif
2077 2491
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2079 szHint.width, szHint.height, image->depth); 2493 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2496 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2498 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2086 TermWin.pixmap); 2500 XClearWindow (disp, TermWin.parent[0]);
2087 2501
2088 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2503 pchanged = 1;
2090 2504
2091 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
2092 } 2506 }
2093 } 2507 }
2094 2508
2095 if (!am_pixmap_trans) 2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2096 { 2512 {
2097 unsigned int n; 2513 unsigned int n;
2098 /* 2514 /*
2099 * InheritPixmap transparency 2515 * InheritPixmap transparency
2100 */ 2516 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 { 2518 {
2104 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2522 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2523
2110 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
2111 { 2525 {
2112 if (oldp != None) 2526 if (oldp != None)
2113 pchanged = 1; 2527 pchanged = 1;
… …
2123 2537
2124 if (pchanged) 2538 if (pchanged)
2125 { 2539 {
2126 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
2127 { 2541 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2544 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break; 2546 break;
2134 } 2547 }
2135 } 2548 }
2136 } 2549 }
2137 2550
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 { 2552 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2555 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
2145 } 2557 }
2146 else 2558 else
2147 { 2559 {
2148#if WAIT_FOR_WM 2560#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2561 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2562 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2563 sleep (1);
2152#endif 2564#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2566 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]);
2569 }
2156 2570
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2158 am_transparent = 1; 2572 am_transparent = 1;
2159 } 2573 }
2160 2574
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
2577 }
2578
2579 if (scrollBar.win)
2580 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle ();
2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2163 } 2591 }
2164 2592
2165 return pchanged; 2593 return pchanged;
2166} 2594}
2167#endif 2595#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2614 if (ch == NOCHAR) // TODO: improve
2187 break; 2615 break;
2188 2616
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2618 {
2619 if (!seen_input)
2620 {
2621 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs
2625 // then sometimes get the size wrong.
2626 // unfortunately other programs are even more buggy and dislike
2627 // being sent SIGWINCH, so only do it when we were in fact being
2628 // resized.
2629 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH);
2631 }
2632
2191 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2635 bool refreshnow = false;
2194 int nlines = 0; 2636 int nlines = 0;
2195 unicode_t *str = buf; 2637 unicode_t *str = buf;
2196 2638
2197 *str++ = ch;
2198
2199 for (;;) 2639 for (;;)
2200 { 2640 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2642 break;
2206 2643
2207 *str++ = ch; 2644 *str++ = ch;
2208 2645
2209 if (ch == C0_LF) 2646 if (ch == C0_LF)
2210 { 2647 {
2211 nlines++; 2648 nlines++;
2212 refresh_count++; 2649 refresh_count++;
2213 2650
2214 if (! (Options & Opt_jumpScroll) 2651 if (!(options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2216 { 2653 {
2217 refreshnow = true; 2654 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR; 2655 ch = NOCHAR;
2220 break; 2656 break;
2221 } 2657 }
2222 2658
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2660 if (nlines >= TermWin.nrow - 1)
2225 { 2661 {
2226 scr_add_lines (buf, nlines, str - buf); 2662 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2663 nlines = 0;
2228 str = buf; 2664 str = buf;
… …
2232 if (str >= buf + UBUFSIZ) 2668 if (str >= buf + UBUFSIZ)
2233 { 2669 {
2234 ch = NOCHAR; 2670 ch = NOCHAR;
2235 break; 2671 break;
2236 } 2672 }
2673
2674 seq_begin = cmdbuf_ptr;
2675 ch = next_char ();
2237 } 2676 }
2238 2677
2239 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2240 2679
2241 /* 2680 /*
2242 * If there have been a lot of new lines, then update the screen 2681 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full. 2682 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which 2683 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2684 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2685 */
2250 if (refreshnow) 2686 if (refreshnow)
2251 { 2687 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2689 refresh_limit++;
2254 else 2690 else
2691 {
2692 flag = true;
2255 scr_refresh (refresh_type); 2693 scr_refresh (refresh_type);
2694 }
2256 } 2695 }
2257 2696
2258 } 2697 }
2259 else 2698 else
2260 { 2699 {
… …
2274 } 2713 }
2275 2714
2276 return flag; 2715 return flag;
2277} 2716}
2278 2717
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725}
2726
2279// read the next character 2727// read the next character
2280unicode_t 2728unicode_t
2281rxvt_term::next_char () 2729rxvt_term::next_char ()
2282{ 2730{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2731 while (cmdbuf_ptr < cmdbuf_endp)
… …
2299 if (len == (size_t)-1) 2747 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301 2749
2302 // assume wchar == unicode 2750 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2751 cmdbuf_ptr += len;
2304 return wc; 2752 return wc & UNICODE_MASK;
2305 } 2753 }
2306 2754
2307 return NOCHAR; 2755 return NOCHAR;
2308} 2756}
2309 2757
… …
2314 */ 2762 */
2315unicode_t 2763unicode_t
2316rxvt_term::cmd_getc () 2764rxvt_term::cmd_getc ()
2317{ 2765{
2318 unicode_t c = next_char (); 2766 unicode_t c = next_char ();
2767
2768 if (c == NOCHAR)
2769 throw out_of_input;
2770
2771 return c;
2772}
2773
2774unicode_t
2775rxvt_term::cmd_get8 ()
2776{
2777 unicode_t c = next_octet ();
2319 2778
2320 if (c == NOCHAR) 2779 if (c == NOCHAR)
2321 throw out_of_input; 2780 throw out_of_input;
2322 2781
2323 return c; 2782 return c;
… …
2424 process_escape_seq (); 2883 process_escape_seq ();
2425 break; 2884 break;
2426 case C0_ENQ: /* terminal Status */ 2885 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2886 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2889 else
2431 tt_write ((unsigned char *)VT100_ANS, 2890 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2891 (unsigned int)strlen (VT100_ANS));
2433 break; 2892 break;
2434 case C0_BEL: /* bell */ 2893 case C0_BEL: /* bell */
2435 scr_bell (); 2894 scr_bell ();
2436 break; 2895 break;
2437 case C0_BS: /* backspace */ 2896 case C0_BS: /* backspace */
… …
2453 break; 2912 break;
2454 case C0_SI: /* shift in - acs */ 2913 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2914 scr_charset_choose (0);
2456 break; 2915 break;
2457 2916
2917#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2918 // 8-bit controls
2459 case 0x90: /* DCS */ 2919 case 0x90: /* DCS */
2460 process_dcs_seq (); 2920 process_dcs_seq ();
2461 break; 2921 break;
2462 case 0x9b: /* CSI */ 2922 case 0x9b: /* CSI */
2463 process_csi_seq (); 2923 process_csi_seq ();
2464 break; 2924 break;
2465 case 0x9d: /* CSI */ 2925 case 0x9d: /* CSI */
2466 process_osc_seq (); 2926 process_osc_seq ();
2467 break; 2927 break;
2928#endif
2468 } 2929 }
2469} 2930}
2470/*}}} */ 2931/*}}} */
2471 2932
2472 2933
… …
2534void 2995void
2535rxvt_term::process_escape_seq () 2996rxvt_term::process_escape_seq ()
2536{ 2997{
2537 unicode_t ch = cmd_getc (); 2998 unicode_t ch = cmd_getc ();
2538 2999
2539 if (PrivateModes & PrivMode_vt52) 3000 if (priv_modes & PrivMode_vt52)
2540 { 3001 {
2541 process_escape_vt52 (ch); 3002 process_escape_vt52 (ch);
2542 return; 3003 return;
2543 } 3004 }
2544 3005
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3020 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3021 break;
2561 case '+': 3022 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3023 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3024 break;
2564#ifndef NO_FRILLS 3025#if ENABLE_FRILLS
2565 case '6': 3026 case '6':
2566 scr_backindex (); 3027 scr_backindex ();
2567 break; 3028 break;
2568#endif 3029#endif
2569 case '7': 3030 case '7':
2570 scr_cursor (SAVE); 3031 scr_cursor (SAVE);
2571 break; 3032 break;
2572 case '8': 3033 case '8':
2573 scr_cursor (RESTORE); 3034 scr_cursor (RESTORE);
2574 break; 3035 break;
2575#ifndef NO_FRILLS 3036#if ENABLE_FRILLS
2576 case '9': 3037 case '9':
2577 scr_forwardindex (); 3038 scr_forwardindex ();
2578 break; 3039 break;
2579#endif 3040#endif
2580 case '=': 3041 case '=':
… …
2661 3122
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3123/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3124/* *INDENT-OFF* */
2664enum { 3125enum {
2665 CSI_ICH = 0x40, 3126 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3127 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3128 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3129 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3130 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3131 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3132 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2759 { 3220 {
2760 switch (priv) 3221 switch (priv)
2761 { 3222 {
2762 case '>': 3223 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2765 break; 3226 break;
2766 case '?': 3227 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3230 break;
… …
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2880 break; 3341 break;
2881 3342
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3344 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3345 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3346 break;
2886 3347
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3349 process_sgr_mode (nargs, arg);
2889 break; 3350 break;
… …
2896 break; 3357 break;
2897 case 6: /* CPR requested */ 3358 case 6: /* CPR requested */
2898 scr_report_position (); 3359 scr_report_position ();
2899 break; 3360 break;
2900 case 7: /* unofficial extension */ 3361 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3362 if (options & Opt_insecure)
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3363 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3364 break;
2904 case 8: /* unofficial extension */ 3365 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3367 break;
2907 } 3368 }
… …
2943 break; 3404 break;
2944 3405
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3406 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3407 if (arg[0] == 4)
2947 scr_insert_mode (0); 3408 scr_insert_mode (0);
3409 else if (arg[0] == 20)
3410 priv_modes &= ~PrivMode_LFNL;
2948 break; 3411 break;
2949 3412
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3413 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3414 if (arg[0] == 4)
2952 scr_insert_mode (1); 3415 scr_insert_mode (1);
3416 else if (arg[0] == 20)
3417 priv_modes |= PrivMode_LFNL;
2953 break; 3418 break;
2954 3419
2955 /* 3420 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3421 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3422 */
… …
2969 break; 3434 break;
2970 case CSI_75: 3435 case CSI_75:
2971 scr_cursor (RESTORE); 3436 scr_cursor (RESTORE);
2972 break; 3437 break;
2973 3438
2974#ifndef NO_FRILLS 3439#if ENABLE_FRILLS
2975 case CSI_74: 3440 case CSI_74:
2976 process_window_ops (arg, nargs); 3441 process_window_ops (arg, nargs);
2977 break; 3442 break;
2978#endif 3443#endif
2979 3444
… …
2986 break; 3451 break;
2987 } 3452 }
2988} 3453}
2989/*}}} */ 3454/*}}} */
2990 3455
2991#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
2992/* ARGSUSED */ 3457/* ARGSUSED */
2993void 3458void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3460{
2996 int x, y; 3461 int x, y;
2997 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
2998 Window wdummy; 3463 Window wdummy;
3464 dDisp;
2999 3465
3000 if (nargs == 0) 3466 if (nargs == 0)
3001 return; 3467 return;
3002 3468
3003 switch (args[0]) 3469 switch (args[0])
3004 { 3470 {
3005 /* 3471 /*
3006 * commands 3472 * commands
3007 */ 3473 */
3008 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
3010 break; 3476 break;
3011 case 2: /* iconify window */ 3477 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3479 break;
3015 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3017 break; 3482 break;
3018 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3485 break;
3021 case 5: /* raise window */ 3486 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
3023 break; 3488 break;
3024 case 6: /* lower window */ 3489 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
3026 break; 3491 break;
3027 case 7: /* refresh window */ 3492 case 7: /* refresh window */
3028 scr_touch (true); 3493 scr_touch (true);
3029 break; 3494 break;
3030 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
3042 3507
3043 /* 3508 /*
3044 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
3045 */ 3510 */
3046 case 11: /* report window state */ 3511 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3514 break;
3050 case 13: /* report window position */ 3515 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3521 break;
3057 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3525 break;
3061 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3063 break; 3528 break;
3064 case 19: /* report window size (chars) */ 3529 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break; 3531 break;
3067 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3533 {
3070 char *s; 3534 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s);
3073 } 3538 }
3074 break; 3539 break;
3075 case 21: /* report window title */ 3540 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3541 {
3078 char *s; 3542 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s);
3081 } 3546 }
3082 break; 3547 break;
3083 } 3548 }
3084} 3549}
3085#endif 3550#endif
3086 3551
… …
3090 * ends_how is terminator used. returned input must be free()'d 3555 * ends_how is terminator used. returned input must be free()'d
3091 */ 3556 */
3092unsigned char * 3557unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3558rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3559{
3095 int seen_esc = 0; /* seen escape? */ 3560 unicode_t ch;
3561 bool seen_esc = false;
3096 unsigned int n = 0; 3562 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3563 wchar_t string[STRING_MAX];
3100 3564
3101 while ((ch = cmd_getc ())) 3565 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3566 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3567 if (seen_esc)
3568 {
3107 if (ch == 0x5c) /* 7bit ST */ 3569 if (ch == 0x5c) /* 7bit ST */
3108 break; 3570 break;
3109 else 3571 else
3110 return NULL; 3572 return NULL;
3111 3573 }
3112 if (ch == C0_ESC) 3574 else if (ch == C0_ESC)
3113 { 3575 {
3114 seen_esc = 1; 3576 seen_esc = true;
3115 continue; 3577 continue;
3116 } 3578 }
3579 else if (ch == C0_BEL || ch == CHAR_ST)
3580 break;
3117 else if (ch == C0_HT) 3581 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3582 return NULL; /* other control character - exit */
3583
3584 seen_esc = false;
3121 3585
3122 if (n >= sizeof (string) - 1) 3586 if (n >= sizeof (string) - 1)
3123 // stop at some sane length 3587 // stop at some sane length
3124 return NULL; 3588 return NULL;
3125 3589
3590 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 ();
3592 else
3126 string[n++] = ch; 3593 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3594 }
3129 3595
3130 string[n++] = '\0'; 3596 string[n++] = '\0';
3131 3597
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3598 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3599
3137 return s; 3600 return (unsigned char *)rxvt_wcstombs (string);
3138} 3601}
3139 3602
3140/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
3141/* 3604/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3186void 3649void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188{ 3651{
3189 if (str[0] == '?' && !str[1]) 3652 if (str[0] == '?' && !str[1])
3190 { 3653 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3654 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3655 pix_colors_focused[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 } 3657 }
3198 else 3658 else
3199 set_window_color (color, str); 3659 set_window_color (color, str);
3200} 3660}
3201 3661
… …
3229{ 3689{
3230 int changed = 0; 3690 int changed = 0;
3231 int color; 3691 int color;
3232 char *buf, *name; 3692 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3693 bool query = str[0] == '?' && !str[1];
3694 int saveop = op;
3695 dDisp;
3234 3696
3235 assert (str != NULL); 3697 assert (str != NULL);
3236 switch (op) 3698 switch (op)
3237 { 3699 {
3238 case XTerm_name: 3700 case XTerm_name:
… …
3245 set_title (str); 3707 set_title (str);
3246 break; 3708 break;
3247 case XTerm_property: 3709 case XTerm_property:
3248 if (str[0] == '?') 3710 if (str[0] == '?')
3249 { 3711 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3712 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3713 Atom actual_type;
3252 int actual_format; 3714 int actual_format;
3253 unsigned long nitems; 3715 unsigned long nitems;
3254 unsigned long bytes_after; 3716 unsigned long bytes_after;
3255 unsigned char *value = 0; 3717 unsigned char *value = 0;
3256 const char *str = ""; 3718 const char *str = "";
3257 3719
3258 if (prop 3720 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3721 && XGetWindowProperty (disp, TermWin.parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3722 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3723 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3724 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3725 && actual_type != None
3264 && actual_format == 8) 3726 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3736
3275 if (eq) 3737 if (eq)
3276 { 3738 {
3277 *eq = 0; 3739 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3740 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3741 }
3283 else 3742 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3743 XDeleteProperty (disp, TermWin.parent[0],
3285 display->atom (str)); 3744 display->atom (str));
3286 } 3745 }
3287 break; 3746 break;
3288 3747
3289 case XTerm_Color: 3748 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3749 for (buf = (char *)str; buf && *buf;)
3291 { 3750 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3751 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3752 break;
3294 3753
3295 *name++ = '\0'; 3754 *name++ = '\0';
3296 color = atoi (buf); 3755 color = atoi (buf);
3297 3756
3298 if (color < 0 || color >= TOTAL_COLORS) 3757 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3758 break;
3300 3759
3301 if ((buf = STRCHR (name, ';')) != NULL) 3760 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3761 *buf++ = '\0';
3303 3762
3304 if (name[0] == '?' && !name[1]) 3763 if (name[0] == '?' && !name[1])
3305 { 3764 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3765 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 } 3768 }
3313 else 3769 else
3314 set_window_color (color + minCOLOR, name); 3770 set_window_color (color + minCOLOR, name);
3315 } 3771 }
3316 break; 3772 break;
… …
3333 break; 3789 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD: 3791 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break; 3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3338 case XTerm_Color_UL: 3797 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3799 break;
3341 case XTerm_Color_RV: 3800 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3343 break; 3810 break;
3344#endif 3811#endif
3345 3812
3346 case XTerm_Pixmap: 3813 case XTerm_Pixmap:
3347 if (*str != ';') 3814 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3817 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3818 set_bgPixmap (str); /* change pixmap */
3352#endif 3819#endif
3353 scr_touch (true); 3820 scr_touch (true);
3354 } 3821 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3822 while ((str = strchr (str, ';')) != NULL)
3356 { 3823 {
3357 str++; 3824 str++;
3358#if XPM_BACKGROUND 3825#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3826 changed += scale_pixmap (str);
3360#endif 3827#endif
3361
3362 } 3828 }
3829
3363 if (changed) 3830 if (changed)
3364 { 3831 {
3365#ifdef XPM_BACKGROUND 3832#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3833 resize_pixmap ();
3367#endif 3834#endif
… …
3379 case XTerm_logfile: 3846 case XTerm_logfile:
3380 // TODO, when secure mode? 3847 // TODO, when secure mode?
3381 break; 3848 break;
3382 3849
3383 case XTerm_font: 3850 case XTerm_font:
3851 op = URxvt_font;
3852 case URxvt_font:
3853#if ENABLE_STYLES
3854 case URxvt_boldFont:
3855 case URxvt_italicFont:
3856 case URxvt_boldItalicFont:
3857#endif
3384 if (query) 3858 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3862 resp);
3863 else
3385 { 3864 {
3386 if (Options & Opt_insecure) 3865 const char *&res = rs[Rs_font + (op - URxvt_font)];
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3866
3388 TermWin.fontset->fontdesc 3867 res = strdup (str);
3389 ? TermWin.fontset->fontdesc 3868 allocated.push_back ((void *)res);
3390 : "", 3869 set_fonts ();
3391 resp);
3392 } 3870 }
3393 else
3394 change_font (str);
3395 break; 3871 break;
3396 3872
3397#ifndef NO_FRILLS 3873#if ENABLE_FRILLS
3398 case XTerm_locale: 3874 case XTerm_locale:
3399 if (query) 3875 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3403 }
3404 else 3877 else
3405 { 3878 {
3406 set_locale (str); 3879 set_locale (str);
3407# ifdef USE_XIM 3880 pty.set_utf8_mode (enc_utf8);
3408 im_cb (); 3881 init_xlocale ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 } 3882 }
3420 break; 3883 break;
3421#endif 3884#endif
3422 3885
3423#ifdef MENUBAR 3886#ifdef MENUBAR
3424 case XTerm_Menu: 3887 case XTerm_Menu:
3425 if (Options & Opt_insecure) 3888 if (options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3890 break;
3428#endif 3891#endif
3429#if 0 3892#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3893 case XTerm_dumpscreen: /* no error notices */
… …
3457{ 3920{
3458 int state; 3921 int state;
3459 3922
3460 if (mode == 's') 3923 if (mode == 's')
3461 { 3924 {
3462 SavedModes |= (PrivateModes & bit); 3925 SavedModes |= (priv_modes & bit);
3463 return -1; 3926 return -1;
3464 } 3927 }
3465 else 3928 else
3466 { 3929 {
3467 if (mode == 'r') 3930 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3932 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3933 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3934 PrivMode (state, bit);
3472 } 3935 }
3473 3936
3474 return state; 3937 return state;
3475} 3938}
… …
3493 { 3, PrivMode_132 }, 3956 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3957 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 3958 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 3959 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 3960 { 7, PrivMode_Autowrap },
3961 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 3962 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3963#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 3964 { menuBar_esc, PrivMode_menuBar },
3501#endif 3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 3968#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3969 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3970#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3971 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 3972 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3973 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3974 // 45 margin bell NYI
3512 // 46 start logging 3975 // 46 start logging
… …
3553 4016
3554 /* extra handling for values with state unkept */ 4017 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4018 switch (arg[i])
3556 { 4019 {
3557 case 1048: /* alternative cursor save */ 4020 case 1048: /* alternative cursor save */
4021 case 1049:
3558 if (Options & Opt_secondaryScreen) 4022 if (options & Opt_secondaryScreen)
3559 if (mode == 0) 4023 if (mode == 0)
3560 scr_cursor (RESTORE); 4024 scr_cursor (RESTORE);
3561 else if (mode == 1) 4025 else if (mode == 1)
3562 scr_cursor (SAVE); 4026 scr_cursor (SAVE);
3563 break; 4027 break;
… …
3574 * within VT52 mode 4038 * within VT52 mode
3575 */ 4039 */
3576 PrivMode (1, PrivMode_vt52); 4040 PrivMode (1, PrivMode_vt52);
3577 break; 4041 break;
3578 case 3: /* 80/132 */ 4042 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4043 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3581 break; 4045 break;
3582 case 4: /* smooth scrolling */ 4046 case 4: /* smooth scrolling */
3583 if (state) 4047 if (state)
3584 Options &= ~Opt_jumpScroll; 4048 options &= ~Opt_jumpScroll;
3585 else 4049 else
3586 Options |= Opt_jumpScroll; 4050 options |= Opt_jumpScroll;
3587 break; 4051 break;
3588 case 5: /* reverse video */ 4052 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4053 scr_rvideo_mode (state);
3590 break; 4054 break;
3591 case 6: /* relative/absolute origins */ 4055 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4059 scr_autowrap (state);
3596 break; 4060 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 4061 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 4062 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4063 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4064 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4065 break;
3602#ifdef menuBar_esc 4066#ifdef menuBar_esc
3603 case menuBar_esc: 4067 case menuBar_esc:
3604#ifdef MENUBAR 4068#ifdef MENUBAR
3605 map_menuBar (state); 4069 map_menuBar (state);
… …
3625 break; 4089 break;
3626 /* case 66: - application key pad */ 4090 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4091 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4092 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4093 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4094 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4095 break;
3632#if 0 4096#if 0
3633 case 1001: 4097 case 1001:
3634 break; /* X11 mouse highlighting */ 4098 break; /* X11 mouse highlighting */
3635#endif 4099#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4100 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4101 if (state)
3638 Options &= ~Opt_scrollTtyOutput; 4102 options &= ~Opt_scrollTtyOutput;
3639 else 4103 else
3640 Options |= Opt_scrollTtyOutput; 4104 options |= Opt_scrollTtyOutput;
3641 break; 4105 break;
3642 case 1011: /* scroll to bottom on key press */ 4106 case 1011: /* scroll to bottom on key press */
3643 if (state) 4107 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4108 options |= Opt_scrollTtyKeypress;
3645 else 4109 else
3646 Options &= ~Opt_scrollTtyKeypress; 4110 options &= ~Opt_scrollTtyKeypress;
3647 break; 4111 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4112 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4113 if (options & Opt_secondaryScreen)
3650 if (current_screen != PRIMARY) 4114 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4115 scr_erase_screen (2);
3652 scr_change_screen (state); 4116 scr_change_screen (state);
3653 break; 4117 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4118 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4119 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4120 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4121 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4122 scr_erase_screen (2);
3659 break; 4123 break;
3660 default: 4124 default:
3661 break; 4125 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4151 rendset = 0, rendstyle = ~RS_None;
3688 break; 4152 break;
3689 case 1: 4153 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4154 rendset = 1, rendstyle = RS_Bold;
3691 break; 4155 break;
4156 //case 2: // low intensity
4157 case 3:
4158 rendset = 1, rendstyle = RS_Italic;
4159 break;
3692 case 4: 4160 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4161 rendset = 1, rendstyle = RS_Uline;
3694 break; 4162 break;
3695 case 5: 4163 case 5: // slowly blinking
4164 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4165 rendset = 1, rendstyle = RS_Blink;
3697 break; 4166 break;
3698 //case 6: // scoansi light background 4167 //case 6: // scoansi light background
3699 case 7: 4168 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4169 rendset = 1, rendstyle = RS_RVid;
3701 break; 4170 break;
3702 case 8: 4171 case 8:
3703 // invisible. NYI 4172 // invisible. NYI
3704 break; 4173 break;
4174 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4175 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4176 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4177 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4178 //...
4179 //case 19: // ninth alt font
4180 //case 20: // gothic
4181 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4182 rendset = 0, rendstyle = RS_Bold;
3710 break; 4183 break;
3711 case 22: 4184 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4185 rendset = 0, rendstyle = RS_Bold;
4186 break;
4187 case 23: // disable italic
4188 rendset = 0, rendstyle = RS_Italic;
3713 break; 4189 break;
3714 case 24: 4190 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4191 rendset = 0, rendstyle = RS_Uline;
3716 break; 4192 break;
3717 case 25: 4193 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4194 rendset = 0, rendstyle = RS_Blink;
3719 break; 4195 break;
4196 case 26: // variable spacing (iso 8613)
4197 rendset = 0, rendstyle = RS_Blink;
4198 break;
3720 case 27: 4199 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4200 rendset = 0, rendstyle = RS_RVid;
3722 break; 4201 break;
3723 case 28:
3724 // visible. NYI 4202 //case 28: // visible. NYI
3725 break; 4203 //case 29: // not crossed-out
3726 } 4204 }
3727 4205
3728 if (rendset != -1) 4206 if (rendset != -1)
3729 { 4207 {
3730 scr_rendition (rendset, rendstyle); 4208 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4219 case 35:
3742 case 36: 4220 case 36:
3743 case 37: 4221 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4222 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4223 break;
3746#ifdef TTY_256COLOR 4224 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4225 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4226 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4227 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4228 i += 2;
3752 } 4229 }
3753 break; 4230 break;
3754#endif
3755 case 39: /* default fg */ 4231 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4232 scr_color (Color_fg, Color_fg);
3757 break; 4233 break;
3758 4234
3759 case 40: 4235 case 40:
… …
3764 case 45: 4240 case 45:
3765 case 46: 4241 case 46:
3766 case 47: 4242 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4243 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4244 break;
3769#ifdef TTY_256COLOR 4245 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4246 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4247 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4248 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4249 i += 2;
3775 } 4250 }
3776 break; 4251 break;
3777#endif
3778 case 49: /* default bg */ 4252 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4253 scr_color (Color_bg, Color_bg);
3780 break; 4254 break;
4255
4256 //case 50: // not variable spacing
3781 4257
3782#ifndef NO_BRIGHTCOLOR 4258#ifndef NO_BRIGHTCOLOR
3783 case 90: 4259 case 90:
3784 case 91: /* set bright fg color */ 4260 case 91: /* set bright fg color */
3785 case 92: 4261 case 92:
3786 case 93: 4262 case 93:
3787 case 94: 4263 case 94:
3788 case 95: 4264 case 95:
3789 case 96: 4265 case 96:
3790 case 97: 4266 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4267 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4268 break;
3794 case 100: 4269 case 100:
3795 case 101: /* set bright bg color */ 4270 case 101: /* set bright bg color */
3796 case 102: 4271 case 102:
3797 case 103: 4272 case 103:
3798 case 104: 4273 case 104:
3799 case 105: 4274 case 105:
3800 case 106: 4275 case 106:
3801 case 107: 4276 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4278 break;
3805#endif 4279#endif
3806 4280
3807 } 4281 }
3808 } 4282 }
… …
3815{ 4289{
3816 unicode_t ch, cmd = cmd_getc (); 4290 unicode_t ch, cmd = cmd_getc ();
3817 4291
3818 if (cmd == 'Q') 4292 if (cmd == 'Q')
3819 { /* query graphics */ 4293 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4294 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4295 return;
3822 } 4296 }
3823 /* swallow other graphics sequences until terminating ':' */ 4297 /* swallow other graphics sequences until terminating ':' */
3824 do 4298 do
3825 ch = cmd_getc (); 4299 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4314 unsigned char buf[256];
3841 4315
3842 va_start (arg_ptr, fmt); 4316 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4318 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4319 tt_write (buf, strlen (buf));
3846} 4320}
3847 4321
3848/* ---------------------------------------------------------------------- */ 4322/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4323/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4324 * or generated by us in response to a query ESC sequence.
3851 */ 4325 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327
3852void 4328void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4329rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4330{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4331 if (v_buflen == 0)
4332 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4334
3857 if (len) 4335 if ((unsigned int)written == len)
4336 return;
4337
4338 data += written;
4339 len -= written;
3858 { 4340 }
4341
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4343
4344 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len;
4346
4347 pty_ev.set (EVENT_READ | EVENT_WRITE);
4348}
4349
4350void rxvt_term::pty_write ()
4351{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353
4354 if (written > 0)
4355 {
4356 v_buflen -= written;
4357
3859 if (v_buflen == 0) 4358 if (v_buflen == 0)
3860 { 4359 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4360 free (v_buffer);
3888 v_buffer = 0; 4361 v_buffer = 0;
3889 v_buflen = 0; 4362 v_buflen = 0;
3890 4363
3891 pty_ev.set (EVENT_READ); 4364 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4365 return;
3904 } 4366 }
4367
4368 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4369 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this...
4372 destroy ();
3906} 4373}
3907 4374
3908/*----------------------- end-of-file (C source) -----------------------*/ 4375/*----------------------- end-of-file (C source) -----------------------*/
3909 4376

Diff Legend

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