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.216 by root, Tue Dec 27 01:25:42 2005 UTC

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

Diff Legend

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