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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original 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 XK_KP_Space, 0x2422,
123 0,
124};
125
126void
127rxvt_term::iso14755_54 (int x, int y)
128{
129 x = Pixel2Col (x);
130 y = Pixel2Row (y);
131
132 if (x < 0 || x >= TermWin.ncol
133 || y < 0 || y >= TermWin.nrow)
134 return;
135
136 for (;;)
137 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
139
140 if (t != NOCHAR || !x)
141 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54;
145 break;
146 }
147
148 x--;
149 }
150
151}
152#endif
153
154#if ENABLE_OVERLAY
155void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
157{
158 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2;
161 int len;
162
163#if ENABLE_COMBINING
164 if (IS_COMPOSE (ch))
165 {
166 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr);
169 }
170 else
171#endif
172 {
173 ch2 = ch;
174
175 alloc = 0;
176 chr = &ch2;
177 len = 1;
178 }
179
180 int width = strlen (f->name);
181
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
183
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185
186 for (int y = 0; y < len; y++)
187 {
188 char buf[9];
189
190 ch = *chr++;
191
192 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '=');
195#if !UNICODE3
196 if (ch >= 0x10000)
197 ch = 0xfffd;
198#endif
199 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r);
201 }
202
203 scr_overlay_set (0, len, f->name);
204
205#if ENABLE_COMBINING
206 if (alloc)
207 delete [] alloc;
208#endif
209}
210#endif
211
212void
213rxvt_term::commit_iso14755 ()
214{
215 wchar_t ch[2];
216
217 ch[0] = iso14755buf & ISO_14755_MASK;
218 ch[1] = 0;
219
220 if (iso14755buf & ISO_14755_51)
221 {
222 char mb[16];
223 int len;
224
225 // allow verbatim 0-bytes and control-bytes to be entered
226 if (ch[0] >= 0x20)
227 len = wcstombs (mb, ch, 16);
228 else
229 {
230 mb[0] = ch[0];
231 len = 1;
232 }
233
234 if (len > 0)
235 tt_write ((unsigned char *)mb, len);
236 else
237 scr_bell ();
238 }
239
240 iso14755buf = 0;
241}
242
243int
244rxvt_term::hex_keyval (XKeyEvent &ev)
245{
246 // check wether this event corresponds to a hex digit
247 // if the modifiers had not been pressed.
248 for (int index = 0; index < 8; index++)
249 {
250 KeySym k = XLookupKeysym (&ev, index);
251
252 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
253 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
254 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
255 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
256 }
257
258 return -1;
259}
260#endif
61 261
62/*{{{ Convert the keypress event into a string */ 262/*{{{ Convert the keypress event into a string */
63void 263void
64rxvt_term::lookup_key (XKeyEvent &ev) 264rxvt_term::lookup_key (XKeyEvent &ev)
65{ 265{
… …
147 valid_keysym = keysym != NoSymbol; 347 valid_keysym = keysym != NoSymbol;
148 } 348 }
149 349
150 if (valid_keysym) 350 if (valid_keysym)
151 { 351 {
352#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state))
354 return;
355#endif
356
152 if (TermWin.saveLines) 357 if (TermWin.saveLines)
153 { 358 {
154#ifdef UNSHIFTED_SCROLLKEYS 359#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 360 if (!ctrl && !meta)
156 {
157#else 361#else
158 if (IS_SCROLL_MOD) 362 if (IS_SCROLL_MOD)
363#endif
159 { 364 {
160#endif
161 int lnsppg; 365 int lnsppg;
162 366
163#ifdef PAGING_CONTEXT_LINES 367#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 369#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 418 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 419 {
216 keysym += (XK_F11 - XK_F1); 420 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 421 shft = 0; /* turn off Shift */
218 } 422 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 423 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 424 {
221 switch (keysym) 425 switch (keysym)
222 { 426 {
223 /* normal XTerm key bindings */ 427 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 428 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 429 selection_request (ev.time, 0, 0);
226 return; 430 return;
431#if TODO
227 /* rxvt extras */ 432 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 433 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 434 change_font (FONT_UP);
230 return; 435 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 436 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 437 change_font (FONT_DN);
233 return; 438 return;
439#endif
234 } 440 }
235 } 441 }
236 } 442 }
237#ifdef PRINTPIPE 443
238 if (keysym == XK_Print) 444#if ENABLE_FRILLS || ISO_14755
239 { 445 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 446 if (shft && ctrl)
241 return;
242 } 447 {
243#endif 448 int hv;
244 449
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 450 if (iso14755buf & ISO_14755_51
246 { 451 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 452 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 453 {
250 unsigned int l; 454 commit_iso14755 ();
251 const unsigned char *kbuf0; 455 iso14755buf = ISO_14755_51;
252 456# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 457 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 458# endif
261 ) 459 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 460 }
266 461 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 462 {
463 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
464 | hv | ISO_14755_51;
465# if ISO_14755
466 iso14755_51 (iso14755buf & ISO_14755_MASK);
467# endif
268 return; 468 return;
269 } 469 }
270 else 470 else
471 {
472# if ENABLE_OVERLAY
473 scr_overlay_off ();
271#endif 474# endif
475 iso14755buf = 0;
476 }
477 }
478 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
479 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
480 if (!(iso14755buf & ISO_14755_STARTED))
481 {
482 iso14755buf |= ISO_14755_STARTED;
483# if ENABLE_OVERLAY
484 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
485 scr_overlay_set (0, 0, "ISO 14755 mode");
486# endif
487 }
488#endif
489
490#ifdef PRINTPIPE
491 if (keysym == XK_Print)
492 {
493 scr_printscreen (ctrl | shft);
494 return;
495 }
496#endif
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
272 { 500 {
273 newlen = 1; 501 newlen = 1;
274 switch (keysym) 502 switch (keysym)
275 { 503 {
276#ifndef NO_BACKSPACE_KEY 504#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 505 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 506 if (priv_modes & PrivMode_HaveBackSpace)
279 { 507 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 508 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 509 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 510 kbuf[1] = '\0';
283 } 511 }
284 else 512 else
285 STRCPY (kbuf, key_backspace); 513 strcpy (kbuf, key_backspace);
286 break; 514 break;
287#endif 515#endif
288#ifndef NO_DELETE_KEY 516#ifndef NO_DELETE_KEY
289 case XK_Delete: 517 case XK_Delete:
290 STRCPY (kbuf, key_delete); 518 strcpy (kbuf, key_delete);
291 break; 519 break;
292#endif 520#endif
293 case XK_Tab: 521 case XK_Tab:
294 if (shft) 522 if (shft)
295 STRCPY (kbuf, "\033[Z"); 523 strcpy (kbuf, "\033[Z");
296 else 524 else
297 { 525 {
298#ifdef CTRL_TAB_MAKES_META 526#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 527 if (ctrl)
300 meta = 1; 528 meta = 1;
… …
306 newlen = 0; 534 newlen = 0;
307 } 535 }
308 break; 536 break;
309 537
310#ifdef XK_KP_Left 538#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 539 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 540 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 541 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 542 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 544 {
317 STRCPY (kbuf, "\033OZ"); 545 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 546 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 547 break;
320 } 548 }
321 else 549 else
322 /* translate to std. cursor key */ 550 /* translate to std. cursor key */
… …
325#endif 553#endif
326 case XK_Up: /* "\033[A" */ 554 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 555 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 556 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 557 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 558 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 559 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 560 /* do Shift first */
333 if (shft) 561 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 562 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 563 else if (ctrl)
336 { 564 {
337 kbuf[1] = 'O'; 565 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 566 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 567 }
340 else if (PrivateModes & PrivMode_aplCUR) 568 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 569 kbuf[1] = 'O';
342 break; 570 break;
343 571
344#ifndef UNSHIFTED_SCROLLKEYS 572#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 573# ifdef XK_KP_Prior
346 case XK_KP_Prior: 574 case XK_KP_Prior:
347 /* allow shift to override */ 575 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 576 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 577 {
350 STRCPY (kbuf, "\033Oy"); 578 strcpy (kbuf, "\033Oy");
351 break; 579 break;
352 } 580 }
353 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
354# endif 582# endif
355 case XK_Prior: 583 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 584 strcpy (kbuf, "\033[5~");
357 break; 585 break;
358# ifdef XK_KP_Next 586# ifdef XK_KP_Next
359 case XK_KP_Next: 587 case XK_KP_Next:
360 /* allow shift to override */ 588 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 590 {
363 STRCPY (kbuf, "\033Os"); 591 strcpy (kbuf, "\033Os");
364 break; 592 break;
365 } 593 }
366 /* FALLTHROUGH */ 594 /* FALLTHROUGH */
367# endif 595# endif
368 case XK_Next: 596 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 597 strcpy (kbuf, "\033[6~");
370 break; 598 break;
371#endif 599#endif
372 case XK_KP_Enter: 600 case XK_KP_Enter:
373 /* allow shift to override */ 601 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 602 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 603 {
376 STRCPY (kbuf, "\033OM"); 604 strcpy (kbuf, "\033OM");
605 break;
606 }
607
608 /* FALLTHROUGH */
609
610 case XK_Return:
611 if (priv_modes & PrivMode_LFNL)
612 {
613 kbuf[0] = '\015';
614 kbuf[1] = '\012';
615 kbuf[2] = '\0';
377 } 616 }
378 else 617 else
379 { 618 {
380 kbuf[0] = '\r'; 619 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 620 kbuf[1] = '\0';
382 } 621 }
383 break; 622 break;
384 623
385#ifdef XK_KP_Begin 624#ifdef XK_KP_Begin
386 case XK_KP_Begin: 625 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 626 strcpy (kbuf, "\033Ou");
388 break; 627 break;
389 628
390 case XK_KP_Insert: 629 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 630 strcpy (kbuf, "\033Op");
392 break; 631 break;
393 632
394 case XK_KP_Delete: 633 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 634 strcpy (kbuf, "\033On");
396 break; 635 break;
397#endif 636#endif
398 case XK_KP_F1: /* "\033OP" */ 637 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 638 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 639 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 640 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 641 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 642 kbuf[2] += (keysym - XK_KP_F1);
404 break; 643 break;
405 644
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 645 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 646 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 657 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 658 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 659 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 660 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 661 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 662 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 663 {
425 STRCPY (kbuf, "\033Oj"); 664 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 665 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 666 }
428 else 667 else
429 { 668 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 669 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
432 } 671 }
433 break; 672 break;
434 673
435 case XK_Find: 674 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 675 strcpy (kbuf, "\033[1~");
437 break; 676 break;
438 case XK_Insert: 677 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 678 strcpy (kbuf, "\033[2~");
440 break; 679 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 680#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 681 case DXK_Remove:
443 /* FALLTHROUGH */ 682 /* FALLTHROUGH */
444#endif 683#endif
445 case XK_Execute: 684 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 685 strcpy (kbuf, "\033[3~");
447 break; 686 break;
448 case XK_Select: 687 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 688 strcpy (kbuf, "\033[4~");
450 break; 689 break;
451#ifdef XK_KP_End 690#ifdef XK_KP_End
452 case XK_KP_End: 691 case XK_KP_End:
453 /* allow shift to override */ 692 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 693 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 694 {
456 STRCPY (kbuf, "\033Oq"); 695 strcpy (kbuf, "\033Oq");
457 break; 696 break;
458 } 697 }
459 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
460#endif 699#endif
461 case XK_End: 700 case XK_End:
462 STRCPY (kbuf, KS_END); 701 strcpy (kbuf, KS_END);
463 break; 702 break;
464#ifdef XK_KP_Home 703#ifdef XK_KP_Home
465 case XK_KP_Home: 704 case XK_KP_Home:
466 /* allow shift to override */ 705 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 707 {
469 STRCPY (kbuf, "\033Ow"); 708 strcpy (kbuf, "\033Ow");
470 break; 709 break;
471 } 710 }
472 /* FALLTHROUGH */ 711 /* FALLTHROUGH */
473#endif 712#endif
474 case XK_Home: 713 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 714 strcpy (kbuf, KS_HOME);
476 break; 715 break;
477 716
478#define FKEY(n, fkey) \ 717#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 718 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 719
… …
532#undef FKEY 771#undef FKEY
533 default: 772 default:
534 newlen = 0; 773 newlen = 0;
535 break; 774 break;
536 } 775 }
776
537 if (newlen) 777 if (newlen)
538 len = STRLEN (kbuf); 778 len = strlen (kbuf);
539 } 779 }
540 780
541 /* 781 /*
542 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
543 */ 783 */
… …
550 else if (ctrl && keysym == XK_minus) 790 else if (ctrl && keysym == XK_minus)
551 { 791 {
552 len = 1; 792 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
555 else 800 else
556 { 801 {
557#ifdef META8_OPTION 802#ifdef META8_OPTION
558 /* set 8-bit on */ 803 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 804 if (meta && (meta_char == 0x80))
… …
571 } 816 }
572 817
573 if (len <= 0) 818 if (len <= 0)
574 return; /* not mapped */ 819 return; /* not mapped */
575 820
576 if (Options & Opt_scrollTtyKeypress) 821 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 822 if (TermWin.view_start)
578 { 823 {
579 TermWin.view_start = 0; 824 TermWin.view_start = 0;
580 want_refresh = 1; 825 want_refresh = 1;
581 } 826 }
… …
617#endif /* DEBUG_CMD */ 862#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 863 tt_write (kbuf, (unsigned int)len);
619} 864}
620/*}}} */ 865/*}}} */
621 866
622#if (MENUBAR_MAX) 867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 869/* attempt to `write' count to the input buffer */
625unsigned int 870unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 871rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 872{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 875 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 877
633 if (n > 0 && s < count) 878 if (n > 0 && s < count)
634 { 879 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 880 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 882 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 883 cmdbuf_endp -= n;
639 s += n; 884 s += n;
640 } 885 }
… …
650 895
651 cmd_parse (); 896 cmd_parse ();
652 897
653 return 0; 898 return 0;
654} 899}
655#endif /* MENUBAR_MAX */ 900#endif
656 901
657void 902void
658rxvt_term::flush () 903rxvt_term::flush ()
659{ 904{
905 flush_ev.stop ();
906
660#ifdef TRANSPARENT 907#ifdef TRANSPARENT
661 if (want_full_refresh) 908 if (want_full_refresh)
662 { 909 {
663 want_full_refresh = 0; 910 want_full_refresh = 0;
664 scr_clear (); 911 scr_clear ();
665 scr_touch (false); 912 scr_touch (false);
666 want_refresh = 1;
667 } 913 }
668#endif 914#endif
669 915
670 if (want_refresh) 916 if (want_refresh)
671 { 917 {
672 scr_refresh (refresh_type); 918 scr_refresh (refresh_type);
673 scrollbar_show (1); 919 scrollbar_show (1);
674#ifdef USE_XIM 920#ifdef USE_XIM
675 IMSendSpot (); 921 IMSendSpot ();
676#endif 922#endif
677
678 } 923 }
679 924
680 display->flush (); 925 display->flush ();
681} 926}
682 927
… …
684rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
685{ 930{
686 SET_R (this); 931 SET_R (this);
687 SET_LOCALE (locale); 932 SET_LOCALE (locale);
688 933
934 display->flush ();
935
936 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01);
938}
939
940void
941rxvt_term::flush_cb (time_watcher &w)
942{
943 SET_R (this);
944 SET_LOCALE (locale);
945
946 refresh_limit = 1;
947 refresh_count = 0;
689 flush (); 948 flush ();
690} 949}
691 950
692#ifdef CURSOR_BLINK 951#ifdef CURSOR_BLINK
693void 952void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 970 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 971 }
713} 972}
714#endif 973#endif
715 974
975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
976void
977rxvt_term::cont_scroll_cb (time_watcher &w)
978{
979 if ((scrollbar_isUp() || scrollbar_isDn()) &&
980 scr_page (scrollbar_isUp() ? UP : DN, 1))
981 {
982 refresh_type |= SMOOTH_REFRESH;
983 want_refresh = 1;
984 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
985 }
986}
987#endif
988
989#ifdef SELECTION_SCROLLING
990void
991rxvt_term::sel_scroll_cb (time_watcher &w)
992{
993 if (scr_page (scroll_selection_dir, scroll_selection_lines))
994 {
995 selection_extend (selection_save_x, selection_save_y, selection_save_state);
996 refresh_type |= SMOOTH_REFRESH;
997 want_refresh = 1;
998 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
999 }
1000}
1001#endif
1002
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004void
1005rxvt_term::slip_wheel_cb (time_watcher &w)
1006{
1007 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed))
1010 {
1011 if (TermWin.view_start == TermWin.nscrolled ||
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0;
1014
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 }
1019}
1020#endif
1021
716bool 1022bool
717rxvt_term::pty_fill () 1023rxvt_term::pty_fill ()
718{ 1024{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026
1027 if (CBUFSIZ == n)
1028 {
1029 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1030 n = 0;
1031 }
720 1032
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
724 1036
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1038
727 if (n > 0) 1039 if (n > 0)
728 { 1040 {
729 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
730 return true; 1042 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1052{
741 SET_R (this); 1053 SET_R (this);
742 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
743 1055
1056 if (revents & EVENT_READ)
1057 // loop, but don't allow a single term to monopolize us
1058 while (pty_fill ())
1059 if (cmd_parse ())
1060 break;
1061
744 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1063 pty_write ();
746 else if (revents & EVENT_READ) 1064}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1065
760 if (cmd_parse ()) 1066void
761 break; 1067rxvt_term::pointer_unblank ()
762 } 1068{
763 } 1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1070 recolour_cursor ();
1071
1072#ifdef POINTER_BLANK
1073 hidden_pointer = 0;
1074
1075 if (options & Opt_pointerBlank)
1076 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif
764} 1078}
765 1079
766#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
767void 1081void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
781{ 1083{
782 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
783 return; 1085 return;
784 1086
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
786 XFlush (display->display); 1088 XFlush (display->display);
787 1089
788 hidden_pointer = 1; 1090 hidden_pointer = 1;
789} 1091}
790 1092
… …
807 x = ev.x; 1109 x = ev.x;
808 y = ev.y; 1110 y = ev.y;
809 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
810 1112
811 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1114 button_number = 3;
814 }
815 else 1115 else
816 { 1116 {
817 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1119 if (button_number >= 3)
820 button_number += (64 - 3); 1120 button_number += (64 - 3);
821 } 1121 }
822 1122
823 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
824 { 1124 {
825 /* 1125 /*
826 * do not report ButtonRelease 1126 * do not report ButtonRelease
827 * no state info allowed 1127 * no state info allowed
828 */ 1128 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1147#endif
848
849 } 1148 }
850 1149
851#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1152 if (key_state & 16)
854 fputc ('C', stderr); 1153 fputc ('C', stderr);
855 if (key_state & 4) 1154 if (key_state & 4)
856 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1159 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1161 button_number,
863 x + 1, 1162 x + 1,
864 y + 1); 1163 y + 1);
865#else 1164#endif
1165
866 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
868 (32 + x + 1), 1168 (32 + x + 1),
869 (32 + y + 1)); 1169 (32 + y + 1));
870#endif
871} 1170}
872 1171
873#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
874void 1173void
875rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
882 1181
883/*{{{ process an X event */ 1182/*{{{ process an X event */
884void 1183void
885rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
886{ 1185{
1186 dDisp;
1187
887 SET_R (this); 1188 SET_R (this);
888 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
889 1190
890#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1193 {
893 if (hidden_cursor) 1194 if (hidden_cursor)
894 { 1195 {
895 hidden_cursor = 0; 1196 hidden_cursor = 0;
896 want_refresh = 1; 1197 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1201 }
901#endif 1202#endif
902 1203
903#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1206 {
906 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1210 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1214 pointer_blank ();
914 } 1215 }
915#endif 1216#endif
916 1217
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1220 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1221
975 switch (ev.type) 1222 switch (ev.type)
976 { 1223 {
977 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
978 lookup_key (ev.xkey); 1228 lookup_key (ev.xkey);
1229
1230 break;
1231
1232 case KeyRelease:
1233 {
1234#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1235 KeySym ks;
1236
1237 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1238#endif
1239
1240#if ENABLE_FRILLS || ISO_14755
1241 // ISO 14755 support
1242 if (iso14755buf)
1243 if (iso14755buf & ISO_14755_52)
1244 {
1245# if ENABLE_OVERLAY
1246 scr_overlay_off ();
1247# endif
1248# if ISO_14755
1249 // iso14755 part 5.2 handling: release time
1250 // first: controls
1251 if ((ev.xkey.state & ControlMask)
1252 && ((ks >= 0x40 && ks <= 0x5f)
1253 || (ks >= 0x61 && ks <= 0x7f)))
1254 {
1255 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1256 commit_iso14755 ();
1257 return; // case-break;
1258 }
1259
1260 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1261 if (i[0] == ks)
1262 {
1263 iso14755buf = ISO_14755_51 | i[1];
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 scr_bell ();
1269# endif
1270 iso14755buf = 0;
979 break; 1271 break;
1272 }
1273 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1274 {
1275# if ENABLE_OVERLAY
1276 scr_overlay_off ();
1277# endif
1278 if (iso14755buf & ISO_14755_51)
1279 commit_iso14755 ();
1280#if ISO_14755
1281 else if (iso14755buf & ISO_14755_STARTED)
1282 {
1283 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1284
1285 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1286 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1287 }
1288# endif
1289 else
1290 iso14755buf = 0;
1291 }
1292#endif
980 1293
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1295 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
986 else 1299#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1300 break;
995 } 1301 }
996#endif
997 1302
998 case ButtonPress: 1303 case ButtonPress:
999 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
1000 break; 1305 break;
1001 1306
… …
1013 && (ev.xclient.data.l[0] == DndFile 1318 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1319 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1320 || ev.xclient.data.l[0] == DndLink))
1016 { 1321 {
1017 /* Get Dnd data */ 1322 /* Get Dnd data */
1018 Atom ActualType; 1323 Atom ActualType;
1019 int ActualFormat; 1324 int ActualFormat;
1020 unsigned char *data; 1325 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1022 1327
1023 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1330 0L, 1000000L,
1026 False, AnyPropertyType, 1331 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1029 &data); 1334 &data);
1030 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1336 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1339 }
1037#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1038 break; 1341 break;
1039 1342
1040 case MappingNotify: 1343 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1344 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1345 break;
1043 1346
1044 /* 1347 /*
1045 * XXX: this is not the _current_ arrangement 1348 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1349 * Here's my conclusion:
… …
1071 { 1374 {
1072 TermWin.focus = 1; 1375 TermWin.focus = 1;
1073 want_refresh = 1; 1376 want_refresh = 1;
1074#ifdef USE_XIM 1377#ifdef USE_XIM
1075 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1077#endif 1383#endif
1078#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1081#endif 1394#endif
1082 1395
1083 } 1396 }
1084 break; 1397 break;
1085 1398
1086 case FocusOut: 1399 case FocusOut:
1087 if (TermWin.focus) 1400 if (TermWin.focus)
1088 { 1401 {
1089 TermWin.focus = 0; 1402 TermWin.focus = 0;
1090 want_refresh = 1; 1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1091#ifdef USE_XIM 1411#ifdef USE_XIM
1092 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1094#endif 1414#endif
1095#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1418 hidden_cursor = 0;
1099#endif 1419#endif
1100 1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1101 } 1427 }
1102 break; 1428 break;
1103 1429
1104 case ConfigureNotify: 1430 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1110 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1440 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1442
1117 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1118 { 1444 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1445 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1121 } 1447 }
1122#ifdef DEBUG_SIZE 1448
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1451 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1452#endif
1136 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1137 break; 1461 break;
1138 1462
1139 case SelectionClear: 1463 case SelectionClear:
1140 selection_clear (); 1464 selection_clear ();
1141 break; 1465 break;
1142 1466
1143 case SelectionNotify: 1467 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1470 break;
1148 1471
1149 case SelectionRequest: 1472 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1151 break; 1474 break;
… …
1172 1495
1173 case GraphicsExpose: 1496 case GraphicsExpose:
1174 case Expose: 1497 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1176 { 1499 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1500 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1504
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1510
1185 // ev.xexpose.width, TermWin.height, False); 1511 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1512 }
1189 else 1513 else
1190 { 1514 {
1191 XEvent unused_event; 1515 XEvent unused_event;
1192 1516
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1518 ;
1195 &unused_event)) ; 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 ;
1197 GraphicsExpose, 1521
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1200 { 1523 {
1201 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1202 scrollbar_show (0); 1525 scrollbar_show (0);
1203 } 1526 }
1204#ifdef MENUBAR 1527#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1529 menubar_expose ();
1207#endif 1530#endif
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0])
1534 XClearWindow (disp, ev.xany.window);
1535#endif
1208 } 1536 }
1209 break; 1537 break;
1210 1538
1211 case MotionNotify: 1539 case MotionNotify:
1212#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
… …
1218 { 1546 {
1219 menubar_control (ev.xbutton); 1547 menubar_control (ev.xbutton);
1220 break; 1548 break;
1221 } 1549 }
1222#endif 1550#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1552 break;
1225 1553
1226 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1227 { 1555 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1557 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1231 ; 1559 ;
1232 1560
1233 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1234 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1565 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1569 {
1242#endif 1570#endif
1571#if ISO_14755
1572 // 5.4
1573 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1574 {
1575 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1576 break;
1577 }
1578#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1245#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1585 {
1249 int dist; 1586 int dist;
1250 1587
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1255 */ 1590 */
1256 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1593
1259 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1261 */ 1596 */
1262 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1600
1267 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1603 {
1270 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1606 }
1273 else 1607 else
1274 { 1608 {
1275 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1611 }
1612
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1281 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1283 } 1618 }
1284 else 1619 else
1285 { 1620 {
1286 /* we are within the text window, so we 1621 /* we are within the text window, so we
1287 * shouldn't be scrolling 1622 * shouldn't be scrolling
1288 */ 1623 */
1289 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1290 } 1626 }
1291#endif 1627#endif
1292#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1293
1294 } 1629 }
1295#endif 1630#endif
1296
1297 } 1631 }
1298 } 1632 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1634 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1303 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1304 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1643 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1645 scrollbar_size ());
1310 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1313 } 1649 }
1314 break; 1650 break;
1315 } 1651 }
1316} 1652}
1317 1653
1654#if TRANSPARENT
1318void 1655void
1319rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1657{
1321 SET_R (this); 1658 SET_R (this);
1322 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1323 1660
1324 switch (ev.type) 1661 switch (ev.type)
1325 { 1662 {
1326 case PropertyNotify: 1663 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1664 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1665 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1666 * use the property to determine the pixmap. We use it later on.
1339 */ 1667 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1670 return;
1345 }
1346 1671
1347 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1348 case ReparentNotify: 1673 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1351 break; 1676 break;
1352#endif
1353 } 1677 }
1354} 1678}
1679#endif
1355 1680
1356void 1681void
1357rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1358{ 1683{
1359 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1360 1685
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1687 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1364 /* 1690 /*
1365 * VT window processing of button press 1691 * VT window processing of button press
1366 */ 1692 */
1367 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1368 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1370 if (reportmode) 1706 if (reportmode)
1371 { 1707 {
1372 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1403 } 1739 }
1404 else 1740 else
1405 { 1741 {
1406 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1408 switch (ev.button) 1745 switch (ev.button)
1409 { 1746 {
1410 case Button1: 1747 case Button1:
1748 /* allow meta + click to select rectangular areas */
1749 /* should be done in screen.C */
1750#if ENABLE_FRILLS
1751 selection.rect = !!(ev.state & ModMetaMask);
1752#else
1753 selection.rect = false;
1754#endif
1755
1411 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1758 {
1414 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1416 else 1761 else
1417 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1777 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1435 else 1780 else
1436 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1437 MEvent.button = Button3; 1783 MEvent.button = Button3;
1438 break; 1784 break;
1439 } 1785 }
1440 } 1786 }
1787
1441 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1442 return; 1789 return;
1443 } 1790 }
1444 1791
1445 /* 1792 /*
… …
1511 upordown = 1; /* down */ 1858 upordown = 1; /* down */
1512 } 1859 }
1513 if (upordown) 1860 if (upordown)
1514 { 1861 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1864#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1865 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1866 {
1520 if (upordown < 0) 1867 if (upordown < 0)
1521 scrollBar.setUp (); 1868 scrollBar.setUp ();
… …
1537 break; 1884 break;
1538 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1887 break;
1541 } 1888 }
1889
1542 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1894
1547 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1548 break; 1896 break;
1549 1897
1550 case Button1: 1898 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1924 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1926 / scrollbar_size ()));
1579 } 1927 }
1928
1580 break; 1929 break;
1581 } 1930 }
1582 } 1931 }
1583 return; 1932 return;
1584 } 1933 }
… …
1596{ 1945{
1597 int reportmode = 0; 1946 int reportmode = 0;
1598 1947
1599 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1949 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1951
1603 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1604 { 1953 {
1605 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1606 scrollbar_show (0); 1955 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1958#endif
1610
1611 } 1959 }
1960
1612#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop();
1614#endif 1964#endif
1965
1615 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1616 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1617 if (reportmode) 1973 if (reportmode)
1618 { 1974 {
1619 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1636 mouse_report (ev); 1992 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 1994 return;
1639 } 1995 }
1996
1640 /* 1997 /*
1641 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 1999 * when overriding mouse reporting
1643 */ 2000 */
1644 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2002 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1648 2005
1649 switch (ev.button) 2006 switch (ev.button)
… …
1660 case Button5: 2017 case Button5:
1661 { 2018 {
1662 int i; 2019 int i;
1663 page_dirn v; 2020 page_dirn v;
1664 2021
1665 v = (ev.button == Button4) ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
2023
1666 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1667 i = 1; 2025 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2026 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1670 else 2028 else
1671 i = 5; 2029 i = 5;
2030
1672# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2032 if (ev.state & ControlMask)
1674 { 2033 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2034 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2037
2038 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040
2041 slip_wheel_ev.start ();
1677 } 2042 }
2043 else
2044 {
1678# endif 2045# endif
1679# ifdef JUMP_MOUSE_WHEEL 2046# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2047 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2048 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2049 scrollbar_show (1);
2050# else
2051 while (i--)
2052 {
2053 scr_page (v, 1);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1);
2056 }
2057# endif
2058# ifdef MOUSE_SLIP_WHEELING
1689 } 2059 }
1690# endif 2060#endif
1691
1692 } 2061 }
1693 break; 2062 break;
1694#endif 2063#endif
1695
1696 } 2064 }
1697 } 2065 }
1698#ifdef MENUBAR 2066#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2067 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2068 menubar_control (ev);
1701#endif 2069#endif
1702} 2070}
1703 2071
1704#ifdef TRANSPARENT 2072#ifdef TRANSPARENT
1705#if TINTING 2073#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2074/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2075
1709static void 2076typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2077
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2078void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2079{
1717 /* No saturation */ 2080 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2081 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2082 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2083 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2084 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2085 int i;
1721 2086
1722 b = ((uint16_t *) ptr)[x]; 2087 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2088
1724 g = (b & 0x3e0) * gm; 2089 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2090
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2091 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2092 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2093 mask_g = visual->green_mask;
1729 } 2094 mask_b = visual->blue_mask;
1730 ptr += bpl; 2095
1731 } 2096 /* boring lookup table pre-initialization */
2097 switch (srcImage->bits_per_pixel) {
2098 case 15:
2099 if ((mask_r != 0x7c00) ||
2100 (mask_g != 0x03e0) ||
2101 (mask_b != 0x001f))
2102 return;
2103 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2104 lookup_r = lookup;
2105 lookup_g = lookup+32;
2106 lookup_b = lookup+32+32;
2107 sh_r = 10;
2108 sh_g = 5;
2109 sh_b = 0;
2110 break;
2111 case 16:
2112 if ((mask_r != 0xf800) ||
2113 (mask_g != 0x07e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+64;
2120 sh_r = 11;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 24:
2125 if ((mask_r != 0xff0000) ||
2126 (mask_g != 0x00ff00) ||
2127 (mask_b != 0x0000ff))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2130 lookup_r = lookup;
2131 lookup_g = lookup+256;
2132 lookup_b = lookup+256+256;
2133 sh_r = 16;
2134 sh_g = 8;
2135 sh_b = 0;
2136 break;
2137 case 32:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 default:
2151 return; /* we do not support this color depth */
2152 }
2153
2154 /* prepare limits for color transformation (each channel is handled separately) */
2155 if (shade < 0) {
2156 shade = -shade;
2157 if (shade < 0) shade = 0;
2158 if (shade > 100) shade = 100;
2159
2160 lower_lim_r = 65535-rm;
2161 lower_lim_g = 65535-gm;
2162 lower_lim_b = 65535-bm;
2163
2164 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2165 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2166 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2167
2168 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2169 } else {
1733 for (y = h; --y >= 0;) { 2170 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2171 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2172
1737 b = ((uint16_t *) ptr)[x]; 2173 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2174
1739 g = (b & 0x3e0) * gm; 2175 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2176 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2177 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2178 }
1743 b |= (!(b >> 5) - 1); 2179
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2180 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2181 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2182 {
1747 } 2183 unsigned int tmp;
1748 ptr += bpl; 2184
2185 tmp = lower_lim_r;
2186 lower_lim_r = lower_lim_b;
2187 lower_lim_b = tmp;
2188
2189 tmp = upper_lim_r;
2190 upper_lim_r = upper_lim_b;
2191 upper_lim_b = tmp;
2192 }
2193
2194 /* fill our lookup tables */
2195 for (i = 0; i <= mask_r>>sh_r; i++)
2196 {
2197 RUINT32T tmp;
2198 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2199 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2200 lookup_r[i] = (tmp/65535)<<sh_r;
2201 }
2202 for (i = 0; i <= mask_g>>sh_g; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2206 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2207 lookup_g[i] = (tmp/65535)<<sh_g;
2208 }
2209 for (i = 0; i <= mask_b>>sh_b; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2213 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2214 lookup_b[i] = (tmp/65535)<<sh_b;
2215 }
2216
2217 /* apply table to input image (replacing colors by newly calculated ones) */
2218 switch (srcImage->bits_per_pixel)
2219 {
2220 case 15:
2221 {
2222 unsigned short *p1, *pf, *p, *pl;
2223 p1 = (unsigned short *) srcImage->data;
2224 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2225 while (p1 < pf)
2226 {
2227 p = p1;
2228 pl = p1 + srcImage->width;
2229 for (; p < pl; p++)
1749 } 2230 {
2231 *p = lookup_r[(*p & 0x7c00)>>10] |
2232 lookup_g[(*p & 0x03e0)>> 5] |
2233 lookup_b[(*p & 0x001f)];
2234 }
2235 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2236 }
1751} 2237 break;
1752 2238 }
1753/* RGB 16 */ 2239 case 16:
1754static void 2240 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2241 unsigned short *p1, *pf, *p, *pl;
1756{ 2242 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2243 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2244 while (p1 < pf)
1759 2245 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2246 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2247 pl = p1 + srcImage->width;
1762 /* No saturation */ 2248 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2249 {
1777 } else { 2250 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2251 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2252 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2253 }
1793 ptr += bpl; 2254 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2255 }
2256 break;
2257 }
2258 case 24:
2259 {
2260 unsigned char *p1, *pf, *p, *pl;
2261 p1 = (unsigned char *) srcImage->data;
2262 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2263 while (p1 < pf)
2264 {
2265 p = p1;
2266 pl = p1 + srcImage->width * 3;
2267 for (; p < pl; p += 3)
1794 } 2268 {
2269 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2270 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2271 p[2] = lookup_r[(p[2] & 0x0000ff)];
2272 }
2273 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2274 }
1796} 2275 break;
2276 }
2277 case 32:
2278 {
2279 RUINT32T *p1, *pf, *p, *pl;
2280 p1 = (RUINT32T *) srcImage->data;
2281 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2282
1798/* RGB 24 */ 2283 while (p1 < pf)
1799static void 2284 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2285 p = p1;
1801{ 2286 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2287 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2288 {
1830 } else { 2289 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2290 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2291 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2292 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2293 }
1861 ptr += bpl; 2294 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2295 }
2296 break;
2297 }
1863 } 2298 }
1864}
1865 2299
1866/* RGB 32 */ 2300 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2301}
1937
1938#endif 2302#endif
1939 2303
1940/* 2304/*
1941 * Check our parents are still who we think they are. 2305 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2306 * Do transparency updates if required
… …
1949 Atom atype; 2313 Atom atype;
1950 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2315 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
1954 2319
1955 pchanged = 0; 2320 pchanged = 0;
1956 2321
1957 if (!(Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
1959 2324
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
1962 2327
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1964 2329
1965 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
1966 { 2331 {
1967 if (am_transparent) 2332 if (am_transparent)
1968 { 2333 {
1969 pchanged = 1; 2334 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
1972 } 2337 }
1973 2338
1974 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
1975 } 2340 }
1976 2341
1977 /* Get all X ops out of the queue so that our information is up-to-date. */ 2342 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False); 2343 XSync (disp, False);
1979 2344
1980 /* 2345 /*
1981 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2348 * windows for each client, so we have to take care about that.
1984 */ 2349 */
1985 i = (xa[XA_XROOTPMAPID] 2350 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2353 &nitems, &bytes_after, &prop) == Success);
1989 2354
1990 if (!i || prop == NULL) 2355 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2356 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2357 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2359 &nitems, &bytes_after, &prop) == Success);
1995 2360
1996 if (!i || prop == NULL) 2361 if (!i || prop == NULL
2362#if TINTING
2363 || !rs[Rs_color + Color_tint]
2364#endif
2365 )
1997 have_pixmap = 0; 2366 have_pixmap = 0;
1998 else 2367 else
1999 { 2368 {
2000 have_pixmap = 1; 2369 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2370 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2371 XFree (prop);
2003 } 2372 }
2004 2373
2005 if (have_pixmap) 2374 if (have_pixmap)
2006 { 2375 {
… …
2012 Window cr; 2381 Window cr;
2013 XImage *image; 2382 XImage *image;
2014 GC gc; 2383 GC gc;
2015 XGCValues gcvalue; 2384 XGCValues gcvalue;
2016 2385
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2390 nx = ny = 0;
2022 2391
… …
2034 sy = 0; 2403 sy = 0;
2035 } 2404 }
2036 2405
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
2039 allowedxerror = -1; 2410 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2412
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2415 allowedxerror = 0;
2045 2416
… …
2048 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
2049 { 2420 {
2050 pchanged = 1; 2421 pchanged = 1;
2051 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
2052 { 2423 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
2054 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
2055 } 2426 }
2056 } 2427 }
2057 2428
2058 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
2059 } 2430 }
2060 else 2431 else
2061 { 2432 {
2062 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2434 XFreePixmap (disp, TermWin.pixmap);
2064 2435
2065#if TINTING 2436#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2437 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2438 {
2068 unsigned short shade, rm, gm, bm; 2439 unsigned short rm, gm, bm;
2440 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2441
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2442 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2443
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2444 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2445 }
2083#endif 2446#endif
2084 2447
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2449 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2452 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2454 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2456 XClearWindow (disp, TermWin.parent[0]);
2094 2457
2095 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2459 pchanged = 1;
2097 2460
2098 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
2099 } 2462 }
2100 } 2463 }
2101 2464
2102 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
2103 { 2468 {
2104 unsigned int n; 2469 unsigned int n;
2105 /* 2470 /*
2106 * InheritPixmap transparency 2471 * InheritPixmap transparency
2107 */ 2472 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2474 {
2111 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2478 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2479
2117 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2118 { 2481 {
2119 if (oldp != None) 2482 if (oldp != None)
2120 pchanged = 1; 2483 pchanged = 1;
… …
2130 2493
2131 if (pchanged) 2494 if (pchanged)
2132 { 2495 {
2133 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2134 { 2497 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2500 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2502 break;
2141 } 2503 }
2142 } 2504 }
2143 } 2505 }
2144 2506
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2508 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2511 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2152 } 2513 }
2153 else 2514 else
2154 { 2515 {
2155#if WAIT_FOR_WM 2516#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2519 sleep (1);
2159#endif 2520#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2163 2526
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2528 am_transparent = 1;
2166 } 2529 }
2167 2530
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
2542 if (am_transparent)
2543 {
2544 want_refresh = want_full_refresh = 1;
2545 if (am_pixmap_trans)
2546 flush ();
2170 } 2547 }
2171 2548
2172 return pchanged; 2549 return pchanged;
2173} 2550}
2174#endif 2551#endif
… …
2191 } 2568 }
2192 2569
2193 if (ch == NOCHAR) // TODO: improve 2570 if (ch == NOCHAR) // TODO: improve
2194 break; 2571 break;
2195 2572
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2574 {
2575 if (!seen_input)
2197 { 2576 {
2577 seen_input = 1;
2578 // many badly-written programs (e.g. jed) contain a race condition:
2579 // they first read the screensize and then install a SIGWINCH handler.
2580 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized.
2585 if (seen_resize)
2586 kill (-cmd_pid, SIGWINCH);
2587 }
2588
2198 /* Read a text string from the input buffer */ 2589 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2590 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2591 bool refreshnow = false;
2201 int nlines = 0; 2592 int nlines = 0;
2202 unicode_t *str = buf; 2593 unicode_t *str = buf;
2203 2594
2204 *str++ = ch;
2205
2206 for (;;) 2595 for (;;)
2207 { 2596 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2598 break;
2213 2599
2214 *str++ = ch; 2600 *str++ = ch;
2215 2601
2216 if (ch == '\n') 2602 if (ch == C0_LF)
2217 { 2603 {
2218 nlines++; 2604 nlines++;
2219 refresh_count++; 2605 refresh_count++;
2220 2606
2221 if (! (Options & Opt_jumpScroll) 2607 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2609 {
2224 refreshnow = true; 2610 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2611 ch = NOCHAR;
2227 break; 2612 break;
2228 } 2613 }
2229 2614
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2616 if (nlines >= TermWin.nrow - 1)
2232 { 2617 {
2233 scr_add_lines (buf, nlines, str - buf); 2618 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2619 nlines = 0;
2235 str = buf; 2620 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2624 if (str >= buf + UBUFSIZ)
2240 { 2625 {
2241 ch = NOCHAR; 2626 ch = NOCHAR;
2242 break; 2627 break;
2243 } 2628 }
2629
2630 seq_begin = cmdbuf_ptr;
2631 ch = next_char ();
2244 } 2632 }
2245 2633
2246 scr_add_lines (buf, nlines, str - buf); 2634 scr_add_lines (buf, nlines, str - buf);
2247 2635
2248 /* 2636 /*
2249 * If there have been a lot of new lines, then update the screen 2637 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2638 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2639 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2640 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2641 */
2257 if (refreshnow) 2642 if (refreshnow)
2258 { 2643 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2645 refresh_limit++;
2261 2646 else
2647 {
2648 flag = true;
2262 scr_refresh (refresh_type); 2649 scr_refresh (refresh_type);
2650 }
2263 } 2651 }
2264 2652
2265 } 2653 }
2266 else 2654 else
2267 { 2655 {
… …
2281 } 2669 }
2282 2670
2283 return flag; 2671 return flag;
2284} 2672}
2285 2673
2674// read the next octet
2675unicode_t
2676rxvt_term::next_octet ()
2677{
2678 return cmdbuf_ptr < cmdbuf_endp
2679 ? *cmdbuf_ptr++
2680 : NOCHAR;
2681}
2682
2286// read the next character 2683// read the next character
2287unicode_t 2684unicode_t
2288rxvt_term::next_char () 2685rxvt_term::next_char ()
2289{ 2686{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2687 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2703 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2705
2309 // assume wchar == unicode 2706 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2707 cmdbuf_ptr += len;
2311 return wc; 2708 return wc & UNICODE_MASK;
2312 } 2709 }
2313 2710
2314 return NOCHAR; 2711 return NOCHAR;
2315} 2712}
2316 2713
… …
2321 */ 2718 */
2322unicode_t 2719unicode_t
2323rxvt_term::cmd_getc () 2720rxvt_term::cmd_getc ()
2324{ 2721{
2325 unicode_t c = next_char (); 2722 unicode_t c = next_char ();
2723
2724 if (c == NOCHAR)
2725 throw out_of_input;
2726
2727 return c;
2728}
2729
2730unicode_t
2731rxvt_term::cmd_get8 ()
2732{
2733 unicode_t c = next_octet ();
2326 2734
2327 if (c == NOCHAR) 2735 if (c == NOCHAR)
2328 throw out_of_input; 2736 throw out_of_input;
2329 2737
2330 return c; 2738 return c;
… …
2431 process_escape_seq (); 2839 process_escape_seq ();
2432 break; 2840 break;
2433 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2845 else
2438 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2440 break; 2848 break;
2441 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2442 scr_bell (); 2850 scr_bell ();
2443 break; 2851 break;
2444 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2460 break; 2868 break;
2461 case C0_SI: /* shift in - acs */ 2869 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2870 scr_charset_choose (0);
2463 break; 2871 break;
2464 2872
2873#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2874 // 8-bit controls
2466 case 0x90: /* DCS */ 2875 case 0x90: /* DCS */
2467 process_dcs_seq (); 2876 process_dcs_seq ();
2468 break; 2877 break;
2469 case 0x9b: /* CSI */ 2878 case 0x9b: /* CSI */
2470 process_csi_seq (); 2879 process_csi_seq ();
2471 break; 2880 break;
2472 case 0x9d: /* CSI */ 2881 case 0x9d: /* CSI */
2473 process_osc_seq (); 2882 process_osc_seq ();
2474 break; 2883 break;
2884#endif
2475 } 2885 }
2476} 2886}
2477/*}}} */ 2887/*}}} */
2478 2888
2479 2889
… …
2541void 2951void
2542rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2543{ 2953{
2544 unicode_t ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2545 2955
2546 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2547 { 2957 {
2548 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2549 return; 2959 return;
2550 } 2960 }
2551 2961
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2977 break;
2568 case '+': 2978 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2980 break;
2571#ifndef NO_FRILLS 2981#if ENABLE_FRILLS
2572 case '6': 2982 case '6':
2573 scr_backindex (); 2983 scr_backindex ();
2574 break; 2984 break;
2575#endif 2985#endif
2576 case '7': 2986 case '7':
2577 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2578 break; 2988 break;
2579 case '8': 2989 case '8':
2580 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2581 break; 2991 break;
2582#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2583 case '9': 2993 case '9':
2584 scr_forwardindex (); 2994 scr_forwardindex ();
2585 break; 2995 break;
2586#endif 2996#endif
2587 case '=': 2997 case '=':
… …
2597 break; 3007 break;
2598 3008
2599 /* 8.3.87: NEXT LINE */ 3009 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3010 case C1_NEL: /* ESC E */
2601 { 3011 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3012 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3013 scr_add_lines (nlcr, 1, 2);
2604 } 3014 }
2605 break; 3015 break;
2606 3016
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3017 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3078
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3079/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3080/* *INDENT-OFF* */
2671enum { 3081enum {
2672 CSI_ICH = 0x40, 3082 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3083 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3084 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3085 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3086 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3087 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3088 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3297 break;
2888 3298
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3302 break;
2893 3303
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
2896 break; 3306 break;
… …
2903 break; 3313 break;
2904 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
2905 scr_report_position (); 3315 scr_report_position ();
2906 break; 3316 break;
2907 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3318 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3320 break;
2911 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3323 break;
2914 } 3324 }
… …
2950 break; 3360 break;
2951 3361
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3363 if (arg[0] == 4)
2954 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
2955 break; 3367 break;
2956 3368
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3370 if (arg[0] == 4)
2959 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
2960 break; 3374 break;
2961 3375
2962 /* 3376 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3378 */
… …
2976 break; 3390 break;
2977 case CSI_75: 3391 case CSI_75:
2978 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
2979 break; 3393 break;
2980 3394
2981#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
2982 case CSI_74: 3396 case CSI_74:
2983 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
2984 break; 3398 break;
2985#endif 3399#endif
2986 3400
… …
2993 break; 3407 break;
2994 } 3408 }
2995} 3409}
2996/*}}} */ 3410/*}}} */
2997 3411
2998#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
2999/* ARGSUSED */ 3413/* ARGSUSED */
3000void 3414void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3416{
3003 int x, y; 3417 int x, y;
3004 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
3005 Window wdummy; 3419 Window wdummy;
3420 dDisp;
3006 3421
3007 if (nargs == 0) 3422 if (nargs == 0)
3008 return; 3423 return;
3009 3424
3010 switch (args[0]) 3425 switch (args[0])
3011 { 3426 {
3012 /* 3427 /*
3013 * commands 3428 * commands
3014 */ 3429 */
3015 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
3017 break; 3432 break;
3018 case 2: /* iconify window */ 3433 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3435 break;
3022 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3024 break; 3438 break;
3025 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3441 break;
3028 case 5: /* raise window */ 3442 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
3030 break; 3444 break;
3031 case 6: /* lower window */ 3445 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
3033 break; 3447 break;
3034 case 7: /* refresh window */ 3448 case 7: /* refresh window */
3035 scr_touch (true); 3449 scr_touch (true);
3036 break; 3450 break;
3037 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
… …
3049 3463
3050 /* 3464 /*
3051 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
3052 */ 3466 */
3053 case 11: /* report window state */ 3467 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3470 break;
3057 case 13: /* report window position */ 3471 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3477 break;
3064 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3481 break;
3068 case 18: /* report text area size (chars) */ 3482 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3070 break; 3484 break;
3071 case 19: /* report window size (chars) */ 3485 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3487 break;
3074 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3489 {
3077 char *s; 3490 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s);
3080 } 3494 }
3081 break; 3495 break;
3082 case 21: /* report window title */ 3496 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3497 {
3085 char *s; 3498 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s);
3088 } 3502 }
3089 break; 3503 break;
3090 } 3504 }
3091} 3505}
3092#endif 3506#endif
3093 3507
3094/*----------------------------------------------------------------------*/ 3508/*----------------------------------------------------------------------*/
3095/* 3509/*
3096 * get input up until STRING TERMINATOR (or BEL) 3510 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3511 * ends_how is terminator used. returned input must be free()'d
3098 */ 3512 */
3099unsigned char * 3513unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3515{
3102 int seen_esc = 0; /* seen escape? */ 3516 unicode_t ch;
3517 bool seen_esc = false;
3103 unsigned int n = 0; 3518 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3519 wchar_t string[STRING_MAX];
3107 3520
3108 while ((ch = cmd_getc ())) 3521 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3522 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3523 if (seen_esc)
3524 {
3114 if (ch == 0x5c) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
3115 break; 3526 break;
3116 else 3527 else
3117 return NULL; 3528 return NULL;
3118 3529 }
3119 if (ch == C0_ESC) 3530 else if (ch == C0_ESC)
3120 { 3531 {
3121 seen_esc = 1; 3532 seen_esc = true;
3122 continue; 3533 continue;
3123 } 3534 }
3124 else if (ch == '\t') 3535 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3536 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3537 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
3539
3540 seen_esc = false;
3128 3541
3129 if (n >= sizeof (string) - 1) 3542 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3543 // stop at some sane length
3131 return NULL; 3544 return NULL;
3132 3545
3546 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 ();
3548 else
3133 string[n++] = ch; 3549 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3550 }
3136 3551
3137 string[n++] = '\0'; 3552 string[n++] = '\0';
3138 3553
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3555
3144 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
3145} 3557}
3146 3558
3147/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
3148/* 3560/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3605void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3607{
3196 if (str[0] == '?' && !str[1]) 3608 if (str[0] == '?' && !str[1])
3197 { 3609 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3610 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3611 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3612 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3613 }
3205 else 3614 else
3206 set_window_color (color, str); 3615 set_window_color (color, str);
3207} 3616}
3208 3617
… …
3236{ 3645{
3237 int changed = 0; 3646 int changed = 0;
3238 int color; 3647 int color;
3239 char *buf, *name; 3648 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
3241 3652
3242 assert (str != NULL); 3653 assert (str != NULL);
3243 switch (op) 3654 switch (op)
3244 { 3655 {
3245 case XTerm_name: 3656 case XTerm_name:
… …
3252 set_title (str); 3663 set_title (str);
3253 break; 3664 break;
3254 case XTerm_property: 3665 case XTerm_property:
3255 if (str[0] == '?') 3666 if (str[0] == '?')
3256 { 3667 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3668 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3669 Atom actual_type;
3259 int actual_format; 3670 int actual_format;
3260 unsigned long nitems; 3671 unsigned long nitems;
3261 unsigned long bytes_after; 3672 unsigned long bytes_after;
3262 unsigned char *value = 0; 3673 unsigned char *value = 0;
3263 const char *str = ""; 3674 const char *str = "";
3264 3675
3265 if (prop 3676 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3677 && XGetWindowProperty (disp, TermWin.parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3678 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3679 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3680 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3681 && actual_type != None
3271 && actual_format == 8) 3682 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3691 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3692
3282 if (eq) 3693 if (eq)
3283 { 3694 {
3284 *eq = 0; 3695 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3696 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3697 }
3290 else 3698 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3699 XDeleteProperty (disp, TermWin.parent[0],
3292 display->atom (str)); 3700 display->atom (str));
3293 } 3701 }
3294 break; 3702 break;
3295 3703
3296 case XTerm_Color: 3704 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
3298 { 3706 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3708 break;
3301 3709
3302 *name++ = '\0'; 3710 *name++ = '\0';
3303 color = atoi (buf); 3711 color = atoi (buf);
3304 3712
3305 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3714 break;
3307 3715
3308 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3717 *buf++ = '\0';
3310 3718
3311 if (name[0] == '?' && !name[1]) 3719 if (name[0] == '?' && !name[1])
3312 { 3720 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3721 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3724 }
3320 else 3725 else
3321 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
3322 } 3727 }
3323 break; 3728 break;
… …
3340 break; 3745 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3749 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3345 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3755 break;
3348 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break;
3759#endif
3760#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3763 check_our_parents ();
3764 if (am_transparent)
3765 want_full_refresh = want_refresh = 1;
3350 break; 3766 break;
3351#endif 3767#endif
3352 3768
3353 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3354 if (*str != ';') 3770 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3359#endif 3775#endif
3360 scr_touch (true); 3776 scr_touch (true);
3361 } 3777 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3363 { 3779 {
3364 str++; 3780 str++;
3365#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3367#endif 3783#endif
3368
3369 } 3784 }
3785
3370 if (changed) 3786 if (changed)
3371 { 3787 {
3372#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3789 resize_pixmap ();
3374#endif 3790#endif
… …
3386 case XTerm_logfile: 3802 case XTerm_logfile:
3387 // TODO, when secure mode? 3803 // TODO, when secure mode?
3388 break; 3804 break;
3389 3805
3390 case XTerm_font: 3806 case XTerm_font:
3807 op = URxvt_font;
3808 case URxvt_font:
3809#if ENABLE_STYLES
3810 case URxvt_boldFont:
3811 case URxvt_italicFont:
3812 case URxvt_boldItalicFont:
3813#endif
3391 if (query) 3814 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3818 resp);
3819 else
3392 { 3820 {
3393 if (Options & Opt_insecure) 3821 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3822
3395 TermWin.fontset->fontdesc 3823 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3824 allocated.push_back ((void *)res);
3397 : "", 3825 set_fonts ();
3398 resp);
3399 } 3826 }
3400 else
3401 change_font (str);
3402 break; 3827 break;
3403 3828
3404#ifndef NO_FRILLS 3829#if ENABLE_FRILLS
3405 case XTerm_locale: 3830 case XTerm_locale:
3406 if (query) 3831 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3833 else
3412 { 3834 {
3413 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3414# ifdef USE_XIM 3837# ifdef USE_XIM
3415 im_cb (); 3838 im_cb ();
3416# endif 3839# endif
3417 } 3840 }
3418 break; 3841 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3842#endif
3429 3843
3430#ifdef MENUBAR 3844#ifdef MENUBAR
3431 case XTerm_Menu: 3845 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3846 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3848 break;
3435#endif 3849#endif
3436#if 0 3850#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3878{
3465 int state; 3879 int state;
3466 3880
3467 if (mode == 's') 3881 if (mode == 's')
3468 { 3882 {
3469 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3470 return -1; 3884 return -1;
3471 } 3885 }
3472 else 3886 else
3473 { 3887 {
3474 if (mode == 'r') 3888 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3890 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3892 PrivMode (state, bit);
3479 } 3893 }
3480 3894
3481 return state; 3895 return state;
3482} 3896}
… …
3500 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3921#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3508#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3928#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3931 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3932 // 45 margin bell NYI
3519 // 46 start logging 3933 // 46 start logging
… …
3560 3974
3561 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3976 switch (arg[i])
3563 { 3977 {
3564 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3979 case 1049:
3565 if (Options & Opt_secondaryScreen) 3980 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3981 if (mode == 0)
3567 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3568 else if (mode == 1) 3983 else if (mode == 1)
3569 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3570 break; 3985 break;
… …
3581 * within VT52 mode 3996 * within VT52 mode
3582 */ 3997 */
3583 PrivMode (1, PrivMode_vt52); 3998 PrivMode (1, PrivMode_vt52);
3584 break; 3999 break;
3585 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4003 break;
3589 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3590 if (state) 4005 if (state)
3591 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3592 else 4007 else
3593 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3594 break; 4009 break;
3595 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3597 break; 4012 break;
3598 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4017 scr_autowrap (state);
3603 break; 4018 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4019 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4022 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4023 break;
3609#ifdef menuBar_esc 4024#ifdef menuBar_esc
3610 case menuBar_esc: 4025 case menuBar_esc:
3611#ifdef MENUBAR 4026#ifdef MENUBAR
3612 map_menuBar (state); 4027 map_menuBar (state);
… …
3632 break; 4047 break;
3633 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4052 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4053 break;
3639#if 0 4054#if 0
3640 case 1001: 4055 case 1001:
3641 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3642#endif 4057#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4059 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3646 else 4061 else
3647 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3648 break; 4063 break;
3649 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3650 if (state) 4065 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3652 else 4067 else
3653 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3654 break; 4069 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4070 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4071 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4073 scr_erase_screen (2);
3659 scr_change_screen (state); 4074 scr_change_screen (state);
3660 break; 4075 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4076 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4077 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4078 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4079 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4080 scr_erase_screen (2);
3666 break; 4081 break;
3667 default: 4082 default:
3668 break; 4083 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3695 break; 4110 break;
3696 case 1: 4111 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3698 break; 4113 break;
4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3699 case 4: 4118 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3701 break; 4120 break;
3702 case 5: 4121 case 5: // slowly blinking
4122 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4123 rendset = 1, rendstyle = RS_Blink;
3704 break; 4124 break;
4125 //case 6: // scoansi light background
3705 case 7: 4126 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4127 rendset = 1, rendstyle = RS_RVid;
3707 break; 4128 break;
3708 case 8: 4129 case 8:
3709 // invisible. NYI 4130 // invisible. NYI
3710 break; 4131 break;
3711 case 22: 4132 //case 9: // crossed out
4133 //case 10: // scoansi acs off, primary font
4134 //case 11: // scoansi acs on, first alt font
4135 //case 12: // scoansi acs on, |0x80, second alt font
4136 //...
4137 //case 19: // ninth alt font
4138 //case 20: // gothic
4139 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
4141 break;
4142 case 22: // normal intensity
4143 rendset = 0, rendstyle = RS_Bold;
4144 break;
4145 case 23: // disable italic
4146 rendset = 0, rendstyle = RS_Italic;
3713 break; 4147 break;
3714 case 24: 4148 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3716 break; 4150 break;
3717 case 25: 4151 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3719 break; 4153 break;
4154 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
3720 case 27: 4157 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3722 break; 4159 break;
3723 case 28:
3724 // visible. NYI 4160 //case 28: // visible. NYI
3725 break; 4161 //case 29: // not crossed-out
3726 } 4162 }
3727 4163
3728 if (rendset != -1) 4164 if (rendset != -1)
3729 { 4165 {
3730 scr_rendition (rendset, rendstyle); 4166 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4177 case 35:
3742 case 36: 4178 case 36:
3743 case 37: 4179 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4181 break;
3746#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4184 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4186 i += 2;
3752 } 4187 }
3753 break; 4188 break;
3754#endif
3755 case 39: /* default fg */ 4189 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3757 break; 4191 break;
3758 4192
3759 case 40: 4193 case 40:
… …
3764 case 45: 4198 case 45:
3765 case 46: 4199 case 46:
3766 case 47: 4200 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4202 break;
3769#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4205 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4207 i += 2;
3775 } 4208 }
3776 break; 4209 break;
3777#endif
3778 case 49: /* default bg */ 4210 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3780 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3781 4215
3782#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3783 case 90: 4217 case 90:
3784 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3785 case 92: 4219 case 92:
3786 case 93: 4220 case 93:
3787 case 94: 4221 case 94:
3788 case 95: 4222 case 95:
3789 case 96: 4223 case 96:
3790 case 97: 4224 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4226 break;
3794 case 100: 4227 case 100:
3795 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3796 case 102: 4229 case 102:
3797 case 103: 4230 case 103:
3798 case 104: 4231 case 104:
3799 case 105: 4232 case 105:
3800 case 106: 4233 case 106:
3801 case 107: 4234 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4236 break;
3805#endif 4237#endif
3806 4238
3807 } 4239 }
3808 } 4240 }
3809} 4241}
3810/*}}} */ 4242/*}}} */
3811 4243
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4244/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4245void
3814rxvt_term::process_graphics () 4246rxvt_term::process_graphics ()
3815{ 4247{
3816 unicode_t ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3817 4249
3818 if (cmd == 'Q') 4250 if (cmd == 'Q')
3819 { /* query graphics */ 4251 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4253 return;
3822 } 4254 }
3823 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3824 do 4256 do
3825 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4272 unsigned char buf[256];
3841 4273
3842 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4276 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3846} 4278}
3847 4279
3848/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4281/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3851 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3852void 4286void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4288{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4289 if (v_buflen == 0)
4290 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4292
3857 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3858 { 4298 }
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304
4305 pty_ev.set (EVENT_READ | EVENT_WRITE);
4306}
4307
4308void rxvt_term::pty_write ()
4309{
4310 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4311
4312 if (written > 0)
4313 {
4314 v_buflen -= written;
4315
3859 if (v_buflen == 0) 4316 if (v_buflen == 0)
3860 { 4317 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4318 free (v_buffer);
3888 v_buffer = 0; 4319 v_buffer = 0;
3889 v_buflen = 0; 4320 v_buflen = 0;
3890 4321
3891 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4323 return;
3904 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
3906} 4331}
3907 4332
3908/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
3909 4334

Diff Legend

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