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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.178 by root, Wed Dec 15 00:53:23 2004 UTC

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

Diff Legend

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