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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.206 by root, Thu Aug 11 02:05:07 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= TermWin.ncol
141 || y < 0 || y >= TermWin.nrow)
142 return;
143
144 for (;;)
145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54;
153 break;
154 }
155
156 x--;
157 }
158
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173#if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181#endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 int width = wcswidth (fname, wcslen (fname));
191
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
193
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195
196 for (int y = 0; y < len; y++)
197 {
198 char buf[9];
199
200 ch = *chr++;
201
202 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '=');
205#if !UNICODE3
206 if (ch >= 0x10000)
207 ch = 0xfffd;
208#endif
209 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r);
211 }
212
213 scr_overlay_set (0, len, fname);
214
215 free (fname);
216
217#if ENABLE_COMBINING
218 if (alloc)
219 delete [] alloc;
220#endif
221}
222#endif
223
224void
225rxvt_term::commit_iso14755 ()
226{
227 wchar_t ch[2];
228
229 ch[0] = iso14755buf & ISO_14755_MASK;
230 ch[1] = 0;
231
232 if (iso14755buf & ISO_14755_51)
233 {
234 char mb[16];
235 int len;
236
237 // allow verbatim 0-bytes and control-bytes to be entered
238 if (ch[0] >= 0x20)
239 len = wcstombs (mb, ch, 16);
240 else
241 {
242 mb[0] = ch[0];
243 len = 1;
244 }
245
246 if (len > 0)
247 tt_write ((unsigned char *)mb, len);
248 else
249 scr_bell ();
250 }
251
252 iso14755buf = 0;
253}
254
255int
256rxvt_term::hex_keyval (XKeyEvent &ev)
257{
258 // check wether this event corresponds to a hex digit
259 // if the modifiers had not been pressed.
260 for (int index = 0; index < 8; index++)
261 {
262 KeySym k = XLookupKeysym (&ev, index);
263
264 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
265 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
266 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
267 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
268 }
269
270 return -1;
271}
272#endif
61 273
62/*{{{ Convert the keypress event into a string */ 274/*{{{ Convert the keypress event into a string */
63void 275void
64rxvt_term::lookup_key (XKeyEvent &ev) 276rxvt_term::lookup_key (XKeyEvent &ev)
65{ 277{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
78 * 290 *
79 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
80 */ 292 */
81 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
84 296
85 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
86 { 298 {
87 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 320
109 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
113 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
116 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 331 SET_LOCALE (locale);
118 332
119 if (status_return == XLookupChars 333 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
148 } 362 }
149 363
150 if (valid_keysym) 364 if (valid_keysym)
151 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
152 if (TermWin.saveLines) 371 if (TermWin.saveLines)
153 { 372 {
154#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 374 if (!ctrl && !meta)
156 {
157#else 375#else
158 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
377#endif
159 { 378 {
160#endif
161 int lnsppg; 379 int lnsppg;
162 380
163#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 383#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 432 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 433 {
216 keysym += (XK_F11 - XK_F1); 434 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 435 shft = 0; /* turn off Shift */
218 } 436 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 437 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 438 {
221 switch (keysym) 439 switch (keysym)
222 { 440 {
223 /* normal XTerm key bindings */ 441 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 442 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 443 selection_request (ev.time, 0, 0);
226 return; 444 return;
445#if TODO
227 /* rxvt extras */ 446 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 447 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 448 change_font (FONT_UP);
230 return; 449 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 450 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 451 change_font (FONT_DN);
233 return; 452 return;
453#endif
234 } 454 }
235 } 455 }
236 } 456 }
237#ifdef PRINTPIPE 457
238 if (keysym == XK_Print) 458#if ENABLE_FRILLS || ISO_14755
239 { 459 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 460 if (shft && ctrl)
241 return;
242 } 461 {
243#endif 462 int hv;
244 463
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 464 if (iso14755buf & ISO_14755_51
246 { 465 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 466 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 467 {
250 unsigned int l; 468 commit_iso14755 ();
251 const unsigned char *kbuf0; 469 iso14755buf = ISO_14755_51;
252 470# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 471 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 472# endif
261 ) 473 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 474 }
266 475 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 476 {
477 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
478 | hv | ISO_14755_51;
479# if ISO_14755
480 iso14755_51 (iso14755buf & ISO_14755_MASK);
481# endif
268 return; 482 return;
269 } 483 }
270 else 484 else
485 {
486# if ENABLE_OVERLAY
487 scr_overlay_off ();
271#endif 488# endif
489 iso14755buf = 0;
490 }
491 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED))
495 {
496 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif
501 }
502#endif
503
504#ifdef PRINTPIPE
505 if (keysym == XK_Print)
506 {
507 scr_printscreen (ctrl | shft);
508 return;
509 }
510#endif
511
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 {
272 { 514 {
273 newlen = 1; 515 newlen = 1;
274 switch (keysym) 516 switch (keysym)
275 { 517 {
276#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 519 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 520 if (priv_modes & PrivMode_HaveBackSpace)
279 { 521 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 523 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 524 kbuf[1] = '\0';
283 } 525 }
284 else 526 else
285 STRCPY (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
286 break; 528 break;
287#endif 529#endif
288#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
289 case XK_Delete: 541 case XK_Delete:
290 STRCPY (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
291 break; 543 break;
292#endif 544#endif
293 case XK_Tab: 545 case XK_Tab:
294 if (shft) 546 if (shft)
295 STRCPY (kbuf, "\033[Z"); 547 strcpy (kbuf, "\033[Z");
296 else 548 else
297 { 549 {
298#ifdef CTRL_TAB_MAKES_META 550#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 551 if (ctrl)
300 meta = 1; 552 meta = 1;
… …
306 newlen = 0; 558 newlen = 0;
307 } 559 }
308 break; 560 break;
309 561
310#ifdef XK_KP_Left 562#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 563 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 564 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 565 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 566 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 568 {
317 STRCPY (kbuf, "\033OZ"); 569 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 571 break;
320 } 572 }
321 else 573 else
322 /* translate to std. cursor key */ 574 /* translate to std. cursor key */
… …
325#endif 577#endif
326 case XK_Up: /* "\033[A" */ 578 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 579 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 580 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 581 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 582 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 583 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 584 /* do Shift first */
333 if (shft) 585 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 586 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 587 else if (ctrl)
336 { 588 {
337 kbuf[1] = 'O'; 589 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 590 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 591 }
340 else if (PrivateModes & PrivMode_aplCUR) 592 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 593 kbuf[1] = 'O';
342 break; 594 break;
343 595
344#ifndef UNSHIFTED_SCROLLKEYS 596#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 597# ifdef XK_KP_Prior
346 case XK_KP_Prior: 598 case XK_KP_Prior:
347 /* allow shift to override */ 599 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 601 {
350 STRCPY (kbuf, "\033Oy"); 602 strcpy (kbuf, "\033Oy");
351 break; 603 break;
352 } 604 }
353 /* FALLTHROUGH */ 605 /* FALLTHROUGH */
354# endif 606# endif
355 case XK_Prior: 607 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 608 strcpy (kbuf, "\033[5~");
357 break; 609 break;
358# ifdef XK_KP_Next 610# ifdef XK_KP_Next
359 case XK_KP_Next: 611 case XK_KP_Next:
360 /* allow shift to override */ 612 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 614 {
363 STRCPY (kbuf, "\033Os"); 615 strcpy (kbuf, "\033Os");
364 break; 616 break;
365 } 617 }
366 /* FALLTHROUGH */ 618 /* FALLTHROUGH */
367# endif 619# endif
368 case XK_Next: 620 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 621 strcpy (kbuf, "\033[6~");
370 break; 622 break;
371#endif 623#endif
372 case XK_KP_Enter: 624 case XK_KP_Enter:
373 /* allow shift to override */ 625 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 627 {
376 STRCPY (kbuf, "\033OM"); 628 strcpy (kbuf, "\033OM");
629 break;
630 }
631
632 /* FALLTHROUGH */
633
634 case XK_Return:
635 if (priv_modes & PrivMode_LFNL)
636 {
637 kbuf[0] = '\015';
638 kbuf[1] = '\012';
639 kbuf[2] = '\0';
377 } 640 }
378 else 641 else
379 { 642 {
380 kbuf[0] = '\r'; 643 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 644 kbuf[1] = '\0';
382 } 645 }
383 break; 646 break;
384 647
385#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
386 case XK_KP_Begin: 649 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
388 break; 651 break;
389 652
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 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
438 case XK_Insert: 705 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
440 break; 707 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 709 case DXK_Remove:
443 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
444#endif 711#endif
445 case XK_Execute: 712 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 713 strcpy (kbuf, "\033[3~");
447 break; 714 break;
448 case XK_Select: 715 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 716 strcpy (kbuf, "\033[4~");
450 break; 717 break;
451#ifdef XK_KP_End 718#ifdef XK_KP_End
452 case XK_KP_End: 719 case XK_KP_End:
453 /* allow shift to override */ 720 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 722 {
456 STRCPY (kbuf, "\033Oq"); 723 strcpy (kbuf, "\033Oq");
457 break; 724 break;
458 } 725 }
459 /* FALLTHROUGH */ 726 /* FALLTHROUGH */
460#endif 727#endif
461 case XK_End: 728 case XK_End:
462 STRCPY (kbuf, KS_END); 729 strcpy (kbuf, KS_END);
463 break; 730 break;
464#ifdef XK_KP_Home 731#ifdef XK_KP_Home
465 case XK_KP_Home: 732 case XK_KP_Home:
466 /* allow shift to override */ 733 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 735 {
469 STRCPY (kbuf, "\033Ow"); 736 strcpy (kbuf, "\033Ow");
470 break; 737 break;
471 } 738 }
472 /* FALLTHROUGH */ 739 /* FALLTHROUGH */
473#endif 740#endif
474 case XK_Home: 741 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 742 strcpy (kbuf, KS_HOME);
476 break; 743 break;
477 744
478#define FKEY(n, fkey) \ 745#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 746 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 747
… …
532#undef FKEY 799#undef FKEY
533 default: 800 default:
534 newlen = 0; 801 newlen = 0;
535 break; 802 break;
536 } 803 }
804
537 if (newlen) 805 if (newlen)
538 len = STRLEN (kbuf); 806 len = strlen (kbuf);
539 } 807 }
540 808
541 /* 809 /*
542 * Pass meta for all function keys, if 'meta' option set 810 * Pass meta for all function keys, if 'meta' option set
543 */ 811 */
… …
550 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
551 { 819 {
552 len = 1; 820 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
827 }
555 else 828 else
556 { 829 {
557#ifdef META8_OPTION 830#ifdef META8_OPTION
558 /* set 8-bit on */ 831 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 832 if (meta && (meta_char == 0x80))
… …
571 } 844 }
572 845
573 if (len <= 0) 846 if (len <= 0)
574 return; /* not mapped */ 847 return; /* not mapped */
575 848
576 if (Options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 850 if (TermWin.view_start)
578 { 851 {
579 TermWin.view_start = 0; 852 TermWin.view_start = 0;
580 want_refresh = 1; 853 want_refresh = 1;
581 } 854 }
… …
617#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
619} 892}
620/*}}} */ 893/*}}} */
621 894
622#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
625unsigned int 898unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 900{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 903 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 905
633 if (n > 0 && s < count) 906 if (n > 0 && s < count)
634 { 907 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 908 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 909 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 910 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 911 cmdbuf_endp -= n;
639 s += n; 912 s += n;
640 } 913 }
… …
650 923
651 cmd_parse (); 924 cmd_parse ();
652 925
653 return 0; 926 return 0;
654} 927}
655#endif /* MENUBAR_MAX */ 928#endif
656 929
657void 930void
658rxvt_term::flush () 931rxvt_term::flush ()
659{ 932{
933 flush_ev.stop ();
934
660#ifdef TRANSPARENT 935#ifdef TRANSPARENT
661 if (want_full_refresh) 936 if (want_full_refresh)
662 { 937 {
663 want_full_refresh = 0; 938 want_full_refresh = 0;
664 scr_clear (); 939 scr_clear ();
665 scr_touch (false); 940 scr_touch (false);
666 want_refresh = 1;
667 } 941 }
668#endif 942#endif
669 943
670 if (want_refresh) 944 if (want_refresh)
671 { 945 {
… …
683rxvt_term::check_cb (check_watcher &w) 957rxvt_term::check_cb (check_watcher &w)
684{ 958{
685 SET_R (this); 959 SET_R (this);
686 SET_LOCALE (locale); 960 SET_LOCALE (locale);
687 961
962 display->flush ();
963
964 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01);
966}
967
968void
969rxvt_term::flush_cb (time_watcher &w)
970{
971 SET_R (this);
972 SET_LOCALE (locale);
973
974 refresh_limit = 1;
975 refresh_count = 0;
688 flush (); 976 flush ();
689} 977}
690 978
691#ifdef CURSOR_BLINK 979#ifdef CURSOR_BLINK
692void 980void
… …
746{ 1034{
747 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
751 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1044 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1046 }
755} 1047}
… …
768 1060
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1061 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1062 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1063 cmdbuf_endp = cmdbuf_ptr + n;
772 1064
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1066
775 if (n > 0) 1067 if (n > 0)
776 { 1068 {
777 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
778 return true; 1070 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1080{
789 SET_R (this); 1081 SET_R (this);
790 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
791 1083
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1086 while (pty_fill ())
797 if (cmd_parse ()) 1087 if (cmd_parse ())
798 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
1092}
1093
1094void
1095rxvt_term::pointer_unblank ()
1096{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1098 recolour_cursor ();
1099
1100#ifdef POINTER_BLANK
1101 hidden_pointer = 0;
1102
1103 if (options & Opt_pointerBlank)
1104 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif
799} 1106}
800 1107
801#ifdef POINTER_BLANK 1108#ifdef POINTER_BLANK
802void 1109void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
816{ 1111{
817 if (! (Options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
818 return; 1113 return;
819 1114
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
821 XFlush (display->display); 1116 XFlush (display->display);
822 1117
823 hidden_pointer = 1; 1118 hidden_pointer = 1;
824} 1119}
825 1120
… …
842 x = ev.x; 1137 x = ev.x;
843 y = ev.y; 1138 y = ev.y;
844 pixel_position (&x, &y); 1139 pixel_position (&x, &y);
845 1140
846 if (MEvent.button == AnyButton) 1141 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1142 button_number = 3;
849 }
850 else 1143 else
851 { 1144 {
852 button_number = MEvent.button - Button1; 1145 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1146 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1147 if (button_number >= 3)
855 button_number += (64 - 3); 1148 button_number += (64 - 3);
856 } 1149 }
857 1150
858 if (PrivateModes & PrivMode_MouseX10) 1151 if (priv_modes & PrivMode_MouseX10)
859 { 1152 {
860 /* 1153 /*
861 * do not report ButtonRelease 1154 * do not report ButtonRelease
862 * no state info allowed 1155 * no state info allowed
863 */ 1156 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1171 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1172 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1173#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1174 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1175#endif
883
884 } 1176 }
885 1177
886#ifdef DEBUG_MOUSEREPORT 1178#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1179 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1180 if (key_state & 16)
889 fputc ('C', stderr); 1181 fputc ('C', stderr);
890 if (key_state & 4) 1182 if (key_state & 4)
891 fputc ('S', stderr); 1183 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1187 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1188 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1189 button_number,
898 x + 1, 1190 x + 1,
899 y + 1); 1191 y + 1);
900#else 1192#endif
1193
901 tt_printf ("\033[M%c%c%c", 1194 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1195 (32 + button_number + key_state),
903 (32 + x + 1), 1196 (32 + x + 1),
904 (32 + y + 1)); 1197 (32 + y + 1));
905#endif
906} 1198}
907 1199
908#ifdef USING_W11LIB 1200#ifdef USING_W11LIB
909void 1201void
910rxvt_W11_process_x_event (XEvent *ev) 1202rxvt_W11_process_x_event (XEvent *ev)
… …
917 1209
918/*{{{ process an X event */ 1210/*{{{ process an X event */
919void 1211void
920rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
921{ 1213{
1214 dDisp;
1215
922 SET_R (this); 1216 SET_R (this);
923 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
924 1218
925#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
927 { 1221 {
928 if (hidden_cursor) 1222 if (hidden_cursor)
929 { 1223 {
930 hidden_cursor = 0; 1224 hidden_cursor = 0;
931 want_refresh = 1; 1225 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1229 }
936#endif 1230#endif
937 1231
938#if defined(POINTER_BLANK) 1232#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1234 {
941 if (ev.type == MotionNotify 1235 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1236 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1237 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1238 if (hidden_pointer)
… …
947 if (ev.type == KeyPress && hidden_pointer == 0) 1241 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank (); 1242 pointer_blank ();
949 } 1243 }
950#endif 1244#endif
951 1245
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return;
955#endif
956
957 Window unused_root, unused_child; 1246 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1247 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1248 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1249
1010 switch (ev.type) 1250 switch (ev.type)
1011 { 1251 {
1012 case KeyPress: 1252 case KeyPress:
1253#if ISO_14755
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1013 lookup_key (ev.xkey); 1256 lookup_key (ev.xkey);
1257
1258 break;
1259
1260 case KeyRelease:
1261 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1014 break; 1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1015 1321
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1323 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1324 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1326 mouse_slip_wheel_speed = 0;
1028 } 1327#endif
1029 break; 1328 break;
1030 } 1329 }
1031#endif
1032 1330
1033 case ButtonPress: 1331 case ButtonPress:
1034 button_press (ev.xbutton); 1332 button_press (ev.xbutton);
1035 break; 1333 break;
1036 1334
… …
1038 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1039 break; 1337 break;
1040 1338
1041 case ClientMessage: 1339 case ClientMessage:
1042 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1044 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1045#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1051 { 1367 {
1052 /* Get Dnd data */ 1368 /* Get Dnd data */
1053 Atom ActualType; 1369 Atom ActualType;
1054 int ActualFormat; 1370 int ActualFormat;
1055 unsigned char *data; 1371 unsigned char *data;
1056 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1057 1373
1058 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1059 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1060 0L, 1000000L, 1376 0L, 1000000L,
1061 False, AnyPropertyType, 1377 False, AnyPropertyType,
1062 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1063 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1064 &data); 1380 &data);
1065 XChangeProperty (display->display, display->root, 1381 set_string_property (XA_CUT_BUFFER0, data);
1066 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace,
1068 data, STRLEN (data));
1069 XFree (data); 1382 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1072 } 1385 }
1073#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1074 break; 1387 break;
1075 1388
1076 case MappingNotify: 1389 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1390 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1391 break;
1079 1392
1080 /* 1393 /*
1081 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1101 break; 1414 break;
1102 } 1415 }
1103 break; 1416 break;
1104 1417
1105 case FocusIn: 1418 case FocusIn:
1106 if (!TermWin.focus) 1419 focus_in ();
1107 {
1108 TermWin.focus = 1;
1109 want_refresh = 1;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118
1119 }
1120 break; 1420 break;
1121 1421
1122 case FocusOut: 1422 case FocusOut:
1123 if (TermWin.focus) 1423 focus_out ();
1124 {
1125 TermWin.focus = 0;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break; 1424 break;
1139 1425
1140 case ConfigureNotify: 1426 case ConfigureNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1142 { 1428 {
… …
1146 { /* Wrap lots of configures into one */ 1432 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width; 1433 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height; 1434 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 } 1436 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1152 1438
1153 if (szHint.width != width || szHint.height != height) 1439 if (szHint.width != width || szHint.height != height)
1154 { 1440 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1441 seen_resize = 1;
1156 resize_all_windows (width, height, 1); 1442 resize_all_windows (width, height, 1);
1157 } 1443 }
1158#ifdef DEBUG_SIZE 1444
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1166 {
1167 check_our_parents (); 1447 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif 1448#endif
1172 } 1449 }
1450 break;
1451
1452 case PropertyNotify:
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456
1173 break; 1457 break;
1174 1458
1175 case SelectionClear: 1459 case SelectionClear:
1176 selection_clear (); 1460 selection_clear ();
1177 break; 1461 break;
1178 1462
1179 case SelectionNotify: 1463 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1464 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1465 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1466 break;
1184 1467
1185 case SelectionRequest: 1468 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1469 selection_send (ev.xselectionrequest);
1187 break; 1470 break;
… …
1208 1491
1209 case GraphicsExpose: 1492 case GraphicsExpose:
1210 case Expose: 1493 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1494 if (ev.xany.window == TermWin.vt)
1212 { 1495 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1496 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1500
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1504 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1505 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1506
1221 // ev.xexpose.width, TermWin.height, False); 1507 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1508 }
1225 else 1509 else
1226 { 1510 {
1227 XEvent unused_event; 1511 XEvent unused_event;
1228 1512
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1230 ; 1514 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1516 ;
1233 1517
1234 if (isScrollbarWindow (ev.xany.window)) 1518 if (isScrollbarWindow (ev.xany.window))
1235 { 1519 {
1236 scrollBar.setIdle (); 1520 scrollBar.setIdle ();
… …
1238 } 1522 }
1239#ifdef MENUBAR 1523#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1525 menubar_expose ();
1242#endif 1526#endif
1527
1528#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1530 XClearWindow (disp, ev.xany.window);
1531#endif
1243 } 1532 }
1244 break; 1533 break;
1245 1534
1246 case MotionNotify: 1535 case MotionNotify:
1247#ifdef POINTER_BLANK 1536#ifdef POINTER_BLANK
… …
1253 { 1542 {
1254 menubar_control (ev.xbutton); 1543 menubar_control (ev.xbutton);
1255 break; 1544 break;
1256 } 1545 }
1257#endif 1546#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1259 break; 1548 break;
1260 1549
1261 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == TermWin.vt)
1262 { 1551 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1552 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1553 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1266 ; 1555 ;
1267 1556
1268 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (disp, TermWin.vt,
1269 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1560 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1561 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1563 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1564 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1565 {
1277#endif 1566#endif
1567#if ISO_14755
1568 // 5.4
1569 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1570 {
1571 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1572 break;
1573 }
1574#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1575 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1576 ev.xbutton.state & Button3Mask ? 2 : 0);
1577
1280#ifdef SELECTION_SCROLLING 1578#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1579 if (ev.xbutton.y < TermWin.int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1283 { 1581 {
1284 int dist; 1582 int dist;
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1589
1292 /* save the event params so we can highlight 1590 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1591 * the selection in the pending-scroll loop
1294 */ 1592 */
1295 selection_save_x=ev.xbutton.x; 1593 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1594 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1596
1300 /* calc number of lines to scroll */ 1597 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1598 if (ev.xbutton.y < TermWin.int_bwidth)
1302 { 1599 {
1303 scroll_selection_dir = UP; 1600 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1601 dist = TermWin.int_bwidth - ev.xbutton.y;
1305 } 1602 }
1306 else 1603 else
1307 { 1604 {
1308 scroll_selection_dir = DN; 1605 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y -
1310 (TermWin.int_bwidth + TermWin.height); 1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1311 } 1607 }
1608
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1609 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1610 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1;
1314 MIN_IT (scroll_selection_lines, 1612 MIN_IT (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1613 SELECTION_SCROLL_MAX_LINES);
1316 } 1614 }
1317 else 1615 else
1318 { 1616 {
1319 /* we are within the text window, so we 1617 /* we are within the text window, so we
1320 * shouldn't be scrolling 1618 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1620 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1324 } 1622 }
1325#endif 1623#endif
1326#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1327
1328 } 1625 }
1329#endif 1626#endif
1330
1331 } 1627 }
1332 } 1628 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1630 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1336 MotionNotify, &ev)) ; 1632 MotionNotify, &ev))
1633 ;
1634
1337 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (disp, scrollBar.win,
1338 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1638 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1639 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1641 scrollbar_size ());
1344 scr_refresh (refresh_type); 1642 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1643 refresh_limit = 0;
… …
1348 break; 1646 break;
1349 } 1647 }
1350} 1648}
1351 1649
1352void 1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#if USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#if USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1708 }
1709}
1710
1711#if TRANSPARENT
1712void
1353rxvt_term::rootwin_cb (XEvent &ev) 1713rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1714{
1355 SET_R (this); 1715 SET_R (this);
1356 SET_LOCALE (locale); 1716 SET_LOCALE (locale);
1357 1717
1358 switch (ev.type) 1718 switch (ev.type)
1359 { 1719 {
1360 case PropertyNotify: 1720 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1721 /*
1371 * if user used some Esetroot compatible prog to set the root bg, 1722 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on. 1723 * use the property to determine the pixmap. We use it later on.
1373 */ 1724 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1378 return; 1727 return;
1379 }
1380 1728
1381 /* FALLTHROUGH */ 1729 /* FALLTHROUGH */
1382 case ReparentNotify: 1730 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1732 want_refresh = want_full_refresh = 1;
1385 break; 1733 break;
1386#endif
1387 } 1734 }
1388} 1735}
1736#endif
1389 1737
1390void 1738void
1391rxvt_term::button_press (XButtonEvent &ev) 1739rxvt_term::button_press (XButtonEvent &ev)
1392{ 1740{
1393 int reportmode = 0, clickintime; 1741 int reportmode = 0, clickintime;
1394 1742
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1396 if (!bypass_keystate) 1744 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1745 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746
1398 /* 1747 /*
1399 * VT window processing of button press 1748 * VT window processing of button press
1400 */ 1749 */
1401 if (ev.window == TermWin.vt) 1750 if (ev.window == TermWin.vt)
1402 { 1751 {
1752#if ISO_14755
1753 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 {
1756 iso14755_54 (ev.x, ev.y);
1757 return;
1758 }
1759#endif
1760
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1761 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1762
1404 if (reportmode) 1763 if (reportmode)
1405 { 1764 {
1406 /* mouse report from vt window */ 1765 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1766 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1767 MEvent.state = ev.state;
… …
1437 } 1796 }
1438 else 1797 else
1439 { 1798 {
1440 if (ev.button != MEvent.button) 1799 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1800 MEvent.clicks = 0;
1801
1442 switch (ev.button) 1802 switch (ev.button)
1443 { 1803 {
1444 case Button1: 1804 case Button1:
1805 /* allow meta + click to select rectangular areas */
1806 /* should be done in screen.C */
1807#if ENABLE_FRILLS
1808 selection.rect = !!(ev.state & ModMetaMask);
1809#else
1810 selection.rect = false;
1811#endif
1812
1445 /* allow shift+left click to extend selection */ 1813 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1815 {
1448 if (MEvent.button == Button1 && clickintime) 1816 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1817 selection_rotate (ev.x, ev.y);
1450 else 1818 else
1451 selection_extend (ev.x, ev.y, 1); 1819 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1834 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1835 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1836 selection_rotate (ev.x, ev.y);
1469 else 1837 else
1470 selection_extend (ev.x, ev.y, 1); 1838 selection_extend (ev.x, ev.y, 1);
1839
1471 MEvent.button = Button3; 1840 MEvent.button = Button3;
1472 break; 1841 break;
1473 } 1842 }
1474 } 1843 }
1844
1475 MEvent.time = ev.time; 1845 MEvent.time = ev.time;
1476 return; 1846 return;
1477 } 1847 }
1478 1848
1479 /* 1849 /*
… …
1571 break; 1941 break;
1572 case R_SB_ALIGN_BOTTOM: 1942 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 1943 csrO = scrollBar.bot - scrollBar.top;
1574 break; 1944 break;
1575 } 1945 }
1946
1576 if (scrollBar.style == R_SB_XTERM 1947 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 1948 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 1949 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 1950 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 1951
1581 scrollBar.setMotion (); 1952 scrollBar.setMotion ();
1582 break; 1953 break;
1583 1954
1584 case Button1: 1955 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1956 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 scr_page ((ev.button == Button1 ? DN : UP), 1980 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 1981 (TermWin.nrow
1611 * scrollbar_position (ev.y) 1982 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 1983 / scrollbar_size ()));
1613 } 1984 }
1985
1614 break; 1986 break;
1615 } 1987 }
1616 } 1988 }
1617 return; 1989 return;
1618 } 1990 }
… …
1630{ 2002{
1631 int reportmode = 0; 2003 int reportmode = 0;
1632 2004
1633 csrO = 0; /* reset csr Offset */ 2005 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2006 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2007 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2008
1637 if (scrollbar_isUpDn ()) 2009 if (scrollbar_isUpDn ())
1638 { 2010 {
1639 scrollBar.setIdle (); 2011 scrollBar.setIdle ();
1640 scrollbar_show (0); 2012 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 2014 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 2015#endif
1644
1645 } 2016 }
2017
1646#ifdef SELECTION_SCROLLING 2018#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 2019 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2020 sel_scroll_ev.stop();
1649#endif 2021#endif
2022
1650 if (ev.window == TermWin.vt) 2023 if (ev.window == TermWin.vt)
1651 { 2024 {
2025#if ISO_14755
2026 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return;
2029#endif
1652 if (reportmode) 2030 if (reportmode)
1653 { 2031 {
1654 /* mouse report from vt window */ 2032 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2033 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2034 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 2048 MEvent.button = AnyButton;
1671 mouse_report (ev); 2049 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2050#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2051 return;
1674 } 2052 }
2053
1675 /* 2054 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2055 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2056 * when overriding mouse reporting
1678 */ 2057 */
1679 if (PrivateModes & PrivMode_mouse_report 2058 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2059 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2060 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2061 selection_extend (ev.x, ev.y, 0);
1683 2062
1684 switch (ev.button) 2063 switch (ev.button)
… …
1699 2078
1700 v = ev.button == Button4 ? UP : DN; 2079 v = ev.button == Button4 ? UP : DN;
1701 2080
1702 if (ev.state & ShiftMask) 2081 if (ev.state & ShiftMask)
1703 i = 1; 2082 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2083 else if (options & Opt_mouseWheelScrollPage)
1705 i = TermWin.nrow - 1; 2084 i = TermWin.nrow - 1;
1706 else 2085 else
1707 i = 5; 2086 i = 5;
1708 2087
1709# ifdef MOUSE_SLIP_WHEELING 2088# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2089 if (ev.state & ControlMask)
1711 { 2090 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2091 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2094
2095 if (slip_wheel_ev.at < NOW)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097
2098 slip_wheel_ev.start ();
1714 } 2099 }
2100 else
2101 {
1715# endif 2102# endif
1716# ifdef JUMP_MOUSE_WHEEL 2103# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2104 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2105 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2106 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING
1726 } 2116 }
1727# endif 2117#endif
1728
1729 } 2118 }
1730 break; 2119 break;
1731#endif 2120#endif
1732
1733 } 2121 }
1734 } 2122 }
1735#ifdef MENUBAR 2123#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2124 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2125 menubar_control (ev);
1738#endif 2126#endif
1739} 2127}
1740 2128
1741#ifdef TRANSPARENT 2129#ifdef TRANSPARENT
1742#if TINTING 2130#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2131/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2132
1746static void 2133typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2134
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2135void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2136{
1754 /* No saturation */ 2137 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2138 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 int r, g, b; 2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2142 int i;
1758 2143
1759 b = ((uint16_t *) ptr)[x]; 2144 Visual *visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2145
1761 g = (b & 0x3e0) * gm; 2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2147
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2148 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2149 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2150 mask_g = visual->green_mask;
1766 } 2151 mask_b = visual->blue_mask;
1767 ptr += bpl; 2152
1768 } 2153 /* boring lookup table pre-initialization */
2154 switch (srcImage->bits_per_pixel) {
2155 case 15:
2156 if ((mask_r != 0x7c00) ||
2157 (mask_g != 0x03e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+32;
2164 sh_r = 10;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 16:
2169 if ((mask_r != 0xf800) ||
2170 (mask_g != 0x07e0) ||
2171 (mask_b != 0x001f))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2174 lookup_r = lookup;
2175 lookup_g = lookup+32;
2176 lookup_b = lookup+32+64;
2177 sh_r = 11;
2178 sh_g = 5;
2179 sh_b = 0;
2180 break;
2181 case 24:
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 case 32:
2195 if ((mask_r != 0xff0000) ||
2196 (mask_g != 0x00ff00) ||
2197 (mask_b != 0x0000ff))
2198 return;
2199 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2200 lookup_r = lookup;
2201 lookup_g = lookup+256;
2202 lookup_b = lookup+256+256;
2203 sh_r = 16;
2204 sh_g = 8;
2205 sh_b = 0;
2206 break;
2207 default:
2208 return; /* we do not support this color depth */
2209 }
2210
2211 /* prepare limits for color transformation (each channel is handled separately) */
2212 if (shade < 0) {
2213 shade = -shade;
2214 if (shade < 0) shade = 0;
2215 if (shade > 100) shade = 100;
2216
2217 lower_lim_r = 65535-rm;
2218 lower_lim_g = 65535-gm;
2219 lower_lim_b = 65535-bm;
2220
2221 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2222 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2223 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2224
2225 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1769 } else { 2226 } else {
1770 for (y = h; --y >= 0;) { 2227 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2228 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2229
1774 b = ((uint16_t *) ptr)[x]; 2230 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2231
1776 g = (b & 0x3e0) * gm; 2232 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2233 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2234 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2235 }
1780 b |= (!(b >> 5) - 1); 2236
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2237 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1782 | ((g >> 8) & 0x3e0) 2238 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2239 {
1784 } 2240 unsigned int tmp;
1785 ptr += bpl; 2241
2242 tmp = lower_lim_r;
2243 lower_lim_r = lower_lim_b;
2244 lower_lim_b = tmp;
2245
2246 tmp = upper_lim_r;
2247 upper_lim_r = upper_lim_b;
2248 upper_lim_b = tmp;
2249 }
2250
2251 /* fill our lookup tables */
2252 for (i = 0; i <= mask_r>>sh_r; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2256 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2257 lookup_r[i] = (tmp/65535)<<sh_r;
2258 }
2259 for (i = 0; i <= mask_g>>sh_g; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2263 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2264 lookup_g[i] = (tmp/65535)<<sh_g;
2265 }
2266 for (i = 0; i <= mask_b>>sh_b; i++)
2267 {
2268 RUINT32T tmp;
2269 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2270 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2271 lookup_b[i] = (tmp/65535)<<sh_b;
2272 }
2273
2274 /* apply table to input image (replacing colors by newly calculated ones) */
2275 switch (srcImage->bits_per_pixel)
2276 {
2277 case 15:
2278 {
2279 unsigned short *p1, *pf, *p, *pl;
2280 p1 = (unsigned short *) srcImage->data;
2281 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2282 while (p1 < pf)
2283 {
2284 p = p1;
2285 pl = p1 + srcImage->width;
2286 for (; p < pl; p++)
1786 } 2287 {
2288 *p = lookup_r[(*p & 0x7c00)>>10] |
2289 lookup_g[(*p & 0x03e0)>> 5] |
2290 lookup_b[(*p & 0x001f)];
2291 }
2292 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2293 }
1788} 2294 break;
1789 2295 }
1790/* RGB 16 */ 2296 case 16:
1791static void 2297 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2298 unsigned short *p1, *pf, *p, *pl;
1793{ 2299 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2300 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2301 while (p1 < pf)
1796 2302 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2303 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2304 pl = p1 + srcImage->width;
1799 /* No saturation */ 2305 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2306 {
1814 } else { 2307 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2308 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2309 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2310 }
1830 ptr += bpl; 2311 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2312 }
2313 break;
2314 }
2315 case 24:
2316 {
2317 unsigned char *p1, *pf, *p, *pl;
2318 p1 = (unsigned char *) srcImage->data;
2319 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2320 while (p1 < pf)
2321 {
2322 p = p1;
2323 pl = p1 + srcImage->width * 3;
2324 for (; p < pl; p += 3)
1831 } 2325 {
2326 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2327 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2328 p[2] = lookup_r[(p[2] & 0x0000ff)];
2329 }
2330 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 2331 }
1833} 2332 break;
2333 }
2334 case 32:
2335 {
2336 RUINT32T *p1, *pf, *p, *pl;
2337 p1 = (RUINT32T *) srcImage->data;
2338 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1834 2339
1835/* RGB 24 */ 2340 while (p1 < pf)
1836static void 2341 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2342 p = p1;
1838{ 2343 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2344 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2345 {
1867 } else { 2346 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2347 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2348 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2349 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2350 }
1898 ptr += bpl; 2351 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2352 }
2353 break;
2354 }
1900 } 2355 }
1901}
1902 2356
1903/* RGB 32 */ 2357 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2358}
1974
1975#endif 2359#endif
1976 2360
1977/* 2361/*
1978 * Check our parents are still who we think they are. 2362 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2363 * Do transparency updates if required
… …
1986 Atom atype; 2370 Atom atype;
1987 unsigned char *prop = NULL; 2371 unsigned char *prop = NULL;
1988 Window root, oldp, *list; 2372 Window root, oldp, *list;
1989 Pixmap rootpixmap = None; 2373 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
1991 2376
1992 pchanged = 0; 2377 pchanged = 0;
1993 2378
1994 if (!(Options & Opt_transparent)) 2379 if (!(options & Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2380 return pchanged; /* Don't try any more */
1996 2381
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2382 XGetWindowAttributes (disp, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2383 rootdepth = wrootattr.depth;
1999 2384
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2001 2386
2002 if (rootdepth != wattr.depth) 2387 if (rootdepth != wattr.depth)
2003 { 2388 {
2004 if (am_transparent) 2389 if (am_transparent)
2005 { 2390 {
2006 pchanged = 1; 2391 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2393 am_transparent = am_pixmap_trans = 0;
2009 } 2394 }
2010 2395
2011 return pchanged; /* Don't try any more */ 2396 return pchanged; /* Don't try any more */
2012 } 2397 }
2013 2398
2014 /* Get all X ops out of the queue so that our information is up-to-date. */ 2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2015 XSync (display->display, False); 2400 XSync (disp, False);
2016 2401
2017 /* 2402 /*
2018 * Make the frame window set by the window manager have 2403 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame 2404 * the root background. Some window managers put multiple nested frame
2020 * windows for each client, so we have to take care about that. 2405 * windows for each client, so we have to take care about that.
2021 */ 2406 */
2022 i = (xa[XA_XROOTPMAPID] 2407 i = (xa[XA_XROOTPMAP_ID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2026 2411
2027 if (!i || prop == NULL) 2412 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID] 2413 i = (xa[XA_ESETROOT_PMAP_ID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2416 &nitems, &bytes_after, &prop) == Success);
2032 2417
2033 if (!i || prop == NULL) 2418 if (!i || prop == NULL
2419#if TINTING
2420 || !rs[Rs_color + Color_tint]
2421#endif
2422 )
2034 have_pixmap = 0; 2423 have_pixmap = 0;
2035 else 2424 else
2036 { 2425 {
2037 have_pixmap = 1; 2426 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2427 rootpixmap = *(Pixmap *)prop;
… …
2049 Window cr; 2438 Window cr;
2050 XImage *image; 2439 XImage *image;
2051 GC gc; 2440 GC gc;
2052 XGCValues gcvalue; 2441 XGCValues gcvalue;
2053 2442
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2055 0, 0, &sx, &sy, &cr); 2444 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width; 2445 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height; 2446 nh = (unsigned int)szHint.height;
2058 nx = ny = 0; 2447 nx = ny = 0;
2059 2448
… …
2071 sy = 0; 2460 sy = 0;
2072 } 2461 }
2073 2462
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2465
2466 XSync (disp, False);
2076 allowedxerror = -1; 2467 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2469
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2471 /* XXX: may need a delay here? */
2081 allowedxerror = 0; 2472 allowedxerror = 0;
2082 2473
… …
2085 if (am_transparent && am_pixmap_trans) 2476 if (am_transparent && am_pixmap_trans)
2086 { 2477 {
2087 pchanged = 1; 2478 pchanged = 1;
2088 if (TermWin.pixmap != None) 2479 if (TermWin.pixmap != None)
2089 { 2480 {
2090 XFreePixmap (display->display, TermWin.pixmap); 2481 XFreePixmap (disp, TermWin.pixmap);
2091 TermWin.pixmap = None; 2482 TermWin.pixmap = None;
2092 } 2483 }
2093 } 2484 }
2094 2485
2095 am_pixmap_trans = 0; 2486 am_pixmap_trans = 0;
2096 } 2487 }
2097 else 2488 else
2098 { 2489 {
2099 if (TermWin.pixmap != None) 2490 if (TermWin.pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap); 2491 XFreePixmap (disp, TermWin.pixmap);
2101 2492
2102#if TINTING 2493#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2494 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2495 {
2105 unsigned short shade, rm, gm, bm; 2496 unsigned short rm, gm, bm;
2497 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2498
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2499 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2500
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2501 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2502 }
2120#endif 2503#endif
2121 2504
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2123 szHint.width, szHint.height, image->depth); 2506 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2509 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2510 XFreeGC (disp, gc);
2128 XDestroyImage (image); 2511 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2130 TermWin.pixmap); 2513 XClearWindow (disp, TermWin.parent[0]);
2131 2514
2132 if (!am_transparent || !am_pixmap_trans) 2515 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2516 pchanged = 1;
2134 2517
2135 am_transparent = am_pixmap_trans = 1; 2518 am_transparent = am_pixmap_trans = 1;
2136 } 2519 }
2137 } 2520 }
2138 2521
2139 if (!am_pixmap_trans) 2522 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2524 else
2140 { 2525 {
2141 unsigned int n; 2526 unsigned int n;
2142 /* 2527 /*
2143 * InheritPixmap transparency 2528 * InheritPixmap transparency
2144 */ 2529 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 { 2531 {
2148 oldp = TermWin.parent[i]; 2532 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2534 &TermWin.parent[i], &list, &n);
2151 XFree (list); 2535 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2536
2154 if (TermWin.parent[i] == display->root) 2537 if (TermWin.parent[i] == display->root)
2155 { 2538 {
2156 if (oldp != None) 2539 if (oldp != None)
2157 pchanged = 1; 2540 pchanged = 1;
… …
2167 2550
2168 if (pchanged) 2551 if (pchanged)
2169 { 2552 {
2170 for (; n < (unsigned int)i; n++) 2553 for (; n < (unsigned int)i; n++)
2171 { 2554 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2557 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break; 2559 break;
2178 } 2560 }
2179 } 2561 }
2180 } 2562 }
2181 2563
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 { 2565 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2568 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2569 /* XXX: also turn off Opt_transparent? */
2189 } 2570 }
2190 else 2571 else
2191 { 2572 {
2192#if WAIT_FOR_WM 2573#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2574 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2575 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2576 sleep (1);
2196#endif 2577#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2578 for (n = 0; n < (unsigned int)i; n++)
2579 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]);
2582 }
2200 2583
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2202 am_transparent = 1; 2585 am_transparent = 1;
2203 } 2586 }
2204 2587
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None; 2589 TermWin.parent[i] = None;
2590 }
2591
2592 if (scrollBar.win)
2593 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2595 scrollBar.setIdle ();
2596 scrollbar_show (0);
2597 }
2598
2599 if (am_transparent)
2600 {
2601 want_refresh = want_full_refresh = 1;
2602 if (am_pixmap_trans)
2603 flush ();
2207 } 2604 }
2208 2605
2209 return pchanged; 2606 return pchanged;
2210} 2607}
2211#endif 2608#endif
… …
2230 if (ch == NOCHAR) // TODO: improve 2627 if (ch == NOCHAR) // TODO: improve
2231 break; 2628 break;
2232 2629
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2631 {
2632 if (!seen_input)
2633 {
2634 seen_input = 1;
2635 // many badly-written programs (e.g. jed) contain a race condition:
2636 // they first read the screensize and then install a SIGWINCH handler.
2637 // some window managers resize the window early, and these programs
2638 // then sometimes get the size wrong.
2639 // unfortunately other programs are even more buggy and dislike
2640 // being sent SIGWINCH, so only do it when we were in fact being
2641 // resized.
2642 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH);
2644 }
2645
2235 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2648 bool refreshnow = false;
2238 int nlines = 0; 2649 int nlines = 0;
2239 unicode_t *str = buf; 2650 unicode_t *str = buf;
2240 2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2652
2243 for (;;) 2653 for (;;)
2244 { 2654 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2656 break;
2250 2657
2251 *str++ = ch; 2658 *str++ = ch;
2252 2659
2253 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2254 { 2661 {
2662 if (ch == C0_LF)
2255 nlines++; 2663 nlines++;
2664
2256 refresh_count++; 2665 refresh_count++;
2257 2666
2258 if (! (Options & Opt_jumpScroll) 2667 if (!(options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2260 { 2669 {
2261 refreshnow = true; 2670 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR; 2671 ch = NOCHAR;
2264 break; 2672 break;
2265 } 2673 }
2266 2674
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2676 if (nlines >= TermWin.nrow - 1)
2269 { 2677 {
2270 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0; 2679 nlines = 0;
2272 str = buf; 2680 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ);
2273 } 2682 }
2683
2684 if (str >= eol)
2685 {
2686 if (eol >= buf + UBUFSIZ)
2687 {
2688 ch = NOCHAR;
2689 break;
2690 }
2691 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2693 }
2694
2274 } 2695 }
2275 2696
2276 if (str >= buf + UBUFSIZ) 2697 seq_begin = cmdbuf_ptr;
2277 { 2698 ch = next_char ();
2278 ch = NOCHAR;
2279 break;
2280 }
2281 } 2699 }
2282 2700
2283 scr_add_lines (buf, nlines, str - buf); 2701 scr_add_lines (buf, nlines, str - buf);
2284 2702
2285 /* 2703 /*
2286 * If there have been a lot of new lines, then update the screen 2704 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2705 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2706 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2707 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2708 */
2294 if (refreshnow) 2709 if (refreshnow)
2295 { 2710 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2712 refresh_limit++;
2298 else 2713 else
2714 {
2715 flag = true;
2299 scr_refresh (refresh_type); 2716 scr_refresh (refresh_type);
2717 }
2300 } 2718 }
2301 2719
2302 } 2720 }
2303 else 2721 else
2304 { 2722 {
… …
2352 if (len == (size_t)-1) 2770 if (len == (size_t)-1)
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2354 2772
2355 // assume wchar == unicode 2773 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2774 cmdbuf_ptr += len;
2357 return wc; 2775 return wc & UNICODE_MASK;
2358 } 2776 }
2359 2777
2360 return NOCHAR; 2778 return NOCHAR;
2361} 2779}
2362 2780
… …
2488 process_escape_seq (); 2906 process_escape_seq ();
2489 break; 2907 break;
2490 case C0_ENQ: /* terminal Status */ 2908 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2909 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2494 else 2912 else
2495 tt_write ((unsigned char *)VT100_ANS, 2913 tt_write ((unsigned char *)VT100_ANS,
2496 (unsigned int)STRLEN (VT100_ANS)); 2914 (unsigned int)strlen (VT100_ANS));
2497 break; 2915 break;
2498 case C0_BEL: /* bell */ 2916 case C0_BEL: /* bell */
2499 scr_bell (); 2917 scr_bell ();
2500 break; 2918 break;
2501 case C0_BS: /* backspace */ 2919 case C0_BS: /* backspace */
… …
2600void 3018void
2601rxvt_term::process_escape_seq () 3019rxvt_term::process_escape_seq ()
2602{ 3020{
2603 unicode_t ch = cmd_getc (); 3021 unicode_t ch = cmd_getc ();
2604 3022
2605 if (PrivateModes & PrivMode_vt52) 3023 if (priv_modes & PrivMode_vt52)
2606 { 3024 {
2607 process_escape_vt52 (ch); 3025 process_escape_vt52 (ch);
2608 return; 3026 return;
2609 } 3027 }
2610 3028
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 3043 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 3044 break;
2627 case '+': 3045 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 3046 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 3047 break;
2630#ifndef NO_FRILLS 3048#if ENABLE_FRILLS
2631 case '6': 3049 case '6':
2632 scr_backindex (); 3050 scr_backindex ();
2633 break; 3051 break;
2634#endif 3052#endif
2635 case '7': 3053 case '7':
2636 scr_cursor (SAVE); 3054 scr_cursor (SAVE);
2637 break; 3055 break;
2638 case '8': 3056 case '8':
2639 scr_cursor (RESTORE); 3057 scr_cursor (RESTORE);
2640 break; 3058 break;
2641#ifndef NO_FRILLS 3059#if ENABLE_FRILLS
2642 case '9': 3060 case '9':
2643 scr_forwardindex (); 3061 scr_forwardindex ();
2644 break; 3062 break;
2645#endif 3063#endif
2646 case '=': 3064 case '=':
… …
2825 { 3243 {
2826 switch (priv) 3244 switch (priv)
2827 { 3245 {
2828 case '>': 3246 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 3247 if (ch == CSI_DA) /* secondary device attributes */
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3248 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2831 break; 3249 break;
2832 case '?': 3250 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3251 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 3252 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 3253 break;
… …
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2946 break; 3364 break;
2947 3365
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3367 tt_write ((const unsigned char *)VT100_ANS,
2950 (unsigned int) (sizeof (VT100_ANS) - 1)); 3368 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3369 break;
2952 3370
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3372 process_sgr_mode (nargs, arg);
2955 break; 3373 break;
… …
2962 break; 3380 break;
2963 case 6: /* CPR requested */ 3381 case 6: /* CPR requested */
2964 scr_report_position (); 3382 scr_report_position ();
2965 break; 3383 break;
2966 case 7: /* unofficial extension */ 3384 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3385 if (options & Opt_insecure)
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3386 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3387 break;
2970 case 8: /* unofficial extension */ 3388 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3390 break;
2973 } 3391 }
… …
3009 break; 3427 break;
3010 3428
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3429 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3430 if (arg[0] == 4)
3013 scr_insert_mode (0); 3431 scr_insert_mode (0);
3432 else if (arg[0] == 20)
3433 priv_modes &= ~PrivMode_LFNL;
3014 break; 3434 break;
3015 3435
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3436 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3437 if (arg[0] == 4)
3018 scr_insert_mode (1); 3438 scr_insert_mode (1);
3439 else if (arg[0] == 20)
3440 priv_modes |= PrivMode_LFNL;
3019 break; 3441 break;
3020 3442
3021 /* 3443 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3444 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3445 */
… …
3035 break; 3457 break;
3036 case CSI_75: 3458 case CSI_75:
3037 scr_cursor (RESTORE); 3459 scr_cursor (RESTORE);
3038 break; 3460 break;
3039 3461
3040#ifndef NO_FRILLS 3462#if ENABLE_FRILLS
3041 case CSI_74: 3463 case CSI_74:
3042 process_window_ops (arg, nargs); 3464 process_window_ops (arg, nargs);
3043 break; 3465 break;
3044#endif 3466#endif
3045 3467
… …
3052 break; 3474 break;
3053 } 3475 }
3054} 3476}
3055/*}}} */ 3477/*}}} */
3056 3478
3057#ifndef NO_FRILLS 3479#if ENABLE_FRILLS
3058/* ARGSUSED */ 3480/* ARGSUSED */
3059void 3481void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3482rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3483{
3062 int x, y; 3484 int x, y;
3063 XWindowAttributes wattr; 3485 XWindowAttributes wattr;
3064 Window wdummy; 3486 Window wdummy;
3487 dDisp;
3065 3488
3066 if (nargs == 0) 3489 if (nargs == 0)
3067 return; 3490 return;
3068 3491
3069 switch (args[0]) 3492 switch (args[0])
3070 { 3493 {
3071 /* 3494 /*
3072 * commands 3495 * commands
3073 */ 3496 */
3074 case 1: /* deiconify window */ 3497 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3498 XMapWindow (disp, TermWin.parent[0]);
3076 break; 3499 break;
3077 case 2: /* iconify window */ 3500 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3501 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3502 break;
3081 case 3: /* set position (pixels) */ 3503 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3083 break; 3505 break;
3084 case 4: /* set size (pixels) */ 3506 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3508 break;
3087 case 5: /* raise window */ 3509 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3510 XRaiseWindow (disp, TermWin.parent[0]);
3089 break; 3511 break;
3090 case 6: /* lower window */ 3512 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3513 XLowerWindow (disp, TermWin.parent[0]);
3092 break; 3514 break;
3093 case 7: /* refresh window */ 3515 case 7: /* refresh window */
3094 scr_touch (true); 3516 scr_touch (true);
3095 break; 3517 break;
3096 case 8: /* set size (chars) */ 3518 case 8: /* set size (chars) */
… …
3108 3530
3109 /* 3531 /*
3110 * reports - some output format copied from XTerm 3532 * reports - some output format copied from XTerm
3111 */ 3533 */
3112 case 11: /* report window state */ 3534 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3537 break;
3116 case 13: /* report window position */ 3538 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3541 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3542 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3543 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3544 break;
3123 case 14: /* report window size (pixels) */ 3545 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3548 break;
3127 case 18: /* report text area size (chars) */ 3549 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3129 break; 3551 break;
3130 case 19: /* report window size (chars) */ 3552 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3132 break; 3554 break;
3133 case 20: /* report icon label */ 3555 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3556 {
3136 char *s; 3557 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3558 XGetIconName (disp, TermWin.parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s);
3139 } 3561 }
3140 break; 3562 break;
3141 case 21: /* report window title */ 3563 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3564 {
3144 char *s; 3565 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3566 XFetchName (disp, TermWin.parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s);
3147 } 3569 }
3148 break; 3570 break;
3149 } 3571 }
3150} 3572}
3151#endif 3573#endif
3152 3574
… …
3156 * ends_how is terminator used. returned input must be free()'d 3578 * ends_how is terminator used. returned input must be free()'d
3157 */ 3579 */
3158unsigned char * 3580unsigned char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3581rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3582{
3161 unicode_t prev = 0, ch; 3583 unicode_t ch;
3584 bool seen_esc = false;
3162 unsigned int n = 0; 3585 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3586 wchar_t string[STRING_MAX];
3165 3587
3166 while ((ch = cmd_getc ()) != NOCHAR) 3588 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3589 {
3168 if (prev == C0_ESC) 3590 if (seen_esc)
3169 { 3591 {
3170 if (ch == 0x5c) /* 7bit ST */ 3592 if (ch == 0x5c) /* 7bit ST */
3171 break; 3593 break;
3172 else 3594 else
3173 return NULL; 3595 return NULL;
3174 } 3596 }
3597 else if (ch == C0_ESC)
3598 {
3599 seen_esc = true;
3600 continue;
3601 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3602 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3603 break;
3177 else if (ch < 0x20) 3604 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3605 return NULL; /* other control character - exit */
3179 3606
3180 if (n >= sizeof (string) - 1) 3607 seen_esc = false;
3608
3609 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3610 // stop at some sane length
3182 return NULL; 3611 return NULL;
3183 3612
3184 if (ch == C0_SYN) 3613 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3614 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3615 else
3190 string[n++] = prev = ch; 3616 string[n++] = ch;
3191 } 3617 }
3192 3618
3193 string[n++] = '\0'; 3619 string[n++] = '\0';
3194 3620
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3621 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3622
3200 return s; 3623 return (unsigned char *)rxvt_wcstombs (string);
3201} 3624}
3202 3625
3203/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
3204/* 3627/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3249void 3672void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3251{ 3674{
3252 if (str[0] == '?' && !str[1]) 3675 if (str[0] == '?' && !str[1])
3253 { 3676 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3677 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3678 pix_colors_focused[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3679 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 } 3680 }
3261 else 3681 else
3262 set_window_color (color, str); 3682 set_window_color (color, str);
3263} 3683}
3264 3684
3265/* 3685/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3267 * 0 = change iconName/title
3268 * 1 = change iconName
3269 * 2 = change title
3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
3273 * 12 = change text color
3274 * 13 = change mouse foreground color
3275 * 17 = change highlight character colour
3276 * 18 = change bold character color
3277 * 19 = change underlined character color
3278 * 46 = change logfile (not implemented)
3279 * 50 = change font
3280 *
3281 * rxvt extensions:
3282 * 20 = bg pixmap
3283 * 39 = change default fg color
3284 * 49 = change default bg color
3285 * 55 = dump scrollback buffer and all of screen
3286 * 701 = change locale
3287 * 702 = find font
3288 * 703 = menu
3289 */ 3687 */
3290void 3688void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3292{ 3690{
3293 int changed = 0; 3691 int changed = 0;
3294 int color; 3692 int color;
3295 char *buf, *name; 3693 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3694 bool query = str[0] == '?' && !str[1];
3695 int saveop = op;
3696 dDisp;
3297 3697
3298 assert (str != NULL); 3698 assert (str != NULL);
3299 switch (op) 3699 switch (op)
3300 { 3700 {
3301 case XTerm_name: 3701 case XTerm_name:
… …
3308 set_title (str); 3708 set_title (str);
3309 break; 3709 break;
3310 case XTerm_property: 3710 case XTerm_property:
3311 if (str[0] == '?') 3711 if (str[0] == '?')
3312 { 3712 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3713 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3714 Atom actual_type;
3315 int actual_format; 3715 int actual_format;
3316 unsigned long nitems; 3716 unsigned long nitems;
3317 unsigned long bytes_after; 3717 unsigned long bytes_after;
3318 unsigned char *value = 0; 3718 unsigned char *value = 0;
3319 const char *str = ""; 3719 const char *str = "";
3320 3720
3321 if (prop 3721 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3722 && XGetWindowProperty (disp, TermWin.parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3723 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3724 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3725 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3726 && actual_type != None
3327 && actual_format == 8) 3727 && actual_format == 8)
… …
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3736 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3737
3338 if (eq) 3738 if (eq)
3339 { 3739 {
3340 *eq = 0; 3740 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3741 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3742 }
3346 else 3743 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3744 XDeleteProperty (disp, TermWin.parent[0],
3348 display->atom (str)); 3745 display->atom (str));
3349 } 3746 }
3350 break; 3747 break;
3351 3748
3352 case XTerm_Color: 3749 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3750 for (buf = (char *)str; buf && *buf;)
3354 { 3751 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3752 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3753 break;
3357 3754
3358 *name++ = '\0'; 3755 *name++ = '\0';
3359 color = atoi (buf); 3756 color = atoi (buf);
3360 3757
3361 if (color < 0 || color >= TOTAL_COLORS) 3758 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3759 break;
3363 3760
3364 if ((buf = STRCHR (name, ';')) != NULL) 3761 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3762 *buf++ = '\0';
3366 3763
3367 if (name[0] == '?' && !name[1]) 3764 if (name[0] == '?' && !name[1])
3368 { 3765 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3766 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3769 }
3376 else 3770 else
3377 set_window_color (color + minCOLOR, name); 3771 set_window_color (color + minCOLOR, name);
3378 } 3772 }
3379 break; 3773 break;
… …
3401 case XTerm_Color_UL: 3795 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break; 3797 break;
3404 case XTerm_Color_RV: 3798 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3800 break;
3801 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3803 break;
3804#endif
3805#if TRANSPARENT && TINTING
3806 case URxvt_Color_tint:
3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3808 check_our_parents ();
3809 if (am_transparent)
3810 want_full_refresh = want_refresh = 1;
3406 break; 3811 break;
3407#endif 3812#endif
3408 3813
3409 case XTerm_Pixmap: 3814 case XTerm_Pixmap:
3410 if (*str != ';') 3815 if (*str != ';')
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3818 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3819 set_bgPixmap (str); /* change pixmap */
3415#endif 3820#endif
3416 scr_touch (true); 3821 scr_touch (true);
3417 } 3822 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3823 while ((str = strchr (str, ';')) != NULL)
3419 { 3824 {
3420 str++; 3825 str++;
3421#if XPM_BACKGROUND 3826#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3827 changed += scale_pixmap (str);
3423#endif 3828#endif
3424
3425 } 3829 }
3830
3426 if (changed) 3831 if (changed)
3427 { 3832 {
3428#ifdef XPM_BACKGROUND 3833#ifdef XPM_BACKGROUND
3429 resize_pixmap (); 3834 resize_pixmap ();
3430#endif 3835#endif
… …
3441 3846
3442 case XTerm_logfile: 3847 case XTerm_logfile:
3443 // TODO, when secure mode? 3848 // TODO, when secure mode?
3444 break; 3849 break;
3445 3850
3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3457 change_font (str);
3458 break;
3459
3460#ifndef NO_FRILLS
3461 case XTerm_locale:
3462 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 }
3467 else
3468 {
3469 set_locale (str);
3470# ifdef USE_XIM
3471 im_cb ();
3472# endif
3473 }
3474 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR 3851#ifdef MENUBAR
3487 case XTerm_Menu: 3852 case URxvt_Menu:
3488 if (Options & Opt_insecure) 3853 if (options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3855 break;
3491#endif 3856#endif
3492#if 0 3857#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3858 case XTerm_dumpscreen: /* no error notices */
… …
3497 { 3862 {
3498 scr_dump (fd); 3863 scr_dump (fd);
3499 close (fd); 3864 close (fd);
3500 } 3865 }
3501 } 3866 }
3867 break;
3868#endif
3869 case XTerm_font:
3870 op = URxvt_font;
3871 case URxvt_font:
3872#if ENABLE_STYLES
3873 case URxvt_boldFont:
3874 case URxvt_italicFont:
3875 case URxvt_boldItalicFont:
3876#endif
3877 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3881 resp);
3882 else
3883 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885
3886 res = strdup (str);
3887 allocated.push_back ((void *)res);
3888 set_fonts ();
3889 }
3890 break;
3891
3892#if ENABLE_FRILLS
3893 case URxvt_locale:
3894 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3896 else
3897 {
3898 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8);
3900 init_xlocale ();
3901 }
3902 break;
3903
3904 case URxvt_view_up:
3905 case URxvt_view_down:
3906 int lines = atoi (str);
3907
3908 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else
3911 {
3912 scr_erase_savelines ();
3913 }
3914
3502 break; 3915 break;
3503#endif 3916#endif
3504 } 3917 }
3505} 3918}
3506/*----------------------------------------------------------------------*/ 3919/*----------------------------------------------------------------------*/
… …
3520{ 3933{
3521 int state; 3934 int state;
3522 3935
3523 if (mode == 's') 3936 if (mode == 's')
3524 { 3937 {
3525 SavedModes |= (PrivateModes & bit); 3938 SavedModes |= (priv_modes & bit);
3526 return -1; 3939 return -1;
3527 } 3940 }
3528 else 3941 else
3529 { 3942 {
3530 if (mode == 'r') 3943 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3944 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3945 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3946 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3947 PrivMode (state, bit);
3535 } 3948 }
3536 3949
3537 return state; 3950 return state;
3538} 3951}
… …
3556 { 3, PrivMode_132 }, 3969 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3970 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3971 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3972 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3973 { 7, PrivMode_Autowrap },
3974 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3975 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3976#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 3977 { menuBar_esc, PrivMode_menuBar },
3564#endif 3978#endif
3979 // 18, 19 printing-related
3980 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 3981#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3982 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3983#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3984 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3985 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3986 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3987 // 45 margin bell NYI
3575 // 46 start logging 3988 // 46 start logging
… …
3616 4029
3617 /* extra handling for values with state unkept */ 4030 /* extra handling for values with state unkept */
3618 switch (arg[i]) 4031 switch (arg[i])
3619 { 4032 {
3620 case 1048: /* alternative cursor save */ 4033 case 1048: /* alternative cursor save */
4034 case 1049:
3621 if (Options & Opt_secondaryScreen) 4035 if (options & Opt_secondaryScreen)
3622 if (mode == 0) 4036 if (mode == 0)
3623 scr_cursor (RESTORE); 4037 scr_cursor (RESTORE);
3624 else if (mode == 1) 4038 else if (mode == 1)
3625 scr_cursor (SAVE); 4039 scr_cursor (SAVE);
3626 break; 4040 break;
… …
3637 * within VT52 mode 4051 * within VT52 mode
3638 */ 4052 */
3639 PrivMode (1, PrivMode_vt52); 4053 PrivMode (1, PrivMode_vt52);
3640 break; 4054 break;
3641 case 3: /* 80/132 */ 4055 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4056 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3644 break; 4058 break;
3645 case 4: /* smooth scrolling */ 4059 case 4: /* smooth scrolling */
3646 if (state) 4060 if (state)
3647 Options &= ~Opt_jumpScroll; 4061 options &= ~Opt_jumpScroll;
3648 else 4062 else
3649 Options |= Opt_jumpScroll; 4063 options |= Opt_jumpScroll;
3650 break; 4064 break;
3651 case 5: /* reverse video */ 4065 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4066 scr_rvideo_mode (state);
3653 break; 4067 break;
3654 case 6: /* relative/absolute origins */ 4068 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4072 scr_autowrap (state);
3659 break; 4073 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 4074 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 4075 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4076 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4077 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4078 break;
3665#ifdef menuBar_esc 4079#ifdef menuBar_esc
3666 case menuBar_esc: 4080 case menuBar_esc:
3667#ifdef MENUBAR 4081#ifdef MENUBAR
3668 map_menuBar (state); 4082 map_menuBar (state);
… …
3688 break; 4102 break;
3689 /* case 66: - application key pad */ 4103 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4104 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4105 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4106 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4107 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4108 break;
3695#if 0 4109#if 0
3696 case 1001: 4110 case 1001:
3697 break; /* X11 mouse highlighting */ 4111 break; /* X11 mouse highlighting */
3698#endif 4112#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4113 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4114 if (state)
3701 Options &= ~Opt_scrollTtyOutput; 4115 options &= ~Opt_scrollTtyOutput;
3702 else 4116 else
3703 Options |= Opt_scrollTtyOutput; 4117 options |= Opt_scrollTtyOutput;
3704 break; 4118 break;
3705 case 1011: /* scroll to bottom on key press */ 4119 case 1011: /* scroll to bottom on key press */
3706 if (state) 4120 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4121 options |= Opt_scrollTtyKeypress;
3708 else 4122 else
3709 Options &= ~Opt_scrollTtyKeypress; 4123 options &= ~Opt_scrollTtyKeypress;
3710 break; 4124 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4125 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4126 if (options & Opt_secondaryScreen)
3713 if (current_screen != PRIMARY) 4127 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4128 scr_erase_screen (2);
3715 scr_change_screen (state); 4129 scr_change_screen (state);
3716 break; 4130 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4131 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4132 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4133 if (options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY) 4134 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4135 scr_erase_screen (2);
3722 break; 4136 break;
3723 default: 4137 default:
3724 break; 4138 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4164 rendset = 0, rendstyle = ~RS_None;
3751 break; 4165 break;
3752 case 1: 4166 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4167 rendset = 1, rendstyle = RS_Bold;
3754 break; 4168 break;
4169 //case 2: // low intensity
4170 case 3:
4171 rendset = 1, rendstyle = RS_Italic;
4172 break;
3755 case 4: 4173 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4174 rendset = 1, rendstyle = RS_Uline;
3757 break; 4175 break;
3758 case 5: 4176 case 5: // slowly blinking
4177 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4178 rendset = 1, rendstyle = RS_Blink;
3760 break; 4179 break;
3761 //case 6: // scoansi light background 4180 //case 6: // scoansi light background
3762 case 7: 4181 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4182 rendset = 1, rendstyle = RS_RVid;
3764 break; 4183 break;
3765 case 8: 4184 case 8:
3766 // invisible. NYI 4185 // invisible. NYI
3767 break; 4186 break;
4187 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4188 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4189 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4190 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4191 //...
4192 //case 19: // ninth alt font
4193 //case 20: // gothic
4194 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4195 rendset = 0, rendstyle = RS_Bold;
3773 break; 4196 break;
3774 case 22: 4197 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4198 rendset = 0, rendstyle = RS_Bold;
4199 break;
4200 case 23: // disable italic
4201 rendset = 0, rendstyle = RS_Italic;
3776 break; 4202 break;
3777 case 24: 4203 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4204 rendset = 0, rendstyle = RS_Uline;
3779 break; 4205 break;
3780 case 25: 4206 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4207 rendset = 0, rendstyle = RS_Blink;
3782 break; 4208 break;
4209 case 26: // variable spacing (iso 8613)
4210 rendset = 0, rendstyle = RS_Blink;
4211 break;
3783 case 27: 4212 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4213 rendset = 0, rendstyle = RS_RVid;
3785 break; 4214 break;
3786 case 28:
3787 // visible. NYI 4215 //case 28: // visible. NYI
3788 break; 4216 //case 29: // not crossed-out
3789 } 4217 }
3790 4218
3791 if (rendset != -1) 4219 if (rendset != -1)
3792 { 4220 {
3793 scr_rendition (rendset, rendstyle); 4221 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4232 case 35:
3805 case 36: 4233 case 36:
3806 case 37: 4234 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4235 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4236 break;
3809#ifdef TTY_256COLOR 4237 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4238 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4239 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4240 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4241 i += 2;
3815 } 4242 }
3816 break; 4243 break;
3817#endif
3818 case 39: /* default fg */ 4244 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4245 scr_color (Color_fg, Color_fg);
3820 break; 4246 break;
3821 4247
3822 case 40: 4248 case 40:
… …
3827 case 45: 4253 case 45:
3828 case 46: 4254 case 46:
3829 case 47: 4255 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4256 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4257 break;
3832#ifdef TTY_256COLOR 4258 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4259 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4260 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4261 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4262 i += 2;
3838 } 4263 }
3839 break; 4264 break;
3840#endif
3841 case 49: /* default bg */ 4265 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4266 scr_color (Color_bg, Color_bg);
3843 break; 4267 break;
4268
4269 //case 50: // not variable spacing
3844 4270
3845#ifndef NO_BRIGHTCOLOR 4271#ifndef NO_BRIGHTCOLOR
3846 case 90: 4272 case 90:
3847 case 91: /* set bright fg color */ 4273 case 91: /* set bright fg color */
3848 case 92: 4274 case 92:
3849 case 93: 4275 case 93:
3850 case 94: 4276 case 94:
3851 case 95: 4277 case 95:
3852 case 96: 4278 case 96:
3853 case 97: 4279 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4280 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4281 break;
3857 case 100: 4282 case 100:
3858 case 101: /* set bright bg color */ 4283 case 101: /* set bright bg color */
3859 case 102: 4284 case 102:
3860 case 103: 4285 case 103:
3861 case 104: 4286 case 104:
3862 case 105: 4287 case 105:
3863 case 106: 4288 case 106:
3864 case 107: 4289 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4291 break;
3868#endif 4292#endif
3869 4293
3870 } 4294 }
3871 } 4295 }
… …
3878{ 4302{
3879 unicode_t ch, cmd = cmd_getc (); 4303 unicode_t ch, cmd = cmd_getc ();
3880 4304
3881 if (cmd == 'Q') 4305 if (cmd == 'Q')
3882 { /* query graphics */ 4306 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4307 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4308 return;
3885 } 4309 }
3886 /* swallow other graphics sequences until terminating ':' */ 4310 /* swallow other graphics sequences until terminating ':' */
3887 do 4311 do
3888 ch = cmd_getc (); 4312 ch = cmd_getc ();
… …
3903 unsigned char buf[256]; 4327 unsigned char buf[256];
3904 4328
3905 va_start (arg_ptr, fmt); 4329 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4331 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4332 tt_write (buf, strlen (buf));
3909} 4333}
3910 4334
3911/* ---------------------------------------------------------------------- */ 4335/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 4336/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 4337 * or generated by us in response to a query ESC sequence.
3914 */ 4338 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340
3915void 4341void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4342rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3917{ 4343{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4344 if (v_buflen == 0)
4345 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3919 4347
3920 if (len) 4348 if ((unsigned int)written == len)
4349 return;
4350
4351 data += written;
4352 len -= written;
3921 { 4353 }
4354
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4356
4357 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len;
4359
4360 pty_ev.set (EVENT_READ | EVENT_WRITE);
4361}
4362
4363void rxvt_term::pty_write ()
4364{
4365 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4366
4367 if (written > 0)
4368 {
4369 v_buflen -= written;
4370
3922 if (v_buflen == 0) 4371 if (v_buflen == 0)
3923 { 4372 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4373 free (v_buffer);
3951 v_buffer = 0; 4374 v_buffer = 0;
3952 v_buflen = 0; 4375 v_buflen = 0;
3953 4376
3954 pty_ev.set (EVENT_READ); 4377 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4378 return;
3967 } 4379 }
4380
4381 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4382 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this...
4385 destroy ();
3969} 4386}
3970 4387
3971/*----------------------- end-of-file (C source) -----------------------*/ 4388/*----------------------- end-of-file (C source) -----------------------*/
3972 4389

Diff Legend

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