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.37 by pcg, Sun Feb 1 20:12:53 2004 UTC vs.
Revision 1.56 by pcg, Tue Feb 24 00:02:44 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
127 }
119 } 128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129
130 { 138 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
136 { 144 {
137 /* for some backwards compatibility */ 145 /* for some backwards compatibility */
… …
142 if (meta) 150 if (meta)
143# endif 151# endif
144 { 152 {
145 if (keysym == ks_bigfont) 153 if (keysym == ks_bigfont)
146 { 154 {
147 change_font (0, FONT_UP); 155 change_font (FONT_UP);
148 return; 156 return;
149 } 157 }
150 else if (keysym == ks_smallfont) 158 else if (keysym == ks_smallfont)
151 { 159 {
152 change_font (0, FONT_DN); 160 change_font (FONT_DN);
153 return; 161 return;
154 } 162 }
155 } 163 }
156#endif 164#endif
157 165
… …
162 { 170 {
163#else 171#else
164 if (IS_SCROLL_MOD) 172 if (IS_SCROLL_MOD)
165 { 173 {
166#endif 174#endif
167 int lnsppg; 175 int lnsppg;
168 176
169#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 179#else
172 lnsppg = TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 218 scr_move_to (1, 0);
211 return; 219 return;
212 } 220 }
213 } 221 }
214#endif 222#endif
215
216 } 223 }
217 224
218 if (shft) 225 if (shft)
219 { 226 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
… …
227 { 234 {
228 switch (keysym) 235 switch (keysym)
229 { 236 {
230 /* normal XTerm key bindings */ 237 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
233 return; 240 return;
234 /* rxvt extras */ 241 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 243 change_font (FONT_UP);
237 return; 244 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 246 change_font (FONT_DN);
240 return; 247 return;
241 } 248 }
242 } 249 }
243 } 250 }
244#ifdef PRINTPIPE 251#ifdef PRINTPIPE
… …
246 { 253 {
247 scr_printscreen (ctrl | shft); 254 scr_printscreen (ctrl | shft);
248 return; 255 return;
249 } 256 }
250#endif 257#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 258
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 260 {
270#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 263 {
273 unsigned int l; 264 unsigned int l;
274 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
276 267
… …
286 tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
287 return; 278 return;
288 } 279 }
289 else 280 else
290#endif 281#endif
291
292 { 282 {
293 newlen = 1; 283 newlen = 1;
294 switch (keysym) 284 switch (keysym)
295 { 285 {
296#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 287 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 288 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 289 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
303 } 293 }
304 else 294 else
305 STRCPY(kbuf, key_backspace); 295 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 296# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 298 {
309 int col, row; 299 int col, row;
310 300
311 newlen = STRLEN(kbuf); 301 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 302 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 303 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 304 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 306 }
317# endif 307# endif
318 break; 308 break;
319#endif 309#endif
320#ifndef NO_DELETE_KEY 310#ifndef NO_DELETE_KEY
321 case XK_Delete: 311 case XK_Delete:
322 STRCPY(kbuf, key_delete); 312 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 313# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 314 if (Options & Opt_mc_hack)
325 { 315 {
326 int col, row; 316 int col, row;
327 317
328 newlen = STRLEN(kbuf); 318 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 319 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 320 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 321 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 323 }
334# endif 324# endif
335 break; 325 break;
336#endif 326#endif
337 case XK_Tab: 327 case XK_Tab:
338 if (shft) 328 if (shft)
339 STRCPY(kbuf, "\033[Z"); 329 STRCPY (kbuf, "\033[Z");
340 else 330 else
341 { 331 {
342#ifdef CTRL_TAB_MAKES_META 332#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 333 if (ctrl)
344 meta = 1; 334 meta = 1;
345#endif 335#endif
346#ifdef MOD4_TAB_MAKES_META 336#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 337 if (ev.state & Mod4Mask)
348 meta = 1; 338 meta = 1;
349#endif 339#endif
350 newlen = 0; 340 newlen = 0;
351 } 341 }
352 break; 342 break;
353
354 343
355#ifdef XK_KP_Left 344#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 345 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 346 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 347 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 348 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 349 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 350 {
362 STRCPY(kbuf, "\033OZ"); 351 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 352 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 353 break;
365 } 354 }
366 else 355 else
367 /* translate to std. cursor key */ 356 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 357 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 359#endif
371 case XK_Up: /* "\033[A" */ 360 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 361 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 362 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 363 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 364 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 365 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 366 /* do Shift first */
378 if (shft) 367 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 368 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 369 else if (ctrl)
381 { 370 {
382 kbuf[1] = 'O'; 371 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 372 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 373 }
385 else if (PrivateModes & PrivMode_aplCUR) 374 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 375 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET 376#ifdef MULTICHAR_SET
388 //TODO: ?? 377 //TODO: ??
… …
392 381
393 col = screen.cur.col; 382 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 383 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 384 m = 0;
396 if (keysym == XK_Right 385 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 386 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 387 m = 1;
399 else if (keysym == XK_Left) 388 else if (keysym == XK_Left)
400 { 389 {
401 if (col > 0) 390 if (col > 0)
402 { 391 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 392 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 393 m = 1;
405 } 394 }
406 else if (screen.cur.row > 0) 395 else if (screen.cur.row > 0)
407 { 396 {
408 col = screen.tlen[--row]; 397 col = screen.tlen[--row];
409 if (col == -1) 398 if (col == -1)
410 col = TermWin.ncol - 1; 399 col = TermWin.ncol - 1;
411 else 400 else
412 col--; 401 col--;
413 if (col > 0 402 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 403 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 404 m = 1;
416 } 405 }
417 } 406 }
418 if (m) 407 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 409 }
421#endif 410#endif
422 break; 411 break;
423 412
424#ifndef UNSHIFTED_SCROLLKEYS 413#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 414# ifdef XK_KP_Prior
426 case XK_KP_Prior: 415 case XK_KP_Prior:
427 /* allow shift to override */ 416 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 417 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 418 {
430 STRCPY(kbuf, "\033Oy"); 419 STRCPY (kbuf, "\033Oy");
431 break; 420 break;
432 } 421 }
433 /* FALLTHROUGH */ 422 /* FALLTHROUGH */
434# endif 423# endif
435 case XK_Prior: 424 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 425 STRCPY (kbuf, "\033[5~");
437 break; 426 break;
438# ifdef XK_KP_Next 427# ifdef XK_KP_Next
439 case XK_KP_Next: 428 case XK_KP_Next:
440 /* allow shift to override */ 429 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 430 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 431 {
443 STRCPY(kbuf, "\033Os"); 432 STRCPY (kbuf, "\033Os");
444 break; 433 break;
445 } 434 }
446 /* FALLTHROUGH */ 435 /* FALLTHROUGH */
447# endif 436# endif
448 case XK_Next: 437 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 438 STRCPY (kbuf, "\033[6~");
450 break; 439 break;
451#endif 440#endif
452 case XK_KP_Enter: 441 case XK_KP_Enter:
453 /* allow shift to override */ 442 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 443 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 444 {
456 STRCPY(kbuf, "\033OM"); 445 STRCPY (kbuf, "\033OM");
457 } 446 }
458 else 447 else
459 { 448 {
460 kbuf[0] = '\r'; 449 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 450 kbuf[1] = '\0';
462 } 451 }
463 break; 452 break;
464 453
465#ifdef XK_KP_Begin 454#ifdef XK_KP_Begin
466 case XK_KP_Begin: 455 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 456 STRCPY (kbuf, "\033Ou");
468 break; 457 break;
469 458
470 case XK_KP_Insert: 459 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 460 STRCPY (kbuf, "\033Op");
472 break; 461 break;
473 462
474 case XK_KP_Delete: 463 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 464 STRCPY (kbuf, "\033On");
476 break; 465 break;
477#endif 466#endif
478 case XK_KP_F1: /* "\033OP" */ 467 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 468 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 469 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 470 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 471 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 472 kbuf[2] += (keysym - XK_KP_F1);
484 break; 473 break;
485 474
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 475 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 476 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 477 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 478 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 479 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 480 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 481 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 489 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 490 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 491 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 492 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 493 {
505 STRCPY(kbuf, "\033Oj"); 494 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 495 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 496 }
508 else 497 else
509 { 498 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 499 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 500 kbuf[1] = '\0';
512 } 501 }
513 break; 502 break;
514 503
515 case XK_Find: 504 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 505 STRCPY (kbuf, "\033[1~");
517 break; 506 break;
518 case XK_Insert: 507 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 508 STRCPY (kbuf, "\033[2~");
520 break; 509 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 510#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 511 case DXK_Remove:
523 /* FALLTHROUGH */ 512 /* FALLTHROUGH */
524#endif 513#endif
525 case XK_Execute: 514 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 515 STRCPY (kbuf, "\033[3~");
527 break; 516 break;
528 case XK_Select: 517 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 518 STRCPY (kbuf, "\033[4~");
530 break; 519 break;
531#ifdef XK_KP_End 520#ifdef XK_KP_End
532 case XK_KP_End: 521 case XK_KP_End:
533 /* allow shift to override */ 522 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 523 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 524 {
536 STRCPY(kbuf, "\033Oq"); 525 STRCPY (kbuf, "\033Oq");
537 break; 526 break;
538 } 527 }
539 /* FALLTHROUGH */ 528 /* FALLTHROUGH */
540#endif 529#endif
541 case XK_End: 530 case XK_End:
542 STRCPY(kbuf, KS_END); 531 STRCPY (kbuf, KS_END);
543 break; 532 break;
544#ifdef XK_KP_Home 533#ifdef XK_KP_Home
545 case XK_KP_Home: 534 case XK_KP_Home:
546 /* allow shift to override */ 535 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 536 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 537 {
549 STRCPY(kbuf, "\033Ow"); 538 STRCPY (kbuf, "\033Ow");
550 break; 539 break;
551 } 540 }
552 /* FALLTHROUGH */ 541 /* FALLTHROUGH */
553#endif 542#endif
554 case XK_Home: 543 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 544 STRCPY (kbuf, KS_HOME);
556 break; 545 break;
557 546
558#define FKEY(n, fkey) \ 547#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 548 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 549
561 case XK_F1: /* "\033[11~" */ 550 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 551 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 552 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 553 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 554 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 555 FKEY (11, XK_F1);
567 break; 556 break;
568 case XK_F6: /* "\033[17~" */ 557 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 558 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 559 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 560 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 561 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 562 FKEY (17, XK_F6);
574 break; 563 break;
575 case XK_F11: /* "\033[23~" */ 564 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 565 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 566 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 567 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 568 FKEY (23, XK_F11);
580 break; 569 break;
581 case XK_F15: /* "\033[28~" */ 570 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 571 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 572 FKEY (28, XK_F15);
584 break; 573 break;
585 case XK_Help: /* "\033[28~" */ 574 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 575 FKEY (28, XK_Help);
587 break; 576 break;
588 case XK_Menu: /* "\033[29~" */ 577 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 578 FKEY (29, XK_Menu);
590 break; 579 break;
591 case XK_F17: /* "\033[31~" */ 580 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 581 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 582 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 583 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 594 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 595 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 596 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 597 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 598 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 599 FKEY (31, XK_F17);
611 break; 600 break;
612#undef FKEY 601#undef FKEY
613 default: 602 default:
614 newlen = 0; 603 newlen = 0;
615 break; 604 break;
616 } 605 }
617 if (newlen) 606 if (newlen)
618 len = STRLEN(kbuf); 607 len = STRLEN (kbuf);
619 } 608 }
620 /* 609 /*
621 * Pass meta for all function keys, if 'meta' option set 610 * Pass meta for all function keys, if 'meta' option set
622 */ 611 */
623#ifdef META8_OPTION 612#ifdef META8_OPTION
… …
641 630
642 for (ch = kbuf; ch < kbuf + len; ch++) 631 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 632 *ch |= 0x80;
644 meta = 0; 633 meta = 0;
645 } 634 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 635#endif
651 /* nil */ ; 636 /* nil */ ;
652 } 637 }
653 } 638 }
654 639
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 662 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 663
679 /* escape prefix */ 664 /* escape prefix */
680 if (meta 665 if (meta
681#ifdef META8_OPTION 666#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 667 && meta_char == C0_ESC
683#endif 668#endif
684 ) 669 )
685 { 670 {
686 const unsigned char ch = C0_ESC; 671 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 672 tt_write (&ch, 1);
689 } 673 }
674
690#ifdef DEBUG_CMD 675#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 676 /* Display keyboard buffer contents */
693 char *p; 677 unsigned char *p;
694 int i; 678 int i;
695 679
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 680 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 681 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 682 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 683 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 684#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 685 tt_write (kbuf, (unsigned int)len);
703} 686}
704/*}}} */ 687/*}}} */
705 688
706#if (MENUBAR_MAX) 689#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 691/* attempt to `write' count to the input buffer */
709unsigned int 692unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 693rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 694{
712 unsigned int n, s; 695 unsigned int n, s;
713 696
714 n = cmdbuf_ptr - cmdbuf_base; 697 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
716 if (n > 0 && s < count) 699 if (n > 0 && s < count)
717 { 700 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 701 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 702 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 703 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 704 cmdbuf_endp -= n;
722 s += n; 705 s += n;
723 } 706 }
724 if (count > s) 707 if (count > s)
725 { 708 {
726 rxvt_print_error("data loss: cmd_write too large"); 709 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 710 count = s;
728 } 711 }
729 for (; count--;) 712 for (; count--;)
730 *cmdbuf_endp++ = *str++; 713 *cmdbuf_endp++ = *str++;
731 return 0; 714 return 0;
… …
753 IMSendSpot (); 736 IMSendSpot ();
754#endif 737#endif
755 738
756 } 739 }
757 740
758 XFlush (Xdisplay); 741 display->flush ();
759} 742}
760 743
761void 744void
762rxvt_term::check_cb (check_watcher &w) 745rxvt_term::check_cb (check_watcher &w)
763{ 746{
764 SET_R (this); 747 SET_R (this);
765 SET_LOCALE (locale); 748 SET_LOCALE (locale);
766 749
767 flush (); 750 flush ();
768}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 751}
813 752
814#ifdef CURSOR_BLINK 753#ifdef CURSOR_BLINK
815void 754void
816rxvt_term::cursor_blink_cb (time_watcher &w) 755rxvt_term::cursor_blink_cb (time_watcher &w)
… …
832 want_refresh = 1; 771 want_refresh = 1;
833 w.start (w.at + TEXT_BLINK_INTERVAL); 772 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 773 }
835} 774}
836#endif 775#endif
837
838void
839rxvt_term::x_cb (io_watcher &w, short revents)
840{
841 SET_R (this);
842 SET_LOCALE (locale);
843
844 process_x_events ();
845}
846 776
847bool 777bool
848rxvt_term::pty_fill () 778rxvt_term::pty_fill ()
849{ 779{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 780 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
… …
922 if (ch == '\n') 852 if (ch == '\n')
923 { 853 {
924 nlines++; 854 nlines++;
925 refresh_count++; 855 refresh_count++;
926 856
927 if (!(Options & Opt_jumpScroll) 857 if (! (Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 { 859 {
930 refreshnow = true; 860 refreshnow = true;
931 flag = false; 861 flag = false;
932 ch = NOCHAR; 862 ch = NOCHAR;
… …
1000 { 930 {
1001 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 931 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
1002 return *cmdbuf_ptr++; 932 return *cmdbuf_ptr++;
1003 933
1004 wchar_t wc; 934 wchar_t wc;
1005 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 935 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
1006 936
1007 if (len == (size_t)-2) 937 if (len == (size_t)-2)
1008 return NOCHAR; 938 return NOCHAR;
1009 939
1010 if (len == (size_t)-1) 940 if (len == (size_t)-1)
… …
1016 } 946 }
1017 947
1018 return NOCHAR; 948 return NOCHAR;
1019} 949}
1020 950
1021/* rxvt_cmd_getc() - Return next input character */ 951/* rxvt_cmd_getc () - Return next input character */
1022/* 952/*
1023 * Return the next input character after first passing any keyboard input 953 * Return the next input character after first passing any keyboard input
1024 * to the command. 954 * to the command.
1025 */ 955 */
1026uint32_t 956uint32_t
… …
1042 972
1043#ifdef POINTER_BLANK 973#ifdef POINTER_BLANK
1044void 974void
1045rxvt_term::pointer_unblank () 975rxvt_term::pointer_unblank ()
1046{ 976{
1047 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 977 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1048 recolour_cursor (); 978 recolour_cursor ();
1049 979
1050 hidden_pointer = 0; 980 hidden_pointer = 0;
1051 981
1052 if (Options & Opt_pointerBlank) 982 if (Options & Opt_pointerBlank)
… …
1054} 984}
1055 985
1056void 986void
1057rxvt_term::pointer_blank () 987rxvt_term::pointer_blank ()
1058{ 988{
1059 if (!(Options & Opt_pointerBlank)) 989 if (! (Options & Opt_pointerBlank))
1060 return; 990 return;
1061 991
1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 992 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1063 XFlush (Xdisplay); 993 XFlush (display->display);
1064 994
1065 hidden_pointer = 1; 995 hidden_pointer = 1;
1066} 996}
1067 997
1068void 998void
… …
1074 pointer_blank (); 1004 pointer_blank ();
1075} 1005}
1076#endif 1006#endif
1077 1007
1078void 1008void
1079rxvt_term::mouse_report (const XButtonEvent *ev) 1009rxvt_term::mouse_report (XButtonEvent &ev)
1080{ 1010{
1081 int button_number, key_state = 0; 1011 int button_number, key_state = 0;
1082 int x, y; 1012 int x, y;
1083 1013
1084 x = ev->x; 1014 x = ev.x;
1085 y = ev->y; 1015 y = ev.y;
1086 pixel_position (&x, &y); 1016 pixel_position (&x, &y);
1087 1017
1088 if (MEvent.button == AnyButton) 1018 if (MEvent.button == AnyButton)
1089 { 1019 {
1090 button_number = 3; 1020 button_number = 3;
… …
1124#endif 1054#endif
1125 1055
1126 } 1056 }
1127 1057
1128#ifdef DEBUG_MOUSEREPORT 1058#ifdef DEBUG_MOUSEREPORT
1129 fprintf(stderr, "Mouse ["); 1059 fprintf (stderr, "Mouse [");
1130 if (key_state & 16) 1060 if (key_state & 16)
1131 fputc('C', stderr); 1061 fputc ('C', stderr);
1132 if (key_state & 4) 1062 if (key_state & 4)
1133 fputc('S', stderr); 1063 fputc ('S', stderr);
1134 if (key_state & 8) 1064 if (key_state & 8)
1135 fputc('A', stderr); 1065 fputc ('A', stderr);
1136 if (key_state & 32) 1066 if (key_state & 32)
1137 fputc('2', stderr); 1067 fputc ('2', stderr);
1138 fprintf(stderr, "]: <%d>, %d/%d\n", 1068 fprintf (stderr, "]: <%d>, %d/%d\n",
1139 button_number, 1069 button_number,
1140 x + 1, 1070 x + 1,
1141 y + 1); 1071 y + 1);
1142#else 1072#else
1143 tt_printf("\033[M%c%c%c", 1073 tt_printf ("\033[M%c%c%c",
1144 (32 + button_number + key_state), 1074 (32 + button_number + key_state),
1145 (32 + x + 1), 1075 (32 + x + 1),
1146 (32 + y + 1)); 1076 (32 + y + 1));
1147#endif 1077#endif
1148} 1078}
1149 1079
1150#ifdef USING_W11LIB 1080#ifdef USING_W11LIB
1151void 1081void
1152rxvt_W11_process_x_event(XEvent *ev) 1082rxvt_W11_process_x_event (XEvent *ev)
1153{ 1083{
1154 rxvt_t *r = rxvt_get_r(); 1084 rxvt_t *r = rxvt_get_r ();
1155 1085
1156 process_x_event (ev); 1086 x_cb (*ev);
1157} 1087}
1158#endif 1088#endif
1159 1089
1160/*{{{ process an X event */ 1090/*{{{ process an X event */
1161void 1091void
1162rxvt_term::process_x_event (XEvent *ev) 1092rxvt_term::x_cb (XEvent &ev)
1163{ 1093{
1094 SET_R (this);
1095 SET_LOCALE (locale);
1096
1097#if defined(CURSOR_BLINK)
1098 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1099 {
1100 if (hidden_cursor)
1101 {
1102 hidden_cursor = 0;
1103 want_refresh = 1;
1104 }
1105
1106 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1107 }
1108#endif
1109
1110#if defined(POINTER_BLANK)
1111 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1112 {
1113 if (ev.type == MotionNotify
1114 || ev.type == ButtonPress
1115 || ev.type == ButtonRelease)
1116 if (hidden_pointer)
1117 pointer_unblank ();
1118
1119 if (ev.type == KeyPress && hidden_pointer == 0)
1120 pointer_blank ();
1121 }
1122#endif
1123
1124#ifdef USE_XIM
1125 if (XFilterEvent (&ev, None))
1126 return;
1127#endif
1128
1164 Window unused_root, unused_child; 1129 Window unused_root, unused_child;
1165 int unused_root_x, unused_root_y; 1130 int unused_root_x, unused_root_y;
1166 unsigned int unused_mask; 1131 unsigned int unused_mask;
1167 1132
1168#ifdef DEBUG_X 1133#ifdef DEBUG_X
… …
1207#endif 1172#endif
1208 1173
1209#ifdef DEBUG_X 1174#ifdef DEBUG_X
1210 struct timeval tp; 1175 struct timeval tp;
1211 struct tm *ltt; 1176 struct tm *ltt;
1212 (void)gettimeofday(&tp, NULL); 1177 (void)gettimeofday (&tp, NULL);
1213 ltt = localtime(&(tp.tv_sec)); 1178 ltt = localtime (& (tp.tv_sec));
1214 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)); 1179 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));
1215#endif 1180#endif
1216 1181
1217 switch (ev->type) 1182 switch (ev.type)
1218 { 1183 {
1219 case KeyPress: 1184 case KeyPress:
1220 lookup_key ((XKeyEvent *)ev); 1185 lookup_key (ev.xkey);
1221 break; 1186 break;
1222 1187
1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1224 case KeyRelease: 1189 case KeyRelease:
1225 { 1190 {
1226 if (!(ev->xkey.state & ControlMask)) 1191 if (! (ev.xkey.state & ControlMask))
1227 mouse_slip_wheel_speed = 0; 1192 mouse_slip_wheel_speed = 0;
1228 else 1193 else
1229 { 1194 {
1230 KeySym ks; 1195 KeySym ks;
1231 1196
1232 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1197 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1233 if (ks == XK_Control_L || ks == XK_Control_R) 1198 if (ks == XK_Control_L || ks == XK_Control_R)
1234 mouse_slip_wheel_speed = 0; 1199 mouse_slip_wheel_speed = 0;
1235 } 1200 }
1236 break; 1201 break;
1237 } 1202 }
1238#endif 1203#endif
1239 1204
1240 case ButtonPress: 1205 case ButtonPress:
1241 button_press ((XButtonEvent *)ev); 1206 button_press (ev.xbutton);
1242 break; 1207 break;
1243 1208
1244 case ButtonRelease: 1209 case ButtonRelease:
1245 button_release ((XButtonEvent *)ev); 1210 button_release (ev.xbutton);
1246 break; 1211 break;
1247 1212
1248 case ClientMessage: 1213 case ClientMessage:
1249 if (ev->xclient.format == 32 1214 if (ev.xclient.format == 32
1250 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1215 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1251 destroy (); 1216 destroy ();
1252#ifdef OFFIX_DND 1217#ifdef OFFIX_DND
1253 /* OffiX Dnd (drag 'n' drop) protocol */ 1218 /* OffiX Dnd (drag 'n' drop) protocol */
1254 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1219 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1255 && (ev->xclient.data.l[0] == DndFile 1220 && (ev.xclient.data.l[0] == DndFile
1256 || ev->xclient.data.l[0] == DndDir 1221 || ev.xclient.data.l[0] == DndDir
1257 || ev->xclient.data.l[0] == DndLink)) 1222 || ev.xclient.data.l[0] == DndLink))
1258 { 1223 {
1259 /* Get Dnd data */ 1224 /* Get Dnd data */
1260 Atom ActualType; 1225 Atom ActualType;
1261 int ActualFormat; 1226 int ActualFormat;
1262 unsigned char *data; 1227 unsigned char *data;
1263 unsigned long Size, RemainingBytes; 1228 unsigned long Size, RemainingBytes;
1264 1229
1265 XGetWindowProperty(Xdisplay, Xroot, 1230 XGetWindowProperty (display->display, display->root,
1266 xa[XA_DNDSELECTION], 1231 xa[XA_DNDSELECTION],
1267 0L, 1000000L, 1232 0L, 1000000L,
1268 False, AnyPropertyType, 1233 False, AnyPropertyType,
1269 &ActualType, &ActualFormat, 1234 &ActualType, &ActualFormat,
1270 &Size, &RemainingBytes, 1235 &Size, &RemainingBytes,
1271 &data); 1236 &data);
1272 XChangeProperty(Xdisplay, Xroot, 1237 XChangeProperty (display->display, display->root,
1273 XA_CUT_BUFFER0, XA_STRING, 1238 XA_CUT_BUFFER0, XA_STRING,
1274 8, PropModeReplace, 1239 8, PropModeReplace,
1275 data, STRLEN(data)); 1240 data, STRLEN (data));
1276 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1241 selection_paste (display->root, XA_CUT_BUFFER0, True);
1277 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1278 } 1243 }
1279#endif /* OFFIX_DND */ 1244#endif /* OFFIX_DND */
1280 break; 1245 break;
1281 1246
1282 case MappingNotify: 1247 case MappingNotify:
1283 XRefreshKeyboardMapping(&(ev->xmapping)); 1248 XRefreshKeyboardMapping (& (ev.xmapping));
1284 break; 1249 break;
1285 1250
1286 /* 1251 /*
1287 * XXX: this is not the _current_ arrangement 1252 * XXX: this is not the _current_ arrangement
1288 * Here's my conclusion: 1253 * Here's my conclusion:
… …
1292 * in the GraphicsExpose parts, which means that after each refresh, 1257 * in the GraphicsExpose parts, which means that after each refresh,
1293 * we need to wait for the graphics expose or Noexpose events, 1258 * we need to wait for the graphics expose or Noexpose events,
1294 * which ought to make things real slow! 1259 * which ought to make things real slow!
1295 */ 1260 */
1296 case VisibilityNotify: 1261 case VisibilityNotify:
1297 switch (ev->xvisibility.state) 1262 switch (ev.xvisibility.state)
1298 { 1263 {
1299 case VisibilityUnobscured: 1264 case VisibilityUnobscured:
1300 refresh_type = FAST_REFRESH; 1265 refresh_type = FAST_REFRESH;
1301 break; 1266 break;
1302 case VisibilityPartiallyObscured: 1267 case VisibilityPartiallyObscured:
… …
1313 { 1278 {
1314 TermWin.focus = 1; 1279 TermWin.focus = 1;
1315 want_refresh = 1; 1280 want_refresh = 1;
1316#ifdef USE_XIM 1281#ifdef USE_XIM
1317 if (Input_Context != NULL) 1282 if (Input_Context != NULL)
1318 XSetICFocus(Input_Context); 1283 XSetICFocus (Input_Context);
1319#endif 1284#endif
1320#ifdef CURSOR_BLINK 1285#ifdef CURSOR_BLINK
1321 if (Options & Opt_cursorBlink) 1286 if (Options & Opt_cursorBlink)
1322 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1287 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1323#endif 1288#endif
… …
1330 { 1295 {
1331 TermWin.focus = 0; 1296 TermWin.focus = 0;
1332 want_refresh = 1; 1297 want_refresh = 1;
1333#ifdef USE_XIM 1298#ifdef USE_XIM
1334 if (Input_Context != NULL) 1299 if (Input_Context != NULL)
1335 XUnsetICFocus(Input_Context); 1300 XUnsetICFocus (Input_Context);
1336#endif 1301#endif
1337#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1338 if (Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1339 cursor_blink_ev.stop (); 1304 cursor_blink_ev.stop ();
1340 hidden_cursor = 0; 1305 hidden_cursor = 0;
… …
1342 1307
1343 } 1308 }
1344 break; 1309 break;
1345 1310
1346 case ConfigureNotify: 1311 case ConfigureNotify:
1347 if (ev->xconfigure.window == TermWin.parent[0]) 1312 if (ev.xconfigure.window == TermWin.parent[0])
1348 { 1313 {
1349 int height, width; 1314 int height, width;
1350 1315
1351 do 1316 do
1352 { /* Wrap lots of configures into one */ 1317 { /* Wrap lots of configures into one */
1353 width = ev->xconfigure.width; 1318 width = ev.xconfigure.width;
1354 height = ev->xconfigure.height; 1319 height = ev.xconfigure.height;
1355 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1320 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1356 } 1321 }
1357 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1322 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1358 ConfigureNotify, ev)); 1323
1359 if (szHint.width != width || szHint.height != height) 1324 if (szHint.width != width || szHint.height != height)
1360 { 1325 {
1361 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1326 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1362 resize_all_windows (width, height, 1); 1327 resize_all_windows (width, height, 1);
1363 } 1328 }
1364#ifdef DEBUG_SIZE 1329#ifdef DEBUG_SIZE
1365 else 1330 else
1366 { 1331 {
1367 D_SIZE((stderr, "Size: Not resizing")); 1332 D_SIZE ((stderr, "Size: Not resizing"));
1368 } 1333 }
1369#endif 1334#endif
1370#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1371 if (Options & Opt_transparent) 1336 if (Options & Opt_transparent)
1372 { 1337 {
… …
1378 1343
1379 } 1344 }
1380 break; 1345 break;
1381 1346
1382 case SelectionClear: 1347 case SelectionClear:
1383 selection_clear (); 1348 display->set_selection_owner (0);
1384 break; 1349 break;
1385 1350
1386 case SelectionNotify: 1351 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1352 if (selection_wait == Sel_normal)
1388 selection_paste (ev->xselection.requestor, 1353 selection_paste (ev.xselection.requestor,
1389 ev->xselection.property, True); 1354 ev.xselection.property, True);
1390 break; 1355 break;
1391 1356
1392 case SelectionRequest: 1357 case SelectionRequest:
1393 selection_send (&(ev->xselectionrequest)); 1358 selection_send (ev.xselectionrequest);
1394 break; 1359 break;
1395 1360
1396 case UnmapNotify: 1361 case UnmapNotify:
1397 TermWin.mapped = 0; 1362 TermWin.mapped = 0;
1398#ifdef TEXT_BLINK 1363#ifdef TEXT_BLINK
… …
1405#ifdef TEXT_BLINK 1370#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1371 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif 1372#endif
1408 break; 1373 break;
1409 1374
1410 case PropertyNotify:
1411 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1412 {
1413 if (ev->xproperty.state == PropertyNewValue)
1414 selection_property (ev->xproperty.window,
1415 ev->xproperty.atom);
1416 break;
1417 }
1418#ifdef TRANSPARENT 1375#ifdef TRANSPARENT
1419 /*
1420 * if user used some Esetroot compatible prog to set the root bg,
1421 * use the property to determine the pixmap. We use it later on.
1422 */
1423 if (xa[XA_XROOTPMAPID] == 0)
1424 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1425 "_XROOTPMAP_ID", False);
1426 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1427 break;
1428 /* FALLTHROUGH */
1429 case ReparentNotify: 1376 case ReparentNotify:
1430 if ((Options & Opt_transparent) && check_our_parents ()) 1377 rootwin_cb (ev);
1431 { 1378 break;
1432 if (am_transparent)
1433 want_full_refresh = 1;
1434 }
1435#endif /* TRANSPARENT */ 1379#endif /* TRANSPARENT */
1436 break;
1437 1380
1438 case GraphicsExpose: 1381 case GraphicsExpose:
1439 case Expose: 1382 case Expose:
1440 if (ev->xany.window == TermWin.vt) 1383 if (ev.xany.window == TermWin.vt)
1441 { 1384 {
1442#ifdef NO_SLOW_LINK_SUPPORT 1385#ifdef NO_SLOW_LINK_SUPPORT
1443 scr_expose (ev->xexpose.x, ev->xexpose.y, 1386 scr_expose (ev.xexpose.x, ev.xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1387 ev.xexpose.width, ev.xexpose.height, False);
1445#else 1388#else
1446 // don't understand this, so commented it out 1389 // don't understand this, so commented it out
1447 scr_expose (ev->xexpose.x, ev->xexpose.y, 1390 scr_expose (ev.xexpose.x, ev.xexpose.y,
1448 ev->xexpose.width, ev->xexpose.height, False); 1391 ev.xexpose.width, ev.xexpose.height, False);
1449 //scr_expose (ev->xexpose.x, 0, 1392 //scr_expose (ev.xexpose.x, 0,
1450 // ev->xexpose.width, TermWin.height, False); 1393 // ev.xexpose.width, TermWin.height, False);
1451#endif 1394#endif
1452 want_refresh = 1; 1395 want_refresh = 1;
1453 } 1396 }
1454 else 1397 else
1455 { 1398 {
1456 XEvent unused_xevent; 1399 XEvent unused_event;
1457 1400
1458 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1459 Expose, 1402 Expose,
1460 &unused_xevent)) ; 1403 &unused_event)) ;
1461 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1462 GraphicsExpose, 1405 GraphicsExpose,
1463 &unused_xevent)) ; 1406 &unused_event)) ;
1464 if (isScrollbarWindow(ev->xany.window)) 1407 if (isScrollbarWindow (ev.xany.window))
1465 { 1408 {
1466 scrollBar.setIdle(); 1409 scrollBar.setIdle ();
1467 scrollbar_show (0); 1410 scrollbar_show (0);
1468 } 1411 }
1469#ifdef MENUBAR 1412#ifdef MENUBAR
1470 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1471 menubar_expose (); 1414 menubar_expose ();
1472#endif 1415#endif
1473#ifdef RXVT_GRAPHICS
1474 Gr_expose (ev->xany.window);
1475#endif
1476
1477 } 1416 }
1478 break; 1417 break;
1479 1418
1480 case MotionNotify: 1419 case MotionNotify:
1481#ifdef POINTER_BLANK 1420#ifdef POINTER_BLANK
1482 if (hidden_pointer) 1421 if (hidden_pointer)
1483 pointer_unblank (); 1422 pointer_unblank ();
1484#endif 1423#endif
1485#if MENUBAR 1424#if MENUBAR
1486 if (isMenuBarWindow(ev->xany.window)) 1425 if (isMenuBarWindow (ev.xany.window))
1487 { 1426 {
1488 menubar_control (&(ev->xbutton)); 1427 menubar_control (ev.xbutton);
1489 break; 1428 break;
1490 } 1429 }
1491#endif 1430#endif
1492 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1431 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1493 break; 1432 break;
1494 1433
1495 if (ev->xany.window == TermWin.vt) 1434 if (ev.xany.window == TermWin.vt)
1496 { 1435 {
1497 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1436 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1498 { 1437 {
1499 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1438 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1500 MotionNotify, ev)) ; 1439 ;
1440
1501 XQueryPointer(Xdisplay, TermWin.vt, 1441 XQueryPointer (display->display, TermWin.vt,
1502 &unused_root, &unused_child, 1442 &unused_root, &unused_child,
1503 &unused_root_x, &unused_root_y, 1443 &unused_root_x, &unused_root_y,
1504 &(ev->xbutton.x), &(ev->xbutton.y), 1444 & (ev.xbutton.x), & (ev.xbutton.y),
1505 &unused_mask); 1445 &unused_mask);
1506#ifdef MOUSE_THRESHOLD 1446#ifdef MOUSE_THRESHOLD
1507 /* deal with a `jumpy' mouse */ 1447 /* deal with a `jumpy' mouse */
1508 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1448 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1509 { 1449 {
1510#endif 1450#endif
1511 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1451 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1512 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1452 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1513#ifdef SELECTION_SCROLLING 1453#ifdef SELECTION_SCROLLING
1514 if (ev->xbutton.y < TermWin.int_bwidth 1454 if (ev.xbutton.y < TermWin.int_bwidth
1515 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1516 { 1456 {
1517 int dist; 1457 int dist;
1518 1458
1519 pending_scroll_selection=1; 1459 pending_scroll_selection=1;
1520 1460
… …
1525 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1526 1466
1527 /* save the event params so we can highlight 1467 /* save the event params so we can highlight
1528 * the selection in the pending-scroll loop 1468 * the selection in the pending-scroll loop
1529 */ 1469 */
1530 selection_save_x=ev->xbutton.x; 1470 selection_save_x=ev.xbutton.x;
1531 selection_save_y=ev->xbutton.y; 1471 selection_save_y=ev.xbutton.y;
1532 selection_save_state= 1472 selection_save_state=
1533 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1473 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1534 1474
1535 /* calc number of lines to scroll */ 1475 /* calc number of lines to scroll */
1536 if (ev->xbutton.y<TermWin.int_bwidth) 1476 if (ev.xbutton.y<TermWin.int_bwidth)
1537 { 1477 {
1538 scroll_selection_dir = UP; 1478 scroll_selection_dir = UP;
1539 dist = TermWin.int_bwidth - ev->xbutton.y; 1479 dist = TermWin.int_bwidth - ev.xbutton.y;
1540 } 1480 }
1541 else 1481 else
1542 { 1482 {
1543 scroll_selection_dir = DN; 1483 scroll_selection_dir = DN;
1544 dist = ev->xbutton.y - 1484 dist = ev.xbutton.y -
1545 (TermWin.int_bwidth + TermWin.height); 1485 (TermWin.int_bwidth + TermWin.height);
1546 } 1486 }
1547 scroll_selection_lines=(Pixel2Height(dist)/ 1487 scroll_selection_lines= (Pixel2Height (dist)/
1548 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1488 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1549 MIN_IT(scroll_selection_lines, 1489 MIN_IT (scroll_selection_lines,
1550 SELECTION_SCROLL_MAX_LINES); 1490 SELECTION_SCROLL_MAX_LINES);
1551 } 1491 }
1552 else 1492 else
1553 { 1493 {
1554 /* we are within the text window, so we 1494 /* we are within the text window, so we
… …
1562 } 1502 }
1563#endif 1503#endif
1564 1504
1565 } 1505 }
1566 } 1506 }
1567 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1507 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1568 { 1508 {
1569 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1509 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1570 MotionNotify, ev)) ; 1510 MotionNotify, &ev)) ;
1571 XQueryPointer(Xdisplay, scrollBar.win, 1511 XQueryPointer (display->display, scrollBar.win,
1572 &unused_root, &unused_child, 1512 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1513 &unused_root_x, &unused_root_y,
1574 &(ev->xbutton.x), &(ev->xbutton.y), 1514 & (ev.xbutton.x), & (ev.xbutton.y),
1575 &unused_mask); 1515 &unused_mask);
1576 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1516 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1577 scrollbar_size()); 1517 scrollbar_size ());
1578 scr_refresh (refresh_type); 1518 scr_refresh (refresh_type);
1579 refresh_limit = 0; 1519 refresh_limit = 0;
1580 scrollbar_show (1); 1520 scrollbar_show (1);
1581 } 1521 }
1582 break; 1522 break;
1583 } 1523 }
1584} 1524}
1585 1525
1586void 1526void
1527rxvt_term::rootwin_cb (XEvent &ev)
1528{
1529 SET_R (this);
1530 SET_LOCALE (locale);
1531
1532 switch (ev.type)
1533 {
1534 case PropertyNotify:
1535 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1536 {
1537 if (ev.xproperty.state == PropertyNewValue)
1538 selection_property (ev.xproperty.window, ev.xproperty.atom);
1539 break;
1540 }
1541#ifdef TRANSPARENT
1542 else
1543 {
1544 /*
1545 * if user used some Esetroot compatible prog to set the root bg,
1546 * use the property to determine the pixmap. We use it later on.
1547 */
1548 if (xa[XA_XROOTPMAPID] == 0)
1549 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1550
1551 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1552 return;
1553 }
1554
1555 /* FALLTHROUGH */
1556 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ())
1558 if (am_transparent)
1559 want_full_refresh = 1;
1560 break;
1561#endif
1562 }
1563}
1564
1565void
1587rxvt_term::button_press (XButtonEvent *ev) 1566rxvt_term::button_press (XButtonEvent &ev)
1588{ 1567{
1589 int reportmode = 0, clickintime; 1568 int reportmode = 0, clickintime;
1590 1569
1591 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1571 if (!bypass_keystate)
1593 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1572 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1594 /* 1573 /*
1595 * VT window processing of button press 1574 * VT window processing of button press
1596 */ 1575 */
1597 if (ev->window == TermWin.vt) 1576 if (ev.window == TermWin.vt)
1598 { 1577 {
1599#if RXVT_GRAPHICS
1600 if (ev->subwindow != None)
1601 rxvt_Gr_ButtonPress (ev->x, ev->y);
1602 else
1603#endif
1604
1605 {
1606 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1578 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1579 if (reportmode)
1580 {
1581 /* mouse report from vt window */
1582 /* save the xbutton state (for ButtonRelease) */
1583 MEvent.state = ev.state;
1584#ifdef MOUSE_REPORT_DOUBLECLICK
1585 if (ev.button == MEvent.button && clickintime)
1608 { 1586 {
1609 /* mouse report from vt window */ 1587 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1588 MEvent.clicks++;
1611 MEvent.state = ev->state; 1589 if (MEvent.clicks > 1)
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev->button == MEvent.button && clickintime)
1614 { 1590 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1591 /* only report double clicks */
1620 MEvent.clicks = 2; 1592 MEvent.clicks = 2;
1621 mouse_report (ev); 1593 mouse_report (ev);
1622 1594
1623 /* don't report the release */ 1595 /* don't report the release */
1624 MEvent.clicks = 0; 1596 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1597 MEvent.button = AnyButton;
1626 }
1627 } 1598 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev->button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev->button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 } 1599 }
1641 else 1600 else
1642 { 1601 {
1643 if (ev->button != MEvent.button) 1602 /* different button, or time expired */
1644 MEvent.clicks = 0; 1603 MEvent.clicks = 1;
1604 MEvent.button = ev.button;
1605 mouse_report (ev);
1606 }
1607#else
1608 MEvent.button = ev.button;
1609 mouse_report (ev);
1610#endif /* MOUSE_REPORT_DOUBLECLICK */
1611
1612 }
1613 else
1614 {
1615 if (ev.button != MEvent.button)
1616 MEvent.clicks = 0;
1645 switch (ev->button) 1617 switch (ev.button)
1646 { 1618 {
1647 case Button1: 1619 case Button1:
1648 /* allow shift+left click to extend selection */ 1620 /* allow shift+left click to extend selection */
1649 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1621 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1622 {
1651 if (MEvent.button == Button1 && clickintime) 1623 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev->x, ev->y); 1624 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev->x, ev->y, 1);
1655 }
1656 else 1625 else
1657 { 1626 selection_extend (ev.x, ev.y, 1);
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev->x, ev->y);
1664 } 1627 }
1665 1628 else
1666 MEvent.button = Button1;
1667 break; 1629 {
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1630 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev->x, ev->y); 1631 MEvent.clicks++;
1672 else 1632 else
1633 MEvent.clicks = 1;
1634
1635 selection_click (MEvent.clicks, ev.x, ev.y);
1636 }
1637
1638 MEvent.button = Button1;
1639 break;
1640
1641 case Button3:
1642 if (MEvent.button == Button3 && clickintime)
1643 selection_rotate (ev.x, ev.y);
1644 else
1673 selection_extend (ev->x, ev->y, 1); 1645 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1646 MEvent.button = Button3;
1675 break; 1647 break;
1676 }
1677 } 1648 }
1649 }
1678 MEvent.time = ev->time; 1650 MEvent.time = ev.time;
1679 return; 1651 return;
1680 }
1681 } 1652 }
1682 1653
1683 /* 1654 /*
1684 * Scrollbar window processing of button press 1655 * Scrollbar window processing of button press
1685 */ 1656 */
1686 if (isScrollbarWindow(ev->window)) 1657 if (isScrollbarWindow (ev.window))
1687 { 1658 {
1688 scrollBar.setIdle (); 1659 scrollBar.setIdle ();
1689 /* 1660 /*
1690 * Rxvt-style scrollbar: 1661 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider 1662 * move up if mouse is above slider
… …
1703 * Mouse report disabled scrollbar: 1674 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down 1675 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down 1676 * click on scrollbar - send pageup/down
1706 */ 1677 */
1707 if ((scrollBar.style == R_SB_NEXT 1678 if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_upButton(ev->y)) 1679 && scrollbarnext_upButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1680 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton(ev->y))) 1681 && scrollbarrxvt_upButton (ev.y)))
1711 tt_printf("\033[A"); 1682 tt_printf ("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT 1683 else if ((scrollBar.style == R_SB_NEXT
1713 && scrollbarnext_dnButton(ev->y)) 1684 && scrollbarnext_dnButton (ev.y))
1714 || (scrollBar.style == R_SB_RXVT 1685 || (scrollBar.style == R_SB_RXVT
1715 && scrollbarrxvt_dnButton(ev->y))) 1686 && scrollbarrxvt_dnButton (ev.y)))
1716 tt_printf("\033[B"); 1687 tt_printf ("\033[B");
1717 else 1688 else
1718 switch (ev->button) 1689 switch (ev.button)
1719 { 1690 {
1720 case Button2: 1691 case Button2:
1721 tt_printf("\014"); 1692 tt_printf ("\014");
1722 break; 1693 break;
1723 case Button1: 1694 case Button1:
1724 tt_printf("\033[6~"); 1695 tt_printf ("\033[6~");
1725 break; 1696 break;
1726 case Button3: 1697 case Button3:
1727 tt_printf("\033[5~"); 1698 tt_printf ("\033[5~");
1728 break; 1699 break;
1729 } 1700 }
1730 } 1701 }
1731 else 1702 else
1732#endif /* NO_SCROLLBAR_REPORT */ 1703#endif /* NO_SCROLLBAR_REPORT */
… …
1734 { 1705 {
1735 char upordown = 0; 1706 char upordown = 0;
1736 1707
1737 if (scrollBar.style == R_SB_NEXT) 1708 if (scrollBar.style == R_SB_NEXT)
1738 { 1709 {
1739 if (scrollbarnext_upButton(ev->y)) 1710 if (scrollbarnext_upButton (ev.y))
1740 upordown = -1; /* up */ 1711 upordown = -1; /* up */
1741 else if (scrollbarnext_dnButton(ev->y)) 1712 else if (scrollbarnext_dnButton (ev.y))
1742 upordown = 1; /* down */ 1713 upordown = 1; /* down */
1743 } 1714 }
1744 else if (scrollBar.style == R_SB_RXVT) 1715 else if (scrollBar.style == R_SB_RXVT)
1745 { 1716 {
1746 if (scrollbarrxvt_upButton(ev->y)) 1717 if (scrollbarrxvt_upButton (ev.y))
1747 upordown = -1; /* up */ 1718 upordown = -1; /* up */
1748 else if (scrollbarrxvt_dnButton(ev->y)) 1719 else if (scrollbarrxvt_dnButton (ev.y))
1749 upordown = 1; /* down */ 1720 upordown = 1; /* down */
1750 } 1721 }
1751 if (upordown) 1722 if (upordown)
1752 { 1723 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1724#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1760 else 1731 else
1761 scrollBar.setDn (); 1732 scrollBar.setDn ();
1762 } 1733 }
1763 } 1734 }
1764 else 1735 else
1765 switch (ev->button) 1736 switch (ev.button)
1766 { 1737 {
1767 case Button2: 1738 case Button2:
1768 switch (scrollbar_align) 1739 switch (scrollbar_align)
1769 { 1740 {
1770 case R_SB_ALIGN_TOP: 1741 case R_SB_ALIGN_TOP:
… …
1776 case R_SB_ALIGN_BOTTOM: 1747 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 1748 csrO = scrollBar.bot - scrollBar.top;
1778 break; 1749 break;
1779 } 1750 }
1780 if (scrollBar.style == R_SB_XTERM 1751 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider(ev->y) 1752 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider(ev->y)) 1753 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position(ev->y) - csrO, 1754 scr_move_to ( scrollbar_position (ev.y) - csrO,
1784 scrollbar_size()); 1755 scrollbar_size ());
1785 scrollBar.setMotion (); 1756 scrollBar.setMotion ();
1786 break; 1757 break;
1787 1758
1788 case Button1: 1759 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1760 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1790 csrO = ev->y - scrollBar.top; 1761 csrO = ev.y - scrollBar.top;
1791 /* FALLTHROUGH */ 1762 /* FALLTHROUGH */
1792 1763
1793 case Button3: 1764 case Button3:
1794 if (scrollBar.style != R_SB_XTERM) 1765 if (scrollBar.style != R_SB_XTERM)
1795 { 1766 {
1796 if (scrollbar_above_slider(ev->y)) 1767 if (scrollbar_above_slider (ev.y))
1797# ifdef RXVT_SCROLL_FULL 1768# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1); 1769 scr_page (UP, TermWin.nrow - 1);
1799# else 1770# else
1800 scr_page (UP, TermWin.nrow / 4); 1771 scr_page (UP, TermWin.nrow / 4);
1801# endif 1772# endif
1802 else if (scrollbar_below_slider(ev->y)) 1773 else if (scrollbar_below_slider (ev.y))
1803# ifdef RXVT_SCROLL_FULL 1774# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1); 1775 scr_page (DN, TermWin.nrow - 1);
1805# else 1776# else
1806 scr_page (DN, TermWin.nrow / 4); 1777 scr_page (DN, TermWin.nrow / 4);
1807# endif 1778# endif
1808 else 1779 else
1809 scrollBar.setMotion (); 1780 scrollBar.setMotion ();
1810 } 1781 }
1811 else 1782 else
1812 { 1783 {
1813 scr_page ((ev->button == Button1 ? DN : UP), 1784 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 1785 (TermWin.nrow
1815 * scrollbar_position(ev->y) 1786 * scrollbar_position (ev.y)
1816 / scrollbar_size())); 1787 / scrollbar_size ()));
1817 } 1788 }
1818 break; 1789 break;
1819 } 1790 }
1820 } 1791 }
1821 return; 1792 return;
1822 } 1793 }
1823#if MENUBAR 1794#if MENUBAR
1824 /* 1795 /*
1825 * Menubar window processing of button press 1796 * Menubar window processing of button press
1826 */ 1797 */
1827 if (isMenuBarWindow(ev->window)) 1798 if (isMenuBarWindow (ev.window))
1828 menubar_control (ev); 1799 menubar_control (ev);
1829#endif 1800#endif
1830} 1801}
1831 1802
1832void 1803void
1833rxvt_term::button_release (XButtonEvent *ev) 1804rxvt_term::button_release (XButtonEvent &ev)
1834{ 1805{
1835 int reportmode = 0; 1806 int reportmode = 0;
1836 1807
1837 csrO = 0; /* reset csr Offset */ 1808 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1809 if (!bypass_keystate)
1839 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1810 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1840 1811
1841 if (scrollbar_isUpDn()) 1812 if (scrollbar_isUpDn ())
1842 { 1813 {
1843 scrollBar.setIdle (); 1814 scrollBar.setIdle ();
1844 scrollbar_show (0); 1815 scrollbar_show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1816#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH; 1817 refresh_type &= ~SMOOTH_REFRESH;
… …
1848 1819
1849 } 1820 }
1850#ifdef SELECTION_SCROLLING 1821#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1822 pending_scroll_selection=0;
1852#endif 1823#endif
1853 if (ev->window == TermWin.vt) 1824 if (ev.window == TermWin.vt)
1854 { 1825 {
1855#ifdef RXVT_GRAPHICS
1856 if (ev->subwindow != None)
1857 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1858 else
1859#endif
1860
1861 {
1862 if (reportmode) 1826 if (reportmode)
1827 {
1828 /* mouse report from vt window */
1829 /* don't report release of wheel "buttons" */
1830 if (ev.button >= 4)
1831 return;
1832#ifdef MOUSE_REPORT_DOUBLECLICK
1833 /* only report the release of 'slow' single clicks */
1834 if (MEvent.button != AnyButton
1835 && (ev.button != MEvent.button
1836 || (ev.time - MEvent.time
1837 > MULTICLICK_TIME / 2)))
1863 { 1838 {
1864 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */
1866 if (ev->button >= 4)
1867 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev->button != MEvent.button
1872 || (ev->time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1874 {
1875 MEvent.clicks = 0; 1839 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 1840 MEvent.button = AnyButton;
1881 mouse_report (ev); 1841 mouse_report (ev);
1842 }
1843#else /* MOUSE_REPORT_DOUBLECLICK */
1844 MEvent.button = AnyButton;
1845 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 1846#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 1847 return;
1884 } 1848 }
1885 /* 1849 /*
1886 * dumb hack to compensate for the failure of click-and-drag 1850 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1851 * when overriding mouse reporting
1888 */ 1852 */
1889 if (PrivateModes & PrivMode_mouse_report 1853 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1854 && bypass_keystate
1891 && ev->button == Button1 && MEvent.clicks <= 1) 1855 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev->x, ev->y, 0); 1856 selection_extend (ev.x, ev.y, 0);
1893 1857
1894 switch (ev->button) 1858 switch (ev.button)
1859 {
1860 case Button1:
1861 case Button3:
1862 selection_make (ev.time);
1863 break;
1864 case Button2:
1865 selection_request (ev.time, ev.x, ev.y);
1866 break;
1867#ifdef MOUSE_WHEEL
1868 case Button4:
1869 case Button5:
1895 { 1870 {
1896 case Button1: 1871 int i;
1897 case Button3: 1872 page_dirn v;
1898 selection_make (ev->time); 1873
1874 v = (ev.button == Button4) ? UP : DN;
1875 if (ev.state & ShiftMask)
1899 break; 1876 i = 1;
1900 case Button2: 1877 else if ((Options & Opt_mouseWheelScrollPage))
1901 selection_request (ev->time, ev->x, ev->y); 1878 i = TermWin.nrow - 1;
1879 else
1902 break; 1880 i = 5;
1903#ifdef MOUSE_WHEEL 1881# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 1882 if (ev.state & ControlMask)
1905 case Button5:
1906 { 1883 {
1907 int i;
1908 page_dirn v;
1909
1910 v = (ev->button == Button4) ? UP : DN;
1911 if (ev->state & ShiftMask)
1912 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1;
1915 else
1916 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING
1918 if (ev->state & ControlMask)
1919 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1); 1884 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 } 1886 }
1923# endif 1887# endif
1924# ifdef JUMP_MOUSE_WHEEL 1888# ifdef JUMP_MOUSE_WHEEL
1889 scr_page (v, i);
1890 scr_refresh (SMOOTH_REFRESH);
1891 scrollbar_show (1);
1892# else
1893 while (i--)
1894 {
1925 scr_page (v, i); 1895 scr_page (v, 1);
1926 scr_refresh (SMOOTH_REFRESH); 1896 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 1897 scrollbar_show (1);
1928# else
1929 while (i--)
1930 {
1931 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1);
1934 } 1898 }
1935# endif 1899# endif
1936 1900
1937 }
1938 break;
1939#endif
1940
1941 } 1901 }
1902 break;
1903#endif
1904
1942 } 1905 }
1943 } 1906 }
1944#ifdef MENUBAR 1907#ifdef MENUBAR
1945 else if (isMenuBarWindow(ev->window)) 1908 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1909 menubar_control (ev);
1947#endif 1910#endif
1948} 1911}
1949 1912
1950 1913
… …
1964 Pixmap rootpixmap = None; 1927 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 1928 XWindowAttributes wattr, wrootattr;
1966 1929
1967 pchanged = 0; 1930 pchanged = 0;
1968 1931
1969 if (!(Options & Opt_transparent)) 1932 if (! (Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 1933 return pchanged; /* Don't try any more */
1971 1934
1972 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1935 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 1936 rootdepth = wrootattr.depth;
1974 1937
1975 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1976 if (rootdepth != wattr.depth) 1939 if (rootdepth != wattr.depth)
1977 { 1940 {
1978 if (am_transparent) 1941 if (am_transparent)
1979 { 1942 {
1980 pchanged = 1; 1943 pchanged = 1;
1981 XSetWindowBackground(Xdisplay, TermWin.vt, 1944 XSetWindowBackground (display->display, TermWin.vt,
1982 PixColors[Color_bg]); 1945 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 1946 am_transparent = am_pixmap_trans = 0;
1984 } 1947 }
1985 return pchanged; /* Don't try any more */ 1948 return pchanged; /* Don't try any more */
1986 } 1949 }
1987 1950
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 1951 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync(Xdisplay, False); 1952 XSync (display->display, False);
1990 1953
1991 /* 1954 /*
1992 * Make the frame window set by the window manager have 1955 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 1956 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 1957 * windows for each client, so we have to take care about that.
1995 */ 1958 */
1996 i = (xa[XA_XROOTPMAPID] != 0 1959 i = (xa[XA_XROOTPMAPID] != 0
1997 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 1962 &nitems, &bytes_after, &prop) == Success));
2000 if (!i || prop == NULL) 1963 if (!i || prop == NULL)
2001 have_pixmap = 0; 1964 have_pixmap = 0;
2002 else 1965 else
2003 { 1966 {
2004 have_pixmap = 1; 1967 have_pixmap = 1;
2005 rootpixmap = *((Pixmap *)prop); 1968 rootpixmap = * ((Pixmap *)prop);
2006 XFree(prop); 1969 XFree (prop);
2007 } 1970 }
2008 if (have_pixmap) 1971 if (have_pixmap)
2009 { 1972 {
2010 /* 1973 /*
2011 * Copy Xroot pixmap transparency 1974 * Copy display->root pixmap transparency
2012 */ 1975 */
2013 int sx, sy, nx, ny; 1976 int sx, sy, nx, ny;
2014 unsigned int nw, nh; 1977 unsigned int nw, nh;
2015 Window cr; 1978 Window cr;
2016 XImage *image; 1979 XImage *image;
2017 GC gc; 1980 GC gc;
2018 XGCValues gcvalue; 1981 XGCValues gcvalue;
2019 1982
2020 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 1984 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 1985 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 1986 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 1987 nx = ny = 0;
2025 if (sx < 0) 1988 if (sx < 0)
… …
2032 { 1995 {
2033 nh += sy; 1996 nh += sy;
2034 ny = -sy; 1997 ny = -sy;
2035 sy = 0; 1998 sy = 0;
2036 } 1999 }
2037 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 2002 allowedxerror = -1;
2040 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2041 ZPixmap); 2004 ZPixmap);
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2006 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2007 allowedxerror = 0;
2045 if (image == NULL) 2008 if (image == NULL)
… …
2047 if (am_transparent && am_pixmap_trans) 2010 if (am_transparent && am_pixmap_trans)
2048 { 2011 {
2049 pchanged = 1; 2012 pchanged = 1;
2050 if (TermWin.pixmap != None) 2013 if (TermWin.pixmap != None)
2051 { 2014 {
2052 XFreePixmap(Xdisplay, TermWin.pixmap); 2015 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 2016 TermWin.pixmap = None;
2054 } 2017 }
2055 } 2018 }
2056 am_pixmap_trans = 0; 2019 am_pixmap_trans = 0;
2057 } 2020 }
2058 else 2021 else
2059 { 2022 {
2060 if (TermWin.pixmap != None) 2023 if (TermWin.pixmap != None)
2061 XFreePixmap(Xdisplay, TermWin.pixmap); 2024 XFreePixmap (display->display, TermWin.pixmap);
2062 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width, 2026 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 2027 (unsigned int)szHint.height,
2065 (unsigned int)image->depth); 2028 (unsigned int)image->depth);
2066 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width, 2031 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 2032 (unsigned int)image->height);
2070 XFreeGC(Xdisplay, gc); 2033 XFreeGC (display->display, gc);
2071 XDestroyImage(image); 2034 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap); 2036 TermWin.pixmap);
2074 if (!am_transparent || !am_pixmap_trans) 2037 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 2038 pchanged = 1;
2076 am_transparent = am_pixmap_trans = 1; 2039 am_transparent = am_pixmap_trans = 1;
2077 } 2040 }
… …
2080 { 2043 {
2081 unsigned int n; 2044 unsigned int n;
2082 /* 2045 /*
2083 * InheritPixmap transparency 2046 * InheritPixmap transparency
2084 */ 2047 */
2085 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2087 i++) 2050 i++)
2088 { 2051 {
2089 oldp = TermWin.parent[i]; 2052 oldp = TermWin.parent[i];
2090 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2053 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2054 &TermWin.parent[i], &list, &n);
2092 XFree(list); 2055 XFree (list);
2093 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2094 if (TermWin.parent[i] == Xroot) 2057 if (TermWin.parent[i] == display->root)
2095 { 2058 {
2096 if (oldp != None) 2059 if (oldp != None)
2097 pchanged = 1; 2060 pchanged = 1;
2098 break; 2061 break;
2099 } 2062 }
… …
2103 n = 0; 2066 n = 0;
2104 if (pchanged) 2067 if (pchanged)
2105 { 2068 {
2106 for (; n < (unsigned int)i; n++) 2069 for (; n < (unsigned int)i; n++)
2107 { 2070 {
2108 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2109 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2072 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2073 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2111 { 2074 {
2112 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2076 break;
2114 } 2077 }
2115 } 2078 }
2116 } 2079 }
2117 if (n > (int)(sizeof(TermWin.parent) 2080 if (n > (int) (sizeof (TermWin.parent)
2118 / sizeof(TermWin.parent[0]))) 2081 / sizeof (TermWin.parent[0])))
2119 { 2082 {
2120 D_X((stderr, "InheritPixmap Turning off")); 2083 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2084 XSetWindowBackground (display->display, TermWin.parent[0],
2122 PixColors[Color_fg]); 2085 PixColors[Color_fg]);
2123 XSetWindowBackground(Xdisplay, TermWin.vt, 2086 XSetWindowBackground (display->display, TermWin.vt,
2124 PixColors[Color_bg]); 2087 PixColors[Color_bg]);
2125 am_transparent = 0; 2088 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2089 /* XXX: also turn off Opt_transparent? */
2127 } 2090 }
2128 else 2091 else
… …
2132# ifdef HAVE_NANOSLEEP 2095# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt; 2096 struct timespec rqt;
2134 2097
2135 rqt.tv_sec = 1; 2098 rqt.tv_sec = 1;
2136 rqt.tv_nsec = 0; 2099 rqt.tv_nsec = 0;
2137 nanosleep(&rqt, NULL); 2100 nanosleep (&rqt, NULL);
2138# else 2101# else
2139 sleep(1); 2102 sleep (1);
2140# endif 2103# endif
2141 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2105 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2144 ParentRelative); 2107 ParentRelative);
2145 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2146 ParentRelative); 2109 ParentRelative);
2147 am_transparent = 1; 2110 am_transparent = 1;
2148 } 2111 }
2149 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2113 TermWin.parent[i] = None;
2151 } 2114 }
2152 return pchanged; 2115 return pchanged;
2153} 2116}
2154#endif 2117#endif
… …
2159/*----------------------------------------------------------------------*/ 2122/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2123#ifdef PRINTPIPE
2161FILE * 2124FILE *
2162rxvt_term::popen_printer () 2125rxvt_term::popen_printer ()
2163{ 2126{
2164 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2127 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2128
2166 if (stream == NULL) 2129 if (stream == NULL)
2167 rxvt_print_error("can't open printer pipe"); 2130 rxvt_print_error ("can't open printer pipe");
2168 return stream; 2131 return stream;
2169} 2132}
2170 2133
2171int 2134int
2172rxvt_term::pclose_printer (FILE *stream) 2135rxvt_term::pclose_printer (FILE *stream)
2173{ 2136{
2174 fflush (stream); 2137 fflush (stream);
2175 /* pclose() reported not to work on SunOS 4.1.3 */ 2138 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */ 2139# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */ 2140 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */ 2141 return pclose (stream); /* return fclose (stream); */
2179# else 2142# else
2180 return pclose (stream); 2143 return pclose (stream);
… …
2203 unsigned char ch; 2166 unsigned char ch;
2204 unsigned int i, len; 2167 unsigned int i, len;
2205 2168
2206 if ((ch = cmd_getc ()) != C0_ESC) 2169 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2170 {
2208 if (putc(ch, fd) == EOF) 2171 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2172 break; /* done = 1 */
2210 } 2173 }
2211 else 2174 else
2212 { 2175 {
2213 len = 0; 2176 len = 0;
… …
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2188 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2189 break; /* done = 1 */
2227 } 2190 }
2228 } 2191 }
2229 for (i = 0; i < len; i++) 2192 for (i = 0; i < len; i++)
2230 if (putc(buf[i], fd) == EOF) 2193 if (putc (buf[i], fd) == EOF)
2231 { 2194 {
2232 done = 1; 2195 done = 1;
2233 break; 2196 break;
2234 } 2197 }
2235 } 2198 }
… …
2255{ 2218{
2256 switch (ch) 2219 switch (ch)
2257 { 2220 {
2258 case C0_ENQ: /* terminal Status */ 2221 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2222 if (rs[Rs_answerbackstring])
2260 tt_write( 2223 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2224 (const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2225 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2226 else
2264 tt_write((unsigned char *)VT100_ANS, 2227 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN(VT100_ANS)); 2228 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2229 break;
2267 case C0_BEL: /* bell */ 2230 case C0_BEL: /* bell */
2268 scr_bell (); 2231 scr_bell ();
2269 break; 2232 break;
2270 case C0_BS: /* backspace */ 2233 case C0_BS: /* backspace */
… …
2332 row = cmd_getc () - ' '; 2295 row = cmd_getc () - ' ';
2333 col = cmd_getc () - ' '; 2296 col = cmd_getc () - ' ';
2334 scr_gotorc (row, col, 0); 2297 scr_gotorc (row, col, 0);
2335 break; 2298 break;
2336 case 'Z': /* identify the terminal type */ 2299 case 'Z': /* identify the terminal type */
2337 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2300 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2338 break; 2301 break;
2339 case '<': /* turn off VT52 mode */ 2302 case '<': /* turn off VT52 mode */
2340 PrivMode(0, PrivMode_vt52); 2303 PrivMode (0, PrivMode_vt52);
2341 break; 2304 break;
2342 case 'F': /* use special graphics character set */ 2305 case 'F': /* use special graphics character set */
2343 case 'G': /* use regular character set */ 2306 case 'G': /* use regular character set */
2344 /* unimplemented */ 2307 /* unimplemented */
2345 break; 2308 break;
… …
2404 scr_forwardindex (); 2367 scr_forwardindex ();
2405 break; 2368 break;
2406#endif 2369#endif
2407 case '=': 2370 case '=':
2408 case '>': 2371 case '>':
2409 PrivMode((ch == '='), PrivMode_aplKP); 2372 PrivMode ((ch == '='), PrivMode_aplKP);
2410 break; 2373 break;
2411 2374
2412 case C1_40: 2375 case C1_40:
2413 cmd_getc (); 2376 cmd_getc ();
2414 break; 2377 break;
… …
2450 process_dcs_seq (); 2413 process_dcs_seq ();
2451 break; 2414 break;
2452 2415
2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2416 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2454 case C1_SCI: /* ESC Z */ 2417 case C1_SCI: /* ESC Z */
2455 tt_write((const unsigned char *)ESCZ_ANSWER, 2418 tt_write ((const unsigned char *)ESCZ_ANSWER,
2456 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2419 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2457 break; /* steal obsolete ESC [ c */ 2420 break; /* steal obsolete ESC [ c */
2458 2421
2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2422 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2460 case C1_CSI: /* ESC [ */ 2423 case C1_CSI: /* ESC [ */
2461 process_csi_seq (); 2424 process_csi_seq ();
… …
2501 2464
2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2465#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2466 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2467 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2505#define get_byte_array_bit(array, bit) \ 2468#define get_byte_array_bit(array, bit) \
2506 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2469 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2507 2470
2508const unsigned char csi_defaults[] = 2471const unsigned char csi_defaults[] =
2509 { 2472 {
2510 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2473 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2511 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2474 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2512 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2475 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2476 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2477 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2478 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2479 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2480 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2518 }; 2481 };
2519/* *INDENT-ON* */ 2482/* *INDENT-ON* */
2520 2483
2521void 2484void
2522rxvt_term::process_csi_seq () 2485rxvt_term::process_csi_seq ()
… …
2537 ch = cmd_getc (); 2500 ch = cmd_getc ();
2538 } 2501 }
2539 /* read any numerical arguments */ 2502 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2503 for (n = -1; ch < CSI_ICH; )
2541 { 2504 {
2542 if (isdigit(ch)) 2505 if (isdigit (ch))
2543 { 2506 {
2544 if (n < 0) 2507 if (n < 0)
2545 n = ch - '0'; 2508 n = ch - '0';
2546 else 2509 else
2547 n = n * 10 + ch - '0'; 2510 n = n * 10 + ch - '0';
… …
2573 2536
2574 if (nargs < ESC_ARGS) 2537 if (nargs < ESC_ARGS)
2575 arg[nargs++] = n; 2538 arg[nargs++] = n;
2576 2539
2577 i = ch - CSI_ICH; 2540 i = ch - CSI_ICH;
2578 ndef = get_byte_array_bit(csi_defaults, i); 2541 ndef = get_byte_array_bit (csi_defaults, i);
2579 for (p = 0; p < nargs; p++) 2542 for (p = 0; p < nargs; p++)
2580 if (arg[p] == -1) 2543 if (arg[p] == -1)
2581 arg[p] = ndef; 2544 arg[p] = ndef;
2582 2545
2583#ifdef DEBUG_CMD 2546#ifdef DEBUG_CMD
2584 fprintf(stderr, "CSI "); 2547 fprintf (stderr, "CSI ");
2585 for (p = 0; p < nargs; p++) 2548 for (p = 0; p < nargs; p++)
2586 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2549 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2587 fprintf(stderr, "%c\n", ch); 2550 fprintf (stderr, "%c\n", ch);
2588#endif 2551#endif
2589 2552
2590 /* 2553 /*
2591 * private mode handling 2554 * private mode handling
2592 */ 2555 */
… …
2594 { 2557 {
2595 switch (priv) 2558 switch (priv)
2596 { 2559 {
2597 case '>': 2560 case '>':
2598 if (ch == CSI_DA) /* secondary device attributes */ 2561 if (ch == CSI_DA) /* secondary device attributes */
2599 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2562 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2600 break; 2563 break;
2601 case '?': 2564 case '?':
2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2565 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2603 process_terminal_mode (ch, priv, nargs, arg); 2566 process_terminal_mode (ch, priv, nargs, arg);
2604 break; 2567 break;
… …
2607 } 2570 }
2608 2571
2609 switch (ch) 2572 switch (ch)
2610 { 2573 {
2611 /* 2574 /*
2612 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2575 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2613 */ 2576 */
2614#ifdef PRINTPIPE 2577#ifdef PRINTPIPE
2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2578 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2616 switch (arg[0]) 2579 switch (arg[0])
2617 { 2580 {
… …
2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2676 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2677 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2715 break; 2678 break;
2716 2679
2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2680 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2718 tt_write((const unsigned char *)VT100_ANS, 2681 tt_write ((const unsigned char *)VT100_ANS,
2719 (unsigned int)(sizeof(VT100_ANS) - 1)); 2682 (unsigned int) (sizeof (VT100_ANS) - 1));
2720 break; 2683 break;
2721 2684
2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2685 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2723 process_sgr_mode (nargs, arg); 2686 process_sgr_mode (nargs, arg);
2724 break; 2687 break;
2725 2688
2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2689 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2727 switch (arg[0]) 2690 switch (arg[0])
2728 { 2691 {
2729 case 5: /* DSR requested */ 2692 case 5: /* DSR requested */
2730 tt_printf("\033[0n"); 2693 tt_printf ("\033[0n");
2731 break; 2694 break;
2732 case 6: /* CPR requested */ 2695 case 6: /* CPR requested */
2733 scr_report_position (); 2696 scr_report_position ();
2734 break; 2697 break;
2735#if defined (ENABLE_DISPLAY_ANSWER) 2698#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2699 case 7: /* unofficial extension */
2737 tt_printf("%-.250s\n", rs[Rs_display_name]); 2700 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 2701 break;
2739#endif 2702#endif
2740 case 8: /* unofficial extension */ 2703 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2742 break; 2705 break;
… …
2813 break; 2776 break;
2814#endif 2777#endif
2815 2778
2816 case CSI_78: /* DECREQTPARM */ 2779 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 2780 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2781 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 2782 /* FALLTHROUGH */
2820 2783
2821 default: 2784 default:
2822 break; 2785 break;
2823 } 2786 }
… …
2842 { 2805 {
2843 /* 2806 /*
2844 * commands 2807 * commands
2845 */ 2808 */
2846 case 1: /* deiconify window */ 2809 case 1: /* deiconify window */
2847 XMapWindow(Xdisplay, TermWin.parent[0]); 2810 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 2811 break;
2849 case 2: /* iconify window */ 2812 case 2: /* iconify window */
2850 XIconifyWindow(Xdisplay, TermWin.parent[0], 2813 XIconifyWindow (display->display, TermWin.parent[0],
2851 DefaultScreen(Xdisplay)); 2814 DefaultScreen (display->display));
2852 break; 2815 break;
2853 case 3: /* set position (pixels) */ 2816 case 3: /* set position (pixels) */
2854 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2817 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2855 break; 2818 break;
2856 case 4: /* set size (pixels) */ 2819 case 4: /* set size (pixels) */
2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2820 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2858 break; 2821 break;
2859 case 5: /* raise window */ 2822 case 5: /* raise window */
2860 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2823 XRaiseWindow (display->display, TermWin.parent[0]);
2861 break; 2824 break;
2862 case 6: /* lower window */ 2825 case 6: /* lower window */
2863 XLowerWindow(Xdisplay, TermWin.parent[0]); 2826 XLowerWindow (display->display, TermWin.parent[0]);
2864 break; 2827 break;
2865 case 7: /* refresh window */ 2828 case 7: /* refresh window */
2866 scr_touch (true); 2829 scr_touch (true);
2867 break; 2830 break;
2868 case 8: /* set size (chars) */ 2831 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int)(args[1] * TermWin.fheight)); 2833 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 2834 break;
2872 default: 2835 default:
2873 if (args[0] >= 24) /* set height (chars) */ 2836 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 2837 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int)(args[1] * TermWin.fheight)); 2838 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 2839 break;
2877 /* 2840 /*
2878 * reports - some output format copied from XTerm 2841 * reports - some output format copied from XTerm
2879 */ 2842 */
2880 case 11: /* report window state */ 2843 case 11: /* report window state */
2881 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 2846 break;
2884 case 13: /* report window position */ 2847 case 13: /* report window position */
2885 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 2850 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 2851 &x, &y, &wdummy);
2889 tt_printf("\033[3;%d;%dt", x, y); 2852 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 2853 break;
2891 case 14: /* report window size (pixels) */ 2854 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 2857 break;
2895 case 18: /* report window size (chars) */ 2858 case 18: /* report window size (chars) */
2896 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 2860 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 2861#if 0 /* XXX: currently disabled due to security concerns */
2899 case 20: /* report icon label */ 2862 case 20: /* report icon label */
2900 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2863 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2902 break; 2865 break;
2903 case 21: /* report window title */ 2866 case 21: /* report window title */
2904 XFetchName(Xdisplay, TermWin.parent[0], &s); 2867 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2906 break; 2869 break;
2907#endif 2870#endif
2908 2871
2909 } 2872 }
2910} 2873}
2911#endif 2874#endif
2912 2875
2913/*----------------------------------------------------------------------*/ 2876/*----------------------------------------------------------------------*/
2914/* 2877/*
2915 * get input up until STRING TERMINATOR (or BEL) 2878 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free()d 2879 * ends_how is terminator used. returned input must be free ()d
2917 */ 2880 */
2918unsigned char * 2881unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 2882rxvt_term::get_to_st (unsigned char *ends_how)
2920{ 2883{
2921 int seen_esc = 0; /* seen escape? */ 2884 int seen_esc = 0; /* seen escape? */
… …
2936 } 2899 }
2937 else if (ch == '\t') 2900 else if (ch == '\t')
2938 ch = ' '; /* translate '\t' to space */ 2901 ch = ' '; /* translate '\t' to space */
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2940 return NULL; /* other control character - exit */ 2903 return NULL; /* other control character - exit */
2941 if (n < sizeof(string) - 1) 2904 if (n < sizeof (string) - 1)
2942 string[n++] = ch; 2905 string[n++] = ch;
2943 seen_esc = 0; 2906 seen_esc = 0;
2944 } 2907 }
2945 string[n++] = '\0'; 2908 string[n++] = '\0';
2946 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 2910 return NULL;
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2911 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY(s, string, n); 2912 STRNCPY (s, string, n);
2950 return s; 2913 return s;
2951} 2914}
2952 2915
2953/*----------------------------------------------------------------------*/ 2916/*----------------------------------------------------------------------*/
2954/* 2917/*
… …
2961 /* 2924 /*
2962 * Not handled yet 2925 * Not handled yet
2963 */ 2926 */
2964 s = get_to_st (&eh); 2927 s = get_to_st (&eh);
2965 if (s) 2928 if (s)
2966 free(s); 2929 free (s);
2967 return; 2930 return;
2968} 2931}
2969 2932
2970/*----------------------------------------------------------------------*/ 2933/*----------------------------------------------------------------------*/
2971/* 2934/*
… …
2976{ 2939{
2977 unsigned char ch, eh, *s; 2940 unsigned char ch, eh, *s;
2978 int arg; 2941 int arg;
2979 2942
2980 ch = cmd_getc (); 2943 ch = cmd_getc ();
2981 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2944 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 2945 arg = arg * 10 + (ch - '0');
2983 2946
2984 if (ch == ';') 2947 if (ch == ';')
2985 { 2948 {
2986 s = get_to_st (&eh); 2949 s = get_to_st (&eh);
2987 if (s) 2950 if (s)
2988 { 2951 {
2989 /* 2952 /*
2990 * rxvt_menubar_dispatch() violates the constness of the string, 2953 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here 2954 * so do it here
2992 */ 2955 */
2993 if (arg == XTerm_Menu) 2956 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */ 2957#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s); 2958 menubar_dispatch ((char *)s);
2996#else 2959#else
2997 (void)0; 2960 (void)0;
2998#endif 2961#endif
2999 else 2962 else
3000 xterm_seq (arg, (char *)s, eh); 2963 xterm_seq (arg, (char *)s, eh);
3001 free(s); 2964 free (s);
3002 } 2965 }
3003 } 2966 }
3004} 2967}
3005/* 2968/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3015 * 19 = change underlined character color 2978 * 19 = change underlined character color
3016 * 46 = change logfile (not implemented) 2979 * 46 = change logfile (not implemented)
3017 * 50 = change font 2980 * 50 = change font
3018 * 2981 *
3019 * rxvt extensions: 2982 * rxvt extensions:
2983 * 9 = change locale (NYI)
3020 * 10 = menu (may change in future) 2984 * 10 = menu (may change in future)
3021 * 20 = bg pixmap 2985 * 20 = bg pixmap
3022 * 39 = change default fg color 2986 * 39 = change default fg color
3023 * 49 = change default bg color 2987 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 2988 * 55 = dump scrollback buffer and all of screen
3025 */ 2989 */
3026void 2990void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2991rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3028{ 2992{
3029 int changed = 0; 2993 int changed = 0;
3030 int color; 2994 int color;
3031 char *buf, *name; 2995 char *buf, *name;
3032 2996
3033 assert(str != NULL); 2997 assert (str != NULL);
3034 switch (op) 2998 switch (op)
3035 { 2999 {
3036 case XTerm_name: 3000 case XTerm_name:
3037 set_title (str); 3001 set_title (str);
3038 /* FALLTHROUGH */ 3002 /* FALLTHROUGH */
… …
3043 set_title (str); 3007 set_title (str);
3044 break; 3008 break;
3045 case XTerm_Color: 3009 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3010 for (buf = (char *)str; buf && *buf;)
3047 { 3011 {
3048 if ((name = STRCHR(buf, ';')) == NULL) 3012 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 3013 break;
3050 *name++ = '\0'; 3014 *name++ = '\0';
3051 color = atoi(buf); 3015 color = atoi (buf);
3052 if (color < 0 || color >= TOTAL_COLORS) 3016 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 3017 break;
3054 if ((buf = STRCHR(name, ';')) != NULL) 3018 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 3019 *buf++ = '\0';
3056 set_window_color (color + minCOLOR, name); 3020 set_window_color (color + minCOLOR, name);
3057 } 3021 }
3058 break; 3022 break;
3059#ifndef NO_CURSORCOLOR 3023#ifndef NO_CURSORCOLOR
… …
3076 break; 3040 break;
3077#endif 3041#endif
3078 3042
3079 case XTerm_Menu: 3043 case XTerm_Menu:
3080 /* 3044 /*
3081 * rxvt_menubar_dispatch() violates the constness of the string, 3045 * rxvt_menubar_dispatch () violates the constness of the string,
3082 * so DON'T do it here 3046 * so DON'T do it here
3083 */ 3047 */
3084 break; 3048 break;
3085 case XTerm_Pixmap: 3049 case XTerm_Pixmap:
3086 if (*str != ';') 3050 if (*str != ';')
… …
3089 scale_pixmap (""); /* reset to default scaling */ 3053 scale_pixmap (""); /* reset to default scaling */
3090 set_bgPixmap (str); /* change pixmap */ 3054 set_bgPixmap (str); /* change pixmap */
3091#endif 3055#endif
3092 scr_touch (true); 3056 scr_touch (true);
3093 } 3057 }
3094 while ((str = STRCHR(str, ';')) != NULL) 3058 while ((str = STRCHR (str, ';')) != NULL)
3095 { 3059 {
3096 str++; 3060 str++;
3097#if XPM_BACKGROUND 3061#if XPM_BACKGROUND
3098 changed += scale_pixmap (str); 3062 changed += scale_pixmap (str);
3099#endif 3063#endif
… …
3115 set_window_color (Color_bg, str); 3079 set_window_color (Color_bg, str);
3116 break; 3080 break;
3117 case XTerm_logfile: 3081 case XTerm_logfile:
3118 break; 3082 break;
3119 case XTerm_font: 3083 case XTerm_font:
3120 change_font (0, str); 3084 change_font (str);
3085 break;
3086 case XTerm_locale:
3087 if (str[0] == '?' && !str[1])
3088 tt_printf ("%-.250s\n", locale);
3089 else
3090 {
3091 set_locale (str);
3092 im_cb ();
3093 }
3121 break; 3094 break;
3122#if 0 3095#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3096 case XTerm_dumpscreen: /* no error notices */
3124 { 3097 {
3125 int fd; 3098 int fd;
3126 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3099 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3100 {
3128 scr_dump (fd); 3101 scr_dump (fd);
3129 close(fd); 3102 close (fd);
3130 } 3103 }
3131 } 3104 }
3132 break; 3105 break;
3133#endif 3106#endif
3134 3107
… …
3159 else 3132 else
3160 { 3133 {
3161 if (mode == 'r') 3134 if (mode == 'r')
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3136 else
3164 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode(state, bit); 3138 PrivMode (state, bit);
3166 } 3139 }
3167 return state; 3140 return state;
3168} 3141}
3169 3142
3170/* we're not using priv _yet_ */ 3143/* we're not using priv _yet_ */
3171void 3144void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3145rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3146{
3174 unsigned int i, j; 3147 unsigned int i, j;
3175 int state; 3148 int state;
3176 static const struct 3149 static const struct
3177 { 3150 {
… …
3220 for (i = 0; i < nargs; i++) 3193 for (i = 0; i < nargs; i++)
3221 { 3194 {
3222 state = -1; 3195 state = -1;
3223 3196
3224 /* basic handling */ 3197 /* basic handling */
3225 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3198 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3226 if (argtopriv[j].argval == arg[i]) 3199 if (argtopriv[j].argval == arg[i])
3227 { 3200 {
3228 state = privcases (mode, argtopriv[j].bit); 3201 state = privcases (mode, argtopriv[j].bit);
3229 break; 3202 break;
3230 } 3203 }
… …
3238 scr_cursor (RESTORE); 3211 scr_cursor (RESTORE);
3239 else if (mode == 1) 3212 else if (mode == 1)
3240 scr_cursor (SAVE); 3213 scr_cursor (SAVE);
3241 /* FALLTHROUGH */ 3214 /* FALLTHROUGH */
3242 default: 3215 default:
3243 continue; /* for(;i;) */ 3216 continue; /* for (;i;) */
3244 } 3217 }
3245 3218
3246 /* extra handling for values with valid 0 or 1 state */ 3219 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i]) 3220 switch (arg[i])
3248 { 3221 {
… …
3250 case 2: /* VT52 mode */ 3223 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset 3224 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from 3225 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode 3226 * within VT52 mode
3254 */ 3227 */
3255 PrivMode(1, PrivMode_vt52); 3228 PrivMode (1, PrivMode_vt52);
3256 break; 3229 break;
3257 case 3: /* 80/132 */ 3230 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3231 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3260 (unsigned int)TermWin.height); 3233 (unsigned int)TermWin.height);
3261 break; 3234 break;
3262 case 4: /* smooth scrolling */ 3235 case 4: /* smooth scrolling */
3263 if (state) 3236 if (state)
3264 Options &= ~Opt_jumpScroll; 3237 Options &= ~Opt_jumpScroll;
… …
3275 scr_autowrap (state); 3248 scr_autowrap (state);
3276 break; 3249 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3250 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3251 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3252 if (state) /* orthogonal */
3280 PrivateModes &= ~(PrivMode_MouseX11); 3253 PrivateModes &= ~ (PrivMode_MouseX11);
3281 break; 3254 break;
3282#ifdef menuBar_esc 3255#ifdef menuBar_esc
3283 case menuBar_esc: 3256 case menuBar_esc:
3284#ifdef MENUBAR 3257#ifdef MENUBAR
3285 map_menuBar (state); 3258 map_menuBar (state);
… …
3305 break; 3278 break;
3306 /* case 66: - application key pad */ 3279 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3280 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3281 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3282 if (state) /* orthogonal */
3310 PrivateModes &= ~(PrivMode_MouseX10); 3283 PrivateModes &= ~ (PrivMode_MouseX10);
3311 break; 3284 break;
3312#if 0 3285#if 0
3313 case 1001: 3286 case 1001:
3314 break; /* X11 mouse highlighting */ 3287 break; /* X11 mouse highlighting */
3315#endif 3288#endif
… …
3385 break; 3358 break;
3386 } 3359 }
3387 if (rendset != -1) 3360 if (rendset != -1)
3388 { 3361 {
3389 scr_rendition (rendset, rendstyle); 3362 scr_rendition (rendset, rendstyle);
3390 continue; /* for(;i;) */ 3363 continue; /* for (;i;) */
3391 } 3364 }
3392 3365
3393 switch (arg[i]) 3366 switch (arg[i])
3394 { 3367 {
3395 case 30: 3368 case 30:
… …
3398 case 33: 3371 case 33:
3399 case 34: 3372 case 34:
3400 case 35: 3373 case 35:
3401 case 36: 3374 case 36:
3402 case 37: 3375 case 37:
3403 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3404 Color_fg); 3377 Color_fg);
3405 break; 3378 break;
3406#ifdef TTY_256COLOR 3379#ifdef TTY_256COLOR
3407 case 38: 3380 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3381 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3382 {
3410 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3411 Color_fg); 3384 Color_fg);
3412 i += 2; 3385 i += 2;
3413 } 3386 }
3414 break; 3387 break;
3415#endif 3388#endif
… …
3423 case 43: 3396 case 43:
3424 case 44: 3397 case 44:
3425 case 45: 3398 case 45:
3426 case 46: 3399 case 46:
3427 case 47: 3400 case 47:
3428 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3429 Color_bg); 3402 Color_bg);
3430 break; 3403 break;
3431#ifdef TTY_256COLOR 3404#ifdef TTY_256COLOR
3432 case 48: 3405 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3406 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3407 {
3435 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3436 Color_bg); 3409 Color_bg);
3437 i += 2; 3410 i += 2;
3438 } 3411 }
3439 break; 3412 break;
3440#endif 3413#endif
… …
3449 case 93: 3422 case 93:
3450 case 94: 3423 case 94:
3451 case 95: 3424 case 95:
3452 case 96: 3425 case 96:
3453 case 97: 3426 case 97:
3454 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3427 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3455 Color_fg); 3428 Color_fg);
3456 break; 3429 break;
3457 case 100: 3430 case 100:
3458 case 101: /* set bright bg color */ 3431 case 101: /* set bright bg color */
3459 case 102: 3432 case 102:
3460 case 103: 3433 case 103:
3461 case 104: 3434 case 104:
3462 case 105: 3435 case 105:
3463 case 106: 3436 case 106:
3464 case 107: 3437 case 107:
3465 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3438 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3466 Color_bg); 3439 Color_bg);
3467 break; 3440 break;
3468#endif 3441#endif
3469 3442
3470 } 3443 }
… …
3476void 3449void
3477rxvt_term::process_graphics () 3450rxvt_term::process_graphics ()
3478{ 3451{
3479 unsigned char ch, cmd = cmd_getc (); 3452 unsigned char ch, cmd = cmd_getc ();
3480 3453
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3454 if (cmd == 'Q')
3483 { /* query graphics */ 3455 { /* query graphics */
3484 tt_printf("\033G0\n"); /* no graphics */ 3456 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3457 return;
3486 } 3458 }
3487 /* swallow other graphics sequences until terminating ':' */ 3459 /* swallow other graphics sequences until terminating ':' */
3488 do 3460 do
3489 ch = cmd_getc (); 3461 ch = cmd_getc ();
3490 while (ch != ':'); 3462 while (ch != ':');
3491#else
3492 unsigned int nargs;
3493 int args[NGRX_PTS];
3494 unsigned char *text = NULL;
3495
3496 if (cmd == 'Q')
3497 { /* query graphics */
3498 tt_printf("\033G1\n"); /* yes, graphics (color) */
3499 return;
3500 }
3501 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3502 {
3503 int neg;
3504
3505 ch = cmd_getc ();
3506 neg = (ch == '-');
3507 if (neg || ch == '+')
3508 ch = cmd_getc ();
3509
3510 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg)
3513 args[nargs] = -args[nargs];
3514
3515 nargs++;
3516 args[nargs] = 0;
3517 if (ch != ';')
3518 break;
3519 }
3520
3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3523 int i, len = args[4];
3524
3525 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3526
3527 if (text != NULL)
3528 {
3529 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc ();
3531 text[len] = '\0';
3532 }
3533 }
3534 Gr_do_graphics (cmd, nargs, args, text);
3535#endif
3536} 3463}
3537/*}}} */ 3464/*}}} */
3538 3465
3539/* ------------------------------------------------------------------------- */ 3466/* ------------------------------------------------------------------------- */
3540 3467
3541/* 3468/*
3542 * Send printf() formatted output to the command. 3469 * Send printf () formatted output to the command.
3543 * Only use for small amounts of data. 3470 * Only use for small amounts of data.
3544 */ 3471 */
3545void 3472void
3546rxvt_term::tt_printf (const char *fmt,...) 3473rxvt_term::tt_printf (const char *fmt,...)
3547{ 3474{

Diff Legend

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