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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 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 (!IN_RANGE_EXC (x, 0, ncol)
141 || !IN_RANGE_EXC (y, 0, nrow))
142 return;
143
144 for (;;)
145 {
146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
149
150 if (t != NOCHAR || !x)
151 {
152 iso14755_51 (l.t[x], l.r[x]);
153 iso14755buf = ISO_14755_54;
154 break;
155 }
156
157 x--;
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 (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 = nrow - PAGING_CONTEXT_LINES;
165#else 383#else
166 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
167#endif 385#endif
168 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
169 { 387 {
170 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
171 return; 389 return;
… …
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 (view_start)
578 { 851 {
579 TermWin.view_start = 0; 852 view_start = 0;
580 want_refresh = 1; 853 want_refresh = 1;
581 } 854 }
582 855
583 /* 856 /*
584 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
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 (view_start == nsaved ||
1040 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;
779 } 1071 }
780 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
781 destroy (); 1077 destroy ();
1078 }
782 1079
783 return false; 1080 return false;
784} 1081}
785 1082
786void 1083void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1084rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1085{
789 SET_R (this); 1086 SET_R (this);
790 SET_LOCALE (locale); 1087 SET_LOCALE (locale);
791 1088
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1089 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1090 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1091 while (pty_fill ())
797 if (cmd_parse ()) 1092 if (cmd_parse ())
798 break; 1093 break;
1094
1095 if (revents & EVENT_WRITE)
1096 pty_write ();
799} 1097}
800 1098
801void 1099void
802rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
803{ 1101{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
805 recolour_cursor (); 1103 recolour_cursor ();
806 1104
807#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1106 hidden_pointer = 0;
809 1107
810 if (Options & Opt_pointerBlank) 1108 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1109 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1110#endif
813} 1111}
814 1112
815#ifdef POINTER_BLANK 1113#ifdef POINTER_BLANK
816void 1114void
817rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
818{ 1116{
819 if (! (Options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
820 return; 1118 return;
821 1119
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
823 XFlush (display->display); 1121 XFlush (display->display);
824 1122
825 hidden_pointer = 1; 1123 hidden_pointer = 1;
826} 1124}
827 1125
… …
844 x = ev.x; 1142 x = ev.x;
845 y = ev.y; 1143 y = ev.y;
846 pixel_position (&x, &y); 1144 pixel_position (&x, &y);
847 1145
848 if (MEvent.button == AnyButton) 1146 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1147 button_number = 3;
851 }
852 else 1148 else
853 { 1149 {
854 button_number = MEvent.button - Button1; 1150 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1151 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1152 if (button_number >= 3)
857 button_number += (64 - 3); 1153 button_number += (64 - 3);
858 } 1154 }
859 1155
860 if (PrivateModes & PrivMode_MouseX10) 1156 if (priv_modes & PrivMode_MouseX10)
861 { 1157 {
862 /* 1158 /*
863 * do not report ButtonRelease 1159 * do not report ButtonRelease
864 * no state info allowed 1160 * no state info allowed
865 */ 1161 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1176 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1177 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1178#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1179 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1180#endif
885
886 } 1181 }
887 1182
888#ifdef DEBUG_MOUSEREPORT 1183#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1184 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1185 if (key_state & 16)
891 fputc ('C', stderr); 1186 fputc ('C', stderr);
892 if (key_state & 4) 1187 if (key_state & 4)
893 fputc ('S', stderr); 1188 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1192 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1193 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1194 button_number,
900 x + 1, 1195 x + 1,
901 y + 1); 1196 y + 1);
902#else 1197#endif
1198
903 tt_printf ("\033[M%c%c%c", 1199 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1200 (32 + button_number + key_state),
905 (32 + x + 1), 1201 (32 + x + 1),
906 (32 + y + 1)); 1202 (32 + y + 1));
907#endif
908} 1203}
909 1204
910#ifdef USING_W11LIB 1205#ifdef USING_W11LIB
911void 1206void
912rxvt_W11_process_x_event (XEvent *ev) 1207rxvt_W11_process_x_event (XEvent *ev)
… …
919 1214
920/*{{{ process an X event */ 1215/*{{{ process an X event */
921void 1216void
922rxvt_term::x_cb (XEvent &ev) 1217rxvt_term::x_cb (XEvent &ev)
923{ 1218{
1219 dDisp;
1220
924 SET_R (this); 1221 SET_R (this);
925 SET_LOCALE (locale); 1222 SET_LOCALE (locale);
926 1223
927#if defined(CURSOR_BLINK) 1224#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1226 {
930 if (hidden_cursor) 1227 if (hidden_cursor)
931 { 1228 {
932 hidden_cursor = 0; 1229 hidden_cursor = 0;
933 want_refresh = 1; 1230 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1234 }
938#endif 1235#endif
939 1236
940#if defined(POINTER_BLANK) 1237#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1239 {
943 if (ev.type == MotionNotify 1240 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1241 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1242 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1243 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1246 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1247 pointer_blank ();
951 } 1248 }
952#endif 1249#endif
953 1250
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1251 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1252 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1253 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011 1254
1012 switch (ev.type) 1255 switch (ev.type)
1013 { 1256 {
1014 case KeyPress: 1257 case KeyPress:
1258#if ISO_14755
1259 if (!(iso14755buf & ISO_14755_52))
1260#endif
1015 lookup_key (ev.xkey); 1261 lookup_key (ev.xkey);
1262
1263 break;
1264
1265 case KeyRelease:
1266 {
1267#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1268 KeySym ks;
1269
1270 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1271#endif
1272
1273#if ENABLE_FRILLS || ISO_14755
1274 // ISO 14755 support
1275 if (iso14755buf)
1276 if (iso14755buf & ISO_14755_52)
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281# if ISO_14755
1282 // iso14755 part 5.2 handling: release time
1283 // first: controls
1284 if ((ev.xkey.state & ControlMask)
1285 && ((ks >= 0x40 && ks <= 0x5f)
1286 || (ks >= 0x61 && ks <= 0x7f)))
1287 {
1288 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1289 commit_iso14755 ();
1290 return; // case-break;
1291 }
1292
1293 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1294 if (i[0] == ks)
1295 {
1296 iso14755buf = ISO_14755_51 | i[1];
1297 commit_iso14755 ();
1298 return; // case-break;
1299 }
1300
1301 scr_bell ();
1302# endif
1303 iso14755buf = 0;
1016 break; 1304 break;
1305 }
1306 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311 if (iso14755buf & ISO_14755_51)
1312 commit_iso14755 ();
1313#if ISO_14755
1314 else if (iso14755buf & ISO_14755_STARTED)
1315 {
1316 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1317
1318 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1319 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1320 }
1321# endif
1322 else
1323 iso14755buf = 0;
1324 }
1325#endif
1017 1326
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1328 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1329 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1330 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1331 mouse_slip_wheel_speed = 0;
1030 } 1332#endif
1031 break; 1333 break;
1032 } 1334 }
1033#endif
1034 1335
1035 case ButtonPress: 1336 case ButtonPress:
1036 button_press (ev.xbutton); 1337 button_press (ev.xbutton);
1037 break; 1338 break;
1038 1339
… …
1040 button_release (ev.xbutton); 1341 button_release (ev.xbutton);
1041 break; 1342 break;
1042 1343
1043 case ClientMessage: 1344 case ClientMessage:
1044 if (ev.xclient.format == 32 1345 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1347 {
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1046 destroy (); 1349 destroy ();
1350#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev);
1355#endif
1356 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1047#ifdef OFFIX_DND 1366#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */ 1367 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile 1369 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir 1370 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink)) 1371 || ev.xclient.data.l[0] == DndLink))
1053 { 1372 {
1054 /* Get Dnd data */ 1373 /* Get Dnd data */
1055 Atom ActualType; 1374 Atom ActualType;
1056 int ActualFormat; 1375 int ActualFormat;
1057 unsigned char *data; 1376 unsigned char *data;
1058 unsigned long Size, RemainingBytes; 1377 unsigned long Size, RemainingBytes;
1059 1378
1060 XGetWindowProperty (display->display, display->root, 1379 XGetWindowProperty (disp, display->root,
1061 xa[XA_DNDSELECTION], 1380 xa[XA_DNDSELECTION],
1062 0L, 1000000L, 1381 0L, 1000000L,
1063 False, AnyPropertyType, 1382 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1383 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1384 &Size, &RemainingBytes,
1066 &data); 1385 &data);
1067 XChangeProperty (display->display, display->root, 1386 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1387 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1074 } 1390 }
1075#endif /* OFFIX_DND */ 1391#endif /* OFFIX_DND */
1076 break; 1392 break;
1077 1393
1078 case MappingNotify: 1394 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1395 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1396 break;
1081 1397
1082 /* 1398 /*
1083 * XXX: this is not the _current_ arrangement 1399 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1400 * Here's my conclusion:
… …
1103 break; 1419 break;
1104 } 1420 }
1105 break; 1421 break;
1106 1422
1107 case FocusIn: 1423 case FocusIn:
1108 if (!TermWin.focus) 1424 focus_in ();
1425 break;
1426
1427 case FocusOut:
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == parent[0])
1109 { 1433 {
1110 TermWin.focus = 1; 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1435 ;
1112#ifdef USE_XIM 1436
1113 if (Input_Context != NULL) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1114 XSetICFocus (Input_Context);
1115#endif
1116#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 { 1438 {
1123 PixColors = PixColorsFocused; 1439 seen_resize = 1;
1124 set_colorfgbg (); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1125 scr_clear ();
1126 scr_touch (true);
1127 } 1441 }
1128#endif
1129 1442
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1444 if (options & Opt_transparent)
1445 check_our_parents ();
1446#endif
1130 } 1447 }
1131 break; 1448 break;
1132 1449
1133 case FocusOut:
1134 if (TermWin.focus)
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 }
1158 break;
1159
1160 case ConfigureNotify: 1450 case PropertyNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1451 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1162 { 1452 && ev.xproperty.state == PropertyNewValue)
1163 int height, width; 1453 selection_property (ev.xproperty.window, ev.xproperty.atom);
1164 1454
1165 do
1166 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172
1173 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1);
1177 }
1178#ifdef DEBUG_SIZE
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent)
1186 {
1187 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif
1192 }
1193 break; 1455 break;
1194 1456
1195 case SelectionClear: 1457 case SelectionClear:
1196 selection_clear (); 1458 selection_clear ();
1197 break; 1459 break;
1198 1460
1199 case SelectionNotify: 1461 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1462 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1463 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1464 break;
1204 1465
1205 case SelectionRequest: 1466 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1207 break; 1468 break;
1208 1469
1209 case UnmapNotify: 1470 case UnmapNotify:
1210 TermWin.mapped = 0; 1471 mapped = 0;
1211#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1213#endif 1474#endif
1214 break; 1475 break;
1215 1476
1216 case MapNotify: 1477 case MapNotify:
1217 TermWin.mapped = 1; 1478 mapped = 1;
1218#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1219 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1220#endif 1481#endif
1221 break; 1482 break;
1222 1483
… …
1226 break; 1487 break;
1227#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1228 1489
1229 case GraphicsExpose: 1490 case GraphicsExpose:
1230 case Expose: 1491 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1232 { 1493 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1494 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1498
1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1500
1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1504
1241 // ev.xexpose.width, TermWin.height, False); 1505 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1506 }
1245 else 1507 else
1246 { 1508 {
1247 XEvent unused_event; 1509 XEvent unused_event;
1248 1510
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1250 ; 1512 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1514 ;
1253 1515
1254 if (isScrollbarWindow (ev.xany.window)) 1516 if (isScrollbarWindow (ev.xany.window))
1255 { 1517 {
1256 scrollBar.setIdle (); 1518 scrollBar.setIdle ();
… …
1258 } 1520 }
1259#ifdef MENUBAR 1521#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1523 menubar_expose ();
1262#endif 1524#endif
1525
1526#ifdef TRANSPARENT
1527 if (am_transparent && ev.xany.window == parent[0])
1528 XClearWindow (disp, ev.xany.window);
1529#endif
1263 } 1530 }
1264 break; 1531 break;
1265 1532
1266 case MotionNotify: 1533 case MotionNotify:
1267#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
… …
1273 { 1540 {
1274 menubar_control (ev.xbutton); 1541 menubar_control (ev.xbutton);
1275 break; 1542 break;
1276 } 1543 }
1277#endif 1544#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1546 break;
1280 1547
1281 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1282 { 1549 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1551 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1286 ; 1553 ;
1287 1554
1288 XQueryPointer (display->display, TermWin.vt, 1555 XQueryPointer (disp, vt,
1289 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1558 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1559 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1561 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1562 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1563 {
1297#endif 1564#endif
1565#if ISO_14755
1566 // 5.4
1567 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1568 {
1569 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1570 break;
1571 }
1572#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1575
1300#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1579 {
1304 int dist; 1580 int dist;
1305 1581
1306 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1586 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1587
1312 /* save the event params so we can highlight 1588 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1589 * the selection in the pending-scroll loop
1314 */ 1590 */
1315 selection_save_x=ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1594
1320 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1322 { 1597 {
1323 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1325 } 1600 }
1326 else 1601 else
1327 { 1602 {
1328 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1604 dist = ev.xbutton.y - (int_bwidth + height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1605 }
1606
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1607 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1609 + 1;
1334 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1336 } 1612 }
1337 else 1613 else
1338 { 1614 {
1339 /* we are within the text window, so we 1615 /* we are within the text window, so we
1340 * shouldn't be scrolling 1616 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1618 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1619 sel_scroll_ev.stop();
1344 } 1620 }
1345#endif 1621#endif
1346#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1347
1348 } 1623 }
1349#endif 1624#endif
1350
1351 } 1625 }
1352 } 1626 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1628 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1629 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1356 MotionNotify, &ev)) ; 1630 MotionNotify, &ev))
1631 ;
1632
1357 XQueryPointer (display->display, scrollBar.win, 1633 XQueryPointer (disp, scrollBar.win,
1358 &unused_root, &unused_child, 1634 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1636 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1637 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1639 scrollbar_size ());
1364 scr_refresh (refresh_type); 1640 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1641 refresh_limit = 0;
… …
1368 break; 1644 break;
1369 } 1645 }
1370} 1646}
1371 1647
1372void 1648void
1649rxvt_term::focus_in ()
1650{
1651 if (!focus)
1652 {
1653 focus = 1;
1654 want_refresh = 1;
1655#if USE_XIM
1656 if (Input_Context != NULL)
1657 {
1658 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context);
1660 }
1661#endif
1662#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink)
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif
1666#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade])
1668 {
1669 pix_colors = pix_colors_focused;
1670 scr_recolour ();
1671 }
1672#endif
1673 }
1674}
1675
1676void
1677rxvt_term::focus_out ()
1678{
1679 if (focus)
1680 {
1681 focus = 0;
1682 want_refresh = 1;
1683
1684#if ENABLE_FRILLS || ISO_14755
1685 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY
1688 scr_overlay_off ();
1689#endif
1690#if USE_XIM
1691 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context);
1693#endif
1694#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink)
1696 cursor_blink_ev.stop ();
1697 hidden_cursor = 0;
1698#endif
1699#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade])
1701 {
1702 pix_colors = pix_colors_unfocused;
1703 scr_recolour ();
1704 }
1705#endif
1706 }
1707}
1708
1709#if TRANSPARENT
1710void
1373rxvt_term::rootwin_cb (XEvent &ev) 1711rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1712{
1375 SET_R (this); 1713 SET_R (this);
1376 SET_LOCALE (locale); 1714 SET_LOCALE (locale);
1377 1715
1378 switch (ev.type) 1716 switch (ev.type)
1379 { 1717 {
1380 case PropertyNotify: 1718 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1719 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1720 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on. 1721 * use the property to determine the pixmap. We use it later on.
1393 */ 1722 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1723 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1398 return; 1725 return;
1399 }
1400 1726
1401 /* FALLTHROUGH */ 1727 /* FALLTHROUGH */
1402 case ReparentNotify: 1728 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1730 want_refresh = want_full_refresh = 1;
1405 break; 1731 break;
1406#endif
1407 } 1732 }
1408} 1733}
1734#endif
1409 1735
1410void 1736void
1411rxvt_term::button_press (XButtonEvent &ev) 1737rxvt_term::button_press (XButtonEvent &ev)
1412{ 1738{
1413 int reportmode = 0, clickintime; 1739 int reportmode = 0, clickintime;
1414 1740
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1742 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744
1418 /* 1745 /*
1419 * VT window processing of button press 1746 * VT window processing of button press
1420 */ 1747 */
1421 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1422 { 1749 {
1750#if ISO_14755
1751 // 5.4
1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1753 {
1754 iso14755_54 (ev.x, ev.y);
1755 return;
1756 }
1757#endif
1758
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1759 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1760
1424 if (reportmode) 1761 if (reportmode)
1425 { 1762 {
1426 /* mouse report from vt window */ 1763 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1764 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1765 MEvent.state = ev.state;
… …
1457 } 1794 }
1458 else 1795 else
1459 { 1796 {
1460 if (ev.button != MEvent.button) 1797 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1798 MEvent.clicks = 0;
1799
1462 switch (ev.button) 1800 switch (ev.button)
1463 { 1801 {
1464 case Button1: 1802 case Button1:
1803 /* allow meta + click to select rectangular areas */
1804 /* should be done in screen.C */
1805#if ENABLE_FRILLS
1806 selection.rect = !!(ev.state & ModMetaMask);
1807#else
1808 selection.rect = false;
1809#endif
1810
1465 /* allow shift+left click to extend selection */ 1811 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1813 {
1468 if (MEvent.button == Button1 && clickintime) 1814 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1815 selection_rotate (ev.x, ev.y);
1470 else 1816 else
1471 selection_extend (ev.x, ev.y, 1); 1817 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1832 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1833 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1834 selection_rotate (ev.x, ev.y);
1489 else 1835 else
1490 selection_extend (ev.x, ev.y, 1); 1836 selection_extend (ev.x, ev.y, 1);
1837
1491 MEvent.button = Button3; 1838 MEvent.button = Button3;
1492 break; 1839 break;
1493 } 1840 }
1494 } 1841 }
1842
1495 MEvent.time = ev.time; 1843 MEvent.time = ev.time;
1496 return; 1844 return;
1497 } 1845 }
1498 1846
1499 /* 1847 /*
… …
1591 break; 1939 break;
1592 case R_SB_ALIGN_BOTTOM: 1940 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1941 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1942 break;
1595 } 1943 }
1944
1596 if (scrollBar.style == R_SB_XTERM 1945 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1946 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1947 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1948 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1949
1601 scrollBar.setMotion (); 1950 scrollBar.setMotion ();
1602 break; 1951 break;
1603 1952
1604 case Button1: 1953 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1954 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 case Button3: 1958 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1611 { 1960 {
1612 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1615# else 1964# else
1616 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1617# endif 1966# endif
1618 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1621# else 1970# else
1622 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1623# endif 1972# endif
1624 else 1973 else
1625 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1626 } 1975 }
1627 else 1976 else
1628 { 1977 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1979 (nrow
1631 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1981 / scrollbar_size ()));
1633 } 1982 }
1983
1634 break; 1984 break;
1635 } 1985 }
1636 } 1986 }
1637 return; 1987 return;
1638 } 1988 }
… …
1650{ 2000{
1651 int reportmode = 0; 2001 int reportmode = 0;
1652 2002
1653 csrO = 0; /* reset csr Offset */ 2003 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2004 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2005 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2006
1657 if (scrollbar_isUpDn ()) 2007 if (scrollbar_isUpDn ())
1658 { 2008 {
1659 scrollBar.setIdle (); 2009 scrollBar.setIdle ();
1660 scrollbar_show (0); 2010 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 2012 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 2013#endif
1664
1665 } 2014 }
2015
1666#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
1669#endif 2019#endif
2020
1670 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
1671 { 2022 {
2023#if ISO_14755
2024 // 5.4
2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2026 return;
2027#endif
1672 if (reportmode) 2028 if (reportmode)
1673 { 2029 {
1674 /* mouse report from vt window */ 2030 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2031 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2032 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2046 MEvent.button = AnyButton;
1691 mouse_report (ev); 2047 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2048#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2049 return;
1694 } 2050 }
2051
1695 /* 2052 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2053 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2054 * when overriding mouse reporting
1698 */ 2055 */
1699 if (PrivateModes & PrivMode_mouse_report 2056 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2057 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2058 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2059 selection_extend (ev.x, ev.y, 0);
1703 2060
1704 switch (ev.button) 2061 switch (ev.button)
… …
1719 2076
1720 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
1721 2078
1722 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
1723 i = 1; 2080 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2082 i = nrow - 1;
1726 else 2083 else
1727 i = 5; 2084 i = 5;
1728 2085
1729# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
1731 { 2088 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1735 2092
1736 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738 2095
1739 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
1767#endif 2124#endif
1768} 2125}
1769 2126
1770#ifdef TRANSPARENT 2127#ifdef TRANSPARENT
1771#if TINTING 2128#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2129/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2130
1775static void 2131typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2132
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2133void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2134{
1783 /* No saturation */ 2135 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2136 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2140 int i;
1787 2141
1788 b = ((uint16_t *) ptr)[x]; 2142 Visual *visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2143
1790 g = (b & 0x3e0) * gm; 2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2145
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2146 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2147 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2148 mask_g = visual->green_mask;
1795 } 2149 mask_b = visual->blue_mask;
1796 ptr += bpl; 2150
1797 } 2151 /* boring lookup table pre-initialization */
2152 switch (srcImage->bits_per_pixel) {
2153 case 15:
2154 if ((mask_r != 0x7c00) ||
2155 (mask_g != 0x03e0) ||
2156 (mask_b != 0x001f))
2157 return;
2158 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2159 lookup_r = lookup;
2160 lookup_g = lookup+32;
2161 lookup_b = lookup+32+32;
2162 sh_r = 10;
2163 sh_g = 5;
2164 sh_b = 0;
2165 break;
2166 case 16:
2167 if ((mask_r != 0xf800) ||
2168 (mask_g != 0x07e0) ||
2169 (mask_b != 0x001f))
2170 return;
2171 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2172 lookup_r = lookup;
2173 lookup_g = lookup+32;
2174 lookup_b = lookup+32+64;
2175 sh_r = 11;
2176 sh_g = 5;
2177 sh_b = 0;
2178 break;
2179 case 24:
2180 if ((mask_r != 0xff0000) ||
2181 (mask_g != 0x00ff00) ||
2182 (mask_b != 0x0000ff))
2183 return;
2184 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2185 lookup_r = lookup;
2186 lookup_g = lookup+256;
2187 lookup_b = lookup+256+256;
2188 sh_r = 16;
2189 sh_g = 8;
2190 sh_b = 0;
2191 break;
2192 case 32:
2193 if ((mask_r != 0xff0000) ||
2194 (mask_g != 0x00ff00) ||
2195 (mask_b != 0x0000ff))
2196 return;
2197 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2198 lookup_r = lookup;
2199 lookup_g = lookup+256;
2200 lookup_b = lookup+256+256;
2201 sh_r = 16;
2202 sh_g = 8;
2203 sh_b = 0;
2204 break;
2205 default:
2206 return; /* we do not support this color depth */
2207 }
2208
2209 /* prepare limits for color transformation (each channel is handled separately) */
2210 if (shade < 0) {
2211 shade = -shade;
2212 if (shade < 0) shade = 0;
2213 if (shade > 100) shade = 100;
2214
2215 lower_lim_r = 65535-rm;
2216 lower_lim_g = 65535-gm;
2217 lower_lim_b = 65535-bm;
2218
2219 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2220 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2221 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2222
2223 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2224 } else {
1799 for (y = h; --y >= 0;) { 2225 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2226 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2227
1803 b = ((uint16_t *) ptr)[x]; 2228 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2229
1805 g = (b & 0x3e0) * gm; 2230 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2231 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2232 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2233 }
1809 b |= (!(b >> 5) - 1); 2234
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2235 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2236 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2237 {
1813 } 2238 unsigned int tmp;
1814 ptr += bpl; 2239
2240 tmp = lower_lim_r;
2241 lower_lim_r = lower_lim_b;
2242 lower_lim_b = tmp;
2243
2244 tmp = upper_lim_r;
2245 upper_lim_r = upper_lim_b;
2246 upper_lim_b = tmp;
2247 }
2248
2249 /* fill our lookup tables */
2250 for (i = 0; i <= mask_r>>sh_r; i++)
2251 {
2252 RUINT32T tmp;
2253 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2254 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2255 lookup_r[i] = (tmp/65535)<<sh_r;
2256 }
2257 for (i = 0; i <= mask_g>>sh_g; i++)
2258 {
2259 RUINT32T tmp;
2260 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2261 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2262 lookup_g[i] = (tmp/65535)<<sh_g;
2263 }
2264 for (i = 0; i <= mask_b>>sh_b; i++)
2265 {
2266 RUINT32T tmp;
2267 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2268 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2269 lookup_b[i] = (tmp/65535)<<sh_b;
2270 }
2271
2272 /* apply table to input image (replacing colors by newly calculated ones) */
2273 switch (srcImage->bits_per_pixel)
2274 {
2275 case 15:
2276 {
2277 unsigned short *p1, *pf, *p, *pl;
2278 p1 = (unsigned short *) srcImage->data;
2279 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2280 while (p1 < pf)
2281 {
2282 p = p1;
2283 pl = p1 + srcImage->width;
2284 for (; p < pl; p++)
1815 } 2285 {
2286 *p = lookup_r[(*p & 0x7c00)>>10] |
2287 lookup_g[(*p & 0x03e0)>> 5] |
2288 lookup_b[(*p & 0x001f)];
2289 }
2290 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2291 }
1817} 2292 break;
1818 2293 }
1819/* RGB 16 */ 2294 case 16:
1820static void 2295 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2296 unsigned short *p1, *pf, *p, *pl;
1822{ 2297 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2298 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2299 while (p1 < pf)
1825 2300 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2301 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2302 pl = p1 + srcImage->width;
1828 /* No saturation */ 2303 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2304 {
1843 } else { 2305 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2306 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2307 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2308 }
1859 ptr += bpl; 2309 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2310 }
2311 break;
2312 }
2313 case 24:
2314 {
2315 unsigned char *p1, *pf, *p, *pl;
2316 p1 = (unsigned char *) srcImage->data;
2317 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2318 while (p1 < pf)
2319 {
2320 p = p1;
2321 pl = p1 + srcImage->width * 3;
2322 for (; p < pl; p += 3)
1860 } 2323 {
2324 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2325 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2326 p[2] = lookup_r[(p[2] & 0x0000ff)];
2327 }
2328 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2329 }
1862} 2330 break;
2331 }
2332 case 32:
2333 {
2334 RUINT32T *p1, *pf, *p, *pl;
2335 p1 = (RUINT32T *) srcImage->data;
2336 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2337
1864/* RGB 24 */ 2338 while (p1 < pf)
1865static void 2339 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2340 p = p1;
1867{ 2341 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2342 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2343 {
1896 } else { 2344 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2345 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2346 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2347 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2348 }
1927 ptr += bpl; 2349 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2350 }
2351 break;
2352 }
1929 } 2353 }
1930}
1931 2354
1932/* RGB 32 */ 2355 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2356}
2003
2004#endif 2357#endif
2005 2358
2006/* 2359/*
2007 * Check our parents are still who we think they are. 2360 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2361 * Do transparency updates if required
… …
2015 Atom atype; 2368 Atom atype;
2016 unsigned char *prop = NULL; 2369 unsigned char *prop = NULL;
2017 Window root, oldp, *list; 2370 Window root, oldp, *list;
2018 Pixmap rootpixmap = None; 2371 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2372 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2020 2374
2021 pchanged = 0; 2375 pchanged = 0;
2022 2376
2023 if (!(Options & Opt_transparent)) 2377 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2025 2379
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2028 2382
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2030 2384
2031 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2032 { 2386 {
2033 if (am_transparent) 2387 if (am_transparent)
2034 { 2388 {
2035 pchanged = 1; 2389 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2038 } 2392 }
2039 2393
2040 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2041 } 2395 }
2042 2396
2043 /* Get all X ops out of the queue so that our information is up-to-date. */ 2397 /* Get all X ops out of the queue so that our information is up-to-date. */
2044 XSync (display->display, False); 2398 XSync (disp, False);
2045 2399
2046 /* 2400 /*
2047 * Make the frame window set by the window manager have 2401 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2402 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2403 * windows for each client, so we have to take care about that.
2050 */ 2404 */
2051 i = (xa[XA_XROOTPMAPID] 2405 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2408 &nitems, &bytes_after, &prop) == Success);
2055 2409
2056 if (!i || prop == NULL) 2410 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2411 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2414 &nitems, &bytes_after, &prop) == Success);
2061 2415
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2416 if (!i || prop == NULL
2417#if TINTING
2418 || !rs[Rs_color + Color_tint]
2419#endif
2420 )
2063 have_pixmap = 0; 2421 have_pixmap = 0;
2064 else 2422 else
2065 { 2423 {
2066 have_pixmap = 1; 2424 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2425 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2436 Window cr;
2079 XImage *image; 2437 XImage *image;
2080 GC gc; 2438 GC gc;
2081 XGCValues gcvalue; 2439 XGCValues gcvalue;
2082 2440
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2445 nx = ny = 0;
2088 2446
… …
2098 nh += sy; 2456 nh += sy;
2099 ny = -sy; 2457 ny = -sy;
2100 sy = 0; 2458 sy = 0;
2101 } 2459 }
2102 2460
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2463
2464 XSync (disp, False);
2105 allowedxerror = -1; 2465 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2467
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2469 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2470 allowedxerror = 0;
2111 2471
2112 if (image == NULL) 2472 if (image == NULL)
2113 { 2473 {
2114 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2115 { 2475 {
2116 pchanged = 1; 2476 pchanged = 1;
2117 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2118 { 2478 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2120 TermWin.pixmap = None; 2480 pixmap = None;
2121 } 2481 }
2122 } 2482 }
2123 2483
2124 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2125 } 2485 }
2126 else 2486 else
2127 { 2487 {
2128 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2130 2490
2131#if TINTING 2491#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2493 {
2134 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2495 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2496
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2497 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2498
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2500 }
2151#endif 2501#endif
2152 2502
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2154 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2508 XFreeGC (disp, gc);
2159 XDestroyImage (image); 2509 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2511 XClearWindow (disp, parent[0]);
2161 2512
2162 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2514 pchanged = 1;
2164 2515
2165 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2166 } 2517 }
2167 } 2518 }
2168 2519
2169 if (!am_pixmap_trans) 2520 if (am_pixmap_trans)
2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2522 else
2170 { 2523 {
2171 unsigned int n; 2524 unsigned int n;
2172 /* 2525 /*
2173 * InheritPixmap transparency 2526 * InheritPixmap transparency
2174 */ 2527 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2177 { 2529 {
2178 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2181 XFree (list); 2533 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2534
2184 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2185 { 2536 {
2186 if (oldp != None) 2537 if (oldp != None)
2187 pchanged = 1; 2538 pchanged = 1;
2188 2539
2189 break; 2540 break;
2190 } 2541 }
2191 2542
2192 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2193 pchanged = 1; 2544 pchanged = 1;
2194 } 2545 }
2195 2546
2196 n = 0; 2547 n = 0;
2197 2548
2198 if (pchanged) 2549 if (pchanged)
2199 { 2550 {
2200 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2201 { 2552 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2555 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2207 break; 2557 break;
2208 } 2558 }
2209 } 2559 }
2210 } 2560 }
2211 2561
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2213 { 2563 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2566 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2219 } 2568 }
2220 else 2569 else
2221 { 2570 {
2222#if WAIT_FOR_WM 2571#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2572 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2574 sleep (1);
2226#endif 2575#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2577 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2579 XClearWindow (disp, parent[n]);
2580 }
2230 2581
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2232 am_transparent = 1; 2583 am_transparent = 1;
2233 } 2584 }
2234 2585
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2587 parent[i] = None;
2588 }
2589
2590 if (scrollBar.win)
2591 {
2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2593 scrollBar.setIdle ();
2594 scrollbar_show (0);
2595 }
2596
2597 if (am_transparent)
2598 {
2599 want_refresh = want_full_refresh = 1;
2600 if (am_pixmap_trans)
2601 flush ();
2237 } 2602 }
2238 2603
2239 return pchanged; 2604 return pchanged;
2240} 2605}
2241#endif 2606#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2625 if (ch == NOCHAR) // TODO: improve
2261 break; 2626 break;
2262 2627
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2629 {
2630 if (!seen_input)
2631 {
2632 seen_input = 1;
2633 // many badly-written programs (e.g. jed) contain a race condition:
2634 // they first read the screensize and then install a SIGWINCH handler.
2635 // some window managers resize the window early, and these programs
2636 // then sometimes get the size wrong.
2637 // unfortunately other programs are even more buggy and dislike
2638 // being sent SIGWINCH, so only do it when we were in fact being
2639 // resized.
2640 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH);
2642 }
2643
2265 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2646 bool refreshnow = false;
2268 int nlines = 0; 2647 int nlines = 0;
2269 unicode_t *str = buf; 2648 unicode_t *str = buf;
2270 2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2650
2273 for (;;) 2651 for (;;)
2274 { 2652 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2654 break;
2280 2655
2281 *str++ = ch; 2656 *str++ = ch;
2282 2657
2283 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2284 { 2659 {
2660 if (ch == C0_LF)
2285 nlines++; 2661 nlines++;
2662
2286 refresh_count++; 2663 refresh_count++;
2287 2664
2288 if (! (Options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2290 { 2667 {
2291 refreshnow = true; 2668 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2669 ch = NOCHAR;
2294 break; 2670 break;
2295 } 2671 }
2296 2672
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2299 { 2675 {
2300 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2677 nlines = 0;
2302 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2303 } 2680 }
2681
2682 if (str >= eol)
2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2686 ch = NOCHAR;
2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2304 } 2693 }
2305 2694
2306 if (str >= buf + UBUFSIZ) 2695 seq_begin = cmdbuf_ptr;
2307 { 2696 ch = next_char ();
2308 ch = NOCHAR;
2309 break;
2310 }
2311 } 2697 }
2312 2698
2313 scr_add_lines (buf, nlines, str - buf); 2699 scr_add_lines (buf, nlines, str - buf);
2314 2700
2315 /* 2701 /*
2316 * If there have been a lot of new lines, then update the screen 2702 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2703 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2704 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2705 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2706 */
2324 if (refreshnow) 2707 if (refreshnow)
2325 { 2708 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2710 refresh_limit++;
2328 else 2711 else
2712 {
2713 flag = true;
2329 scr_refresh (refresh_type); 2714 scr_refresh (refresh_type);
2715 }
2330 } 2716 }
2331 2717
2332 } 2718 }
2333 else 2719 else
2334 { 2720 {
… …
2382 if (len == (size_t)-1) 2768 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384 2770
2385 // assume wchar == unicode 2771 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2772 cmdbuf_ptr += len;
2387 return wc; 2773 return wc & UNICODE_MASK;
2388 } 2774 }
2389 2775
2390 return NOCHAR; 2776 return NOCHAR;
2391} 2777}
2392 2778
… …
2518 process_escape_seq (); 2904 process_escape_seq ();
2519 break; 2905 break;
2520 case C0_ENQ: /* terminal Status */ 2906 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2907 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2910 else
2525 tt_write ((unsigned char *)VT100_ANS, 2911 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2912 (unsigned int)strlen (VT100_ANS));
2527 break; 2913 break;
2528 case C0_BEL: /* bell */ 2914 case C0_BEL: /* bell */
2529 scr_bell (); 2915 scr_bell ();
2530 break; 2916 break;
2531 case C0_BS: /* backspace */ 2917 case C0_BS: /* backspace */
… …
2630void 3016void
2631rxvt_term::process_escape_seq () 3017rxvt_term::process_escape_seq ()
2632{ 3018{
2633 unicode_t ch = cmd_getc (); 3019 unicode_t ch = cmd_getc ();
2634 3020
2635 if (PrivateModes & PrivMode_vt52) 3021 if (priv_modes & PrivMode_vt52)
2636 { 3022 {
2637 process_escape_vt52 (ch); 3023 process_escape_vt52 (ch);
2638 return; 3024 return;
2639 } 3025 }
2640 3026
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3041 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3042 break;
2657 case '+': 3043 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3044 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3045 break;
2660#ifndef NO_FRILLS 3046#if ENABLE_FRILLS
2661 case '6': 3047 case '6':
2662 scr_backindex (); 3048 scr_backindex ();
2663 break; 3049 break;
2664#endif 3050#endif
2665 case '7': 3051 case '7':
2666 scr_cursor (SAVE); 3052 scr_cursor (SAVE);
2667 break; 3053 break;
2668 case '8': 3054 case '8':
2669 scr_cursor (RESTORE); 3055 scr_cursor (RESTORE);
2670 break; 3056 break;
2671#ifndef NO_FRILLS 3057#if ENABLE_FRILLS
2672 case '9': 3058 case '9':
2673 scr_forwardindex (); 3059 scr_forwardindex ();
2674 break; 3060 break;
2675#endif 3061#endif
2676 case '=': 3062 case '=':
… …
2855 { 3241 {
2856 switch (priv) 3242 switch (priv)
2857 { 3243 {
2858 case '>': 3244 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 3245 if (ch == CSI_DA) /* secondary device attributes */
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2861 break; 3247 break;
2862 case '?': 3248 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3250 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3251 break;
… …
2970 3356
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 3362 break;
2977 3363
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3367 break;
2982 3368
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3370 process_sgr_mode (nargs, arg);
2985 break; 3371 break;
… …
2992 break; 3378 break;
2993 case 6: /* CPR requested */ 3379 case 6: /* CPR requested */
2994 scr_report_position (); 3380 scr_report_position ();
2995 break; 3381 break;
2996 case 7: /* unofficial extension */ 3382 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3383 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3384 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3385 break;
3000 case 8: /* unofficial extension */ 3386 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3388 break;
3003 } 3389 }
… …
3039 break; 3425 break;
3040 3426
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3427 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3428 if (arg[0] == 4)
3043 scr_insert_mode (0); 3429 scr_insert_mode (0);
3430 else if (arg[0] == 20)
3431 priv_modes &= ~PrivMode_LFNL;
3044 break; 3432 break;
3045 3433
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3434 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3435 if (arg[0] == 4)
3048 scr_insert_mode (1); 3436 scr_insert_mode (1);
3437 else if (arg[0] == 20)
3438 priv_modes |= PrivMode_LFNL;
3049 break; 3439 break;
3050 3440
3051 /* 3441 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3442 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3443 */
… …
3065 break; 3455 break;
3066 case CSI_75: 3456 case CSI_75:
3067 scr_cursor (RESTORE); 3457 scr_cursor (RESTORE);
3068 break; 3458 break;
3069 3459
3070#ifndef NO_FRILLS 3460#if ENABLE_FRILLS
3071 case CSI_74: 3461 case CSI_74:
3072 process_window_ops (arg, nargs); 3462 process_window_ops (arg, nargs);
3073 break; 3463 break;
3074#endif 3464#endif
3075 3465
… …
3082 break; 3472 break;
3083 } 3473 }
3084} 3474}
3085/*}}} */ 3475/*}}} */
3086 3476
3087#ifndef NO_FRILLS 3477#if ENABLE_FRILLS
3088/* ARGSUSED */ 3478/* ARGSUSED */
3089void 3479void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3480rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3481{
3092 int x, y; 3482 int x, y;
3093 XWindowAttributes wattr; 3483 XWindowAttributes wattr;
3094 Window wdummy; 3484 Window wdummy;
3485 dDisp;
3095 3486
3096 if (nargs == 0) 3487 if (nargs == 0)
3097 return; 3488 return;
3098 3489
3099 switch (args[0]) 3490 switch (args[0])
3100 { 3491 {
3101 /* 3492 /*
3102 * commands 3493 * commands
3103 */ 3494 */
3104 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3106 break; 3497 break;
3107 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3499 XIconifyWindow (disp, parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3500 break;
3111 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3113 break; 3503 break;
3114 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3506 break;
3117 case 5: /* raise window */ 3507 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3119 break; 3509 break;
3120 case 6: /* lower window */ 3510 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3122 break; 3512 break;
3123 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3124 scr_touch (true); 3514 scr_touch (true);
3125 break; 3515 break;
3126 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3129 break; 3519 break;
3130 3520
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3522 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3136 break; 3526 break;
3137 3527
3138 3528
3139 /* 3529 /*
3140 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3141 */ 3531 */
3142 case 11: /* report window state */ 3532 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3535 break;
3146 case 13: /* report window position */ 3536 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3542 break;
3153 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3546 break;
3157 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3549 break;
3160 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3552 break;
3163 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3554 {
3166 char *s; 3555 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s);
3169 } 3559 }
3170 break; 3560 break;
3171 case 21: /* report window title */ 3561 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3562 {
3174 char *s; 3563 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s);
3177 } 3567 }
3178 break; 3568 break;
3179 } 3569 }
3180} 3570}
3181#endif 3571#endif
3182 3572
… …
3186 * ends_how is terminator used. returned input must be free()'d 3576 * ends_how is terminator used. returned input must be free()'d
3187 */ 3577 */
3188unsigned char * 3578unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3579rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3580{
3191 unicode_t prev = 0, ch; 3581 unicode_t ch;
3582 bool seen_esc = false;
3192 unsigned int n = 0; 3583 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3584 wchar_t string[STRING_MAX];
3195 3585
3196 while ((ch = cmd_getc ()) != NOCHAR) 3586 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3587 {
3198 if (prev == C0_ESC) 3588 if (seen_esc)
3199 { 3589 {
3200 if (ch == 0x5c) /* 7bit ST */ 3590 if (ch == 0x5c) /* 7bit ST */
3201 break; 3591 break;
3202 else 3592 else
3203 return NULL; 3593 return NULL;
3204 } 3594 }
3595 else if (ch == C0_ESC)
3596 {
3597 seen_esc = true;
3598 continue;
3599 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3600 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3601 break;
3207 else if (ch < 0x20) 3602 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3209 3604
3210 if (n >= sizeof (string) - 1) 3605 seen_esc = false;
3606
3607 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3608 // stop at some sane length
3212 return NULL; 3609 return NULL;
3213 3610
3214 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3613 else
3220 string[n++] = prev = ch; 3614 string[n++] = ch;
3221 } 3615 }
3222 3616
3223 string[n++] = '\0'; 3617 string[n++] = '\0';
3224 3618
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3619 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3620
3230 return s; 3621 return (unsigned char *)rxvt_wcstombs (string);
3231} 3622}
3232 3623
3233/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3234/* 3625/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3279void 3670void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3672{
3282 if (str[0] == '?' && !str[1]) 3673 if (str[0] == '?' && !str[1])
3283 { 3674 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3675 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3676 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3678 }
3291 else 3679 else
3292 set_window_color (color, str); 3680 set_window_color (color, str);
3293} 3681}
3294 3682
3295/* 3683/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3685 */
3320void 3686void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3322{ 3688{
3323 int changed = 0; 3689 int changed = 0;
3324 int color; 3690 int color;
3325 char *buf, *name; 3691 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3692 bool query = str[0] == '?' && !str[1];
3693 int saveop = op;
3694 dDisp;
3327 3695
3328 assert (str != NULL); 3696 assert (str != NULL);
3329 switch (op) 3697 switch (op)
3330 { 3698 {
3331 case XTerm_name: 3699 case XTerm_name:
… …
3338 set_title (str); 3706 set_title (str);
3339 break; 3707 break;
3340 case XTerm_property: 3708 case XTerm_property:
3341 if (str[0] == '?') 3709 if (str[0] == '?')
3342 { 3710 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3711 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3712 Atom actual_type;
3345 int actual_format; 3713 int actual_format;
3346 unsigned long nitems; 3714 unsigned long nitems;
3347 unsigned long bytes_after; 3715 unsigned long bytes_after;
3348 unsigned char *value = 0; 3716 unsigned char *value = 0;
3349 const char *str = ""; 3717 const char *str = "";
3350 3718
3351 if (prop 3719 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3724 && actual_type != None
3357 && actual_format == 8) 3725 && actual_format == 8)
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3734 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3735
3368 if (eq) 3736 if (eq)
3369 { 3737 {
3370 *eq = 0; 3738 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3739 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3740 }
3376 else 3741 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3378 display->atom (str)); 3743 display->atom (str));
3379 } 3744 }
3380 break; 3745 break;
3381 3746
3382 case XTerm_Color: 3747 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3748 for (buf = (char *)str; buf && *buf;)
3384 { 3749 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3750 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3751 break;
3387 3752
3388 *name++ = '\0'; 3753 *name++ = '\0';
3389 color = atoi (buf); 3754 color = atoi (buf);
3390 3755
3391 if (color < 0 || color >= TOTAL_COLORS) 3756 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3757 break;
3393 3758
3394 if ((buf = STRCHR (name, ';')) != NULL) 3759 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3760 *buf++ = '\0';
3396 3761
3397 if (name[0] == '?' && !name[1]) 3762 if (name[0] == '?' && !name[1])
3398 { 3763 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3764 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3767 }
3406 else 3768 else
3407 set_window_color (color + minCOLOR, name); 3769 set_window_color (color + minCOLOR, name);
3408 } 3770 }
3409 break; 3771 break;
… …
3431 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3795 break;
3434 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3802#endif
3803#if TRANSPARENT && TINTING
3804 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3806 check_our_parents ();
3807 if (am_transparent)
3808 want_full_refresh = want_refresh = 1;
3436 break; 3809 break;
3437#endif 3810#endif
3438 3811
3439 case XTerm_Pixmap: 3812 case XTerm_Pixmap:
3440 if (*str != ';') 3813 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3816 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3817 set_bgPixmap (str); /* change pixmap */
3445#endif 3818#endif
3446 scr_touch (true); 3819 scr_touch (true);
3447 } 3820 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3821 while ((str = strchr (str, ';')) != NULL)
3449 { 3822 {
3450 str++; 3823 str++;
3451#if XPM_BACKGROUND 3824#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3825 changed += scale_pixmap (str);
3453#endif 3826#endif
3454
3455 } 3827 }
3828
3456 if (changed) 3829 if (changed)
3457 { 3830 {
3458#ifdef XPM_BACKGROUND 3831#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3832 resize_pixmap ();
3460#endif 3833#endif
… …
3471 3844
3472 case XTerm_logfile: 3845 case XTerm_logfile:
3473 // TODO, when secure mode? 3846 // TODO, when secure mode?
3474 break; 3847 break;
3475 3848
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR 3849#ifdef MENUBAR
3517 case XTerm_Menu: 3850 case URxvt_Menu:
3518 if (Options & Opt_insecure) 3851 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3853 break;
3521#endif 3854#endif
3522#if 0 3855#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3856 case XTerm_dumpscreen: /* no error notices */
… …
3527 { 3860 {
3528 scr_dump (fd); 3861 scr_dump (fd);
3529 close (fd); 3862 close (fd);
3530 } 3863 }
3531 } 3864 }
3865 break;
3866#endif
3867 case XTerm_font:
3868 op = URxvt_font;
3869 case URxvt_font:
3870#if ENABLE_STYLES
3871 case URxvt_boldFont:
3872 case URxvt_italicFont:
3873 case URxvt_boldItalicFont:
3874#endif
3875 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp);
3880 else
3881 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883
3884 res = strdup (str);
3885 allocated.push_back ((void *)res);
3886 set_fonts ();
3887 }
3888 break;
3889
3890#if ENABLE_FRILLS
3891 case URxvt_locale:
3892 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3894 else
3895 {
3896 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale ();
3899 }
3900 break;
3901
3902 case URxvt_view_up:
3903 case URxvt_view_down:
3904 int lines = atoi (str);
3905
3906 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else
3909 {
3910 scr_erase_savelines ();
3911 }
3912
3532 break; 3913 break;
3533#endif 3914#endif
3534 } 3915 }
3535} 3916}
3536/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
… …
3550{ 3931{
3551 int state; 3932 int state;
3552 3933
3553 if (mode == 's') 3934 if (mode == 's')
3554 { 3935 {
3555 SavedModes |= (PrivateModes & bit); 3936 SavedModes |= (priv_modes & bit);
3556 return -1; 3937 return -1;
3557 } 3938 }
3558 else 3939 else
3559 { 3940 {
3560 if (mode == 'r') 3941 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3942 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3943 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3944 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3945 PrivMode (state, bit);
3565 } 3946 }
3566 3947
3567 return state; 3948 return state;
3568} 3949}
… …
3586 { 3, PrivMode_132 }, 3967 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3968 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3969 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3970 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3971 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3973 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3974#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3975 { menuBar_esc, PrivMode_menuBar },
3594#endif 3976#endif
3977 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3979#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3980 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3981#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3982 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3983 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3984 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3985 // 45 margin bell NYI
3605 // 46 start logging 3986 // 46 start logging
… …
3646 4027
3647 /* extra handling for values with state unkept */ 4028 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4029 switch (arg[i])
3649 { 4030 {
3650 case 1048: /* alternative cursor save */ 4031 case 1048: /* alternative cursor save */
4032 case 1049:
3651 if (Options & Opt_secondaryScreen) 4033 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 4034 if (mode == 0)
3653 scr_cursor (RESTORE); 4035 scr_cursor (RESTORE);
3654 else if (mode == 1) 4036 else if (mode == 1)
3655 scr_cursor (SAVE); 4037 scr_cursor (SAVE);
3656 break; 4038 break;
… …
3667 * within VT52 mode 4049 * within VT52 mode
3668 */ 4050 */
3669 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
3670 break; 4052 break;
3671 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
3674 break; 4056 break;
3675 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
3676 if (state) 4058 if (state)
3677 Options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
3678 else 4060 else
3679 Options |= Opt_jumpScroll; 4061 options |= Opt_jumpScroll;
3680 break; 4062 break;
3681 case 5: /* reverse video */ 4063 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4064 scr_rvideo_mode (state);
3683 break; 4065 break;
3684 case 6: /* relative/absolute origins */ 4066 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4070 scr_autowrap (state);
3689 break; 4071 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4072 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4073 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4074 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4075 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4076 break;
3695#ifdef menuBar_esc 4077#ifdef menuBar_esc
3696 case menuBar_esc: 4078 case menuBar_esc:
3697#ifdef MENUBAR 4079#ifdef MENUBAR
3698 map_menuBar (state); 4080 map_menuBar (state);
… …
3718 break; 4100 break;
3719 /* case 66: - application key pad */ 4101 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4102 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4103 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4104 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4105 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4106 break;
3725#if 0 4107#if 0
3726 case 1001: 4108 case 1001:
3727 break; /* X11 mouse highlighting */ 4109 break; /* X11 mouse highlighting */
3728#endif 4110#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4111 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4112 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4113 options &= ~Opt_scrollTtyOutput;
3732 else 4114 else
3733 Options |= Opt_scrollTtyOutput; 4115 options |= Opt_scrollTtyOutput;
3734 break; 4116 break;
3735 case 1011: /* scroll to bottom on key press */ 4117 case 1011: /* scroll to bottom on key press */
3736 if (state) 4118 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4119 options |= Opt_scrollTtyKeypress;
3738 else 4120 else
3739 Options &= ~Opt_scrollTtyKeypress; 4121 options &= ~Opt_scrollTtyKeypress;
3740 break; 4122 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4123 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4124 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4125 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4126 scr_erase_screen (2);
3745 scr_change_screen (state); 4127 scr_change_screen (state);
3746 break; 4128 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4129 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4130 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4131 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4132 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4133 scr_erase_screen (2);
3752 break; 4134 break;
3753 default: 4135 default:
3754 break; 4136 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4162 rendset = 0, rendstyle = ~RS_None;
3781 break; 4163 break;
3782 case 1: 4164 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4165 rendset = 1, rendstyle = RS_Bold;
3784 break; 4166 break;
3785 //case 2: // faint or second colour 4167 //case 2: // low intensity
4168 case 3:
4169 rendset = 1, rendstyle = RS_Italic;
4170 break;
3786 case 4: 4171 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4172 rendset = 1, rendstyle = RS_Uline;
3788 break; 4173 break;
3789 case 5: // slowly blinking 4174 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4175 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4187 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4188 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4189 //...
3805 //case 19: // ninth alt font 4190 //case 19: // ninth alt font
3806 //case 20: // gothic 4191 //case 20: // gothic
3807 case 21: // disable bold, faint 4192 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4193 rendset = 0, rendstyle = RS_Bold;
3809 break; 4194 break;
3810 case 22: 4195 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4196 rendset = 0, rendstyle = RS_Bold;
3812 break; 4197 break;
3813 //case 23: disable italic 4198 case 23: // disable italic
4199 rendset = 0, rendstyle = RS_Italic;
4200 break;
3814 case 24: 4201 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4202 rendset = 0, rendstyle = RS_Uline;
3816 break; 4203 break;
3817 case 25: 4204 case 25:
4205 rendset = 0, rendstyle = RS_Blink;
4206 break;
4207 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4208 rendset = 0, rendstyle = RS_Blink;
3819 break; 4209 break;
3820 case 27: 4210 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4211 rendset = 0, rendstyle = RS_RVid;
3822 break; 4212 break;
… …
3840 case 35: 4230 case 35:
3841 case 36: 4231 case 36:
3842 case 37: 4232 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4233 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4234 break;
3845#ifdef TTY_256COLOR 4235 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4236 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4237 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4238 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4239 i += 2;
3851 } 4240 }
3852 break; 4241 break;
3853#endif
3854 case 39: /* default fg */ 4242 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4243 scr_color (Color_fg, Color_fg);
3856 break; 4244 break;
3857 4245
3858 case 40: 4246 case 40:
… …
3863 case 45: 4251 case 45:
3864 case 46: 4252 case 46:
3865 case 47: 4253 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4254 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4255 break;
3868#ifdef TTY_256COLOR 4256 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4257 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4258 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4259 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4260 i += 2;
3874 } 4261 }
3875 break; 4262 break;
3876#endif
3877 case 49: /* default bg */ 4263 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4264 scr_color (Color_bg, Color_bg);
3879 break; 4265 break;
4266
4267 //case 50: // not variable spacing
3880 4268
3881#ifndef NO_BRIGHTCOLOR 4269#ifndef NO_BRIGHTCOLOR
3882 case 90: 4270 case 90:
3883 case 91: /* set bright fg color */ 4271 case 91: /* set bright fg color */
3884 case 92: 4272 case 92:
3885 case 93: 4273 case 93:
3886 case 94: 4274 case 94:
3887 case 95: 4275 case 95:
3888 case 96: 4276 case 96:
3889 case 97: 4277 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4278 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4279 break;
3893 case 100: 4280 case 100:
3894 case 101: /* set bright bg color */ 4281 case 101: /* set bright bg color */
3895 case 102: 4282 case 102:
3896 case 103: 4283 case 103:
3897 case 104: 4284 case 104:
3898 case 105: 4285 case 105:
3899 case 106: 4286 case 106:
3900 case 107: 4287 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4289 break;
3904#endif 4290#endif
3905 4291
3906 } 4292 }
3907 } 4293 }
… …
3914{ 4300{
3915 unicode_t ch, cmd = cmd_getc (); 4301 unicode_t ch, cmd = cmd_getc ();
3916 4302
3917 if (cmd == 'Q') 4303 if (cmd == 'Q')
3918 { /* query graphics */ 4304 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4305 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4306 return;
3921 } 4307 }
3922 /* swallow other graphics sequences until terminating ':' */ 4308 /* swallow other graphics sequences until terminating ':' */
3923 do 4309 do
3924 ch = cmd_getc (); 4310 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4325 unsigned char buf[256];
3940 4326
3941 va_start (arg_ptr, fmt); 4327 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4329 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4330 tt_write (buf, strlen (buf));
3945} 4331}
3946 4332
3947/* ---------------------------------------------------------------------- */ 4333/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4334/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4335 * or generated by us in response to a query ESC sequence.
3950 */ 4336 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338
3951void 4339void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4340rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4341{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4342 if (v_buflen == 0)
4343 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4345
3956 if (len) 4346 if ((unsigned int)written == len)
4347 return;
4348
4349 data += written;
4350 len -= written;
3957 { 4351 }
4352
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4354
4355 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len;
4357
4358 pty_ev.set (EVENT_READ | EVENT_WRITE);
4359}
4360
4361void rxvt_term::pty_write ()
4362{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364
4365 if (written > 0)
4366 {
4367 v_buflen -= written;
4368
3958 if (v_buflen == 0) 4369 if (v_buflen == 0)
3959 { 4370 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4371 free (v_buffer);
3987 v_buffer = 0; 4372 v_buffer = 0;
3988 v_buflen = 0; 4373 v_buflen = 0;
3989 4374
3990 pty_ev.set (EVENT_READ); 4375 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4376 return;
4003 } 4377 }
4378
4379 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4380 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 pty_ev.set (EVENT_READ);
4005} 4383}
4006 4384
4007/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4008 4386

Diff Legend

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