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

Diff Legend

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