ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC

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

Diff Legend

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