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.209 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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