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.28 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.28 2004/01/16 22:11:09 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
53#include <wchar.h> 52#include <wchar.h>
54 53
55/*----------------------------------------------------------------------*/ 54/*----------------------------------------------------------------------*/
56 55
57/*{{{ Convert the keypress event into a string */ 56/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 57void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 58rxvt_term::lookup_key (XKeyEvent &ev)
61{ 59{
62 int ctrl, meta, shft, len; 60 int ctrl, meta, shft, len;
63 unsigned int newlen; 61 unsigned int newlen;
64 KeySym keysym; 62 KeySym keysym;
65#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
67#endif 65#endif
68 int valid_keysym; 66 int valid_keysym;
69 unsigned char kbuf[KBUFSZ]; 67 unsigned char kbuf[KBUFSZ];
70 68
71/* 69 /*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
74 * 72 *
75 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
76 */ 74 */
77 shft = (ev->state & ShiftMask); 75 shft = (ev.state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 76 ctrl = (ev.state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 77 meta = (ev.state & ModMetaMask);
80 78
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 79 if (numlock_state || (ev.state & ModNumLockMask))
82 { 80 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 81 numlock_state = (ev.state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!numlock_state), PrivMode_aplKP);
85 } 83 }
86 84
87 kbuf[0] = 0; 85 kbuf[0] = 0;
88 86
89#ifdef USE_XIM 87#ifdef USE_XIM
90 if (R->Input_Context) 88 if (Input_Context)
91 { 89 {
92 Status status_return; 90 Status status_return;
93 91
94#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 93 if (enc_utf8 && 0)
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 95 KBUFSZ, &keysym, &status_return);
98 else 96 else
99#endif 97#endif
98
100 { 99 {
101 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
102 101
103 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 110 SET_LOCALE (locale);
112 111
113 if (status_return == XLookupChars 112 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
115 { 114 {
116 wkbuf[len] = 0; 115 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0) 117 if (len < 0)
119 len = 0; 118 len = 0;
120 } 119 }
121 else 120 else
122 len = 0; 121 len = 0;
123 } 122 }
124 123
125 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
126 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
127 } 126 }
128 else 127 else
129#endif 128#endif
129
130 { 130 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 132 valid_keysym = !len;
133 } 133 }
134 134
135 if (valid_keysym) 135 if (valid_keysym)
136 { 136 {
137/* for some backwards compatibility */ 137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
140 if (ctrl) 140 if (ctrl)
141# else 141# else
142 if (meta) 142 if (meta)
143# endif 143# endif
144 { 144 {
145 if (keysym == R->ks_bigfont) 145 if (keysym == ks_bigfont)
146 { 146 {
147 rxvt_change_font(aR_ 0, FONT_UP); 147 change_font (0, FONT_UP);
148 return; 148 return;
149 } 149 }
150 else if (keysym == R->ks_smallfont) 150 else if (keysym == ks_smallfont)
151 { 151 {
152 rxvt_change_font(aR_ 0, FONT_DN); 152 change_font (0, FONT_DN);
153 return; 153 return;
154 }
154 } 155 }
155 }
156#endif 156#endif
157 157
158 if (R->TermWin.saveLines) { 158 if (TermWin.saveLines)
159 {
159#ifdef UNSHIFTED_SCROLLKEYS 160#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) { 161 if (!ctrl && !meta)
162 {
161#else 163#else
162 if (IS_SCROLL_MOD) { 164 if (IS_SCROLL_MOD)
165 {
163#endif 166#endif
164 int lnsppg; 167 int lnsppg;
165 168
166#ifdef PAGING_CONTEXT_LINES 169#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
168#else 171#else
169 lnsppg = R->TermWin.nrow * 4 / 5; 172 lnsppg = TermWin.nrow * 4 / 5;
170#endif 173#endif
171 if (keysym == XK_Prior) { 174 if (keysym == XK_Prior)
172 rxvt_scr_page(aR_ UP, lnsppg); 175 {
173 return; 176 scr_page (UP, lnsppg);
177 return;
178 }
174 } else if (keysym == XK_Next) { 179 else if (keysym == XK_Next)
175 rxvt_scr_page(aR_ DN, lnsppg); 180 {
176 return; 181 scr_page (DN, lnsppg);
177 } 182 return;
178 } 183 }
184 }
179#ifdef SCROLL_ON_UPDOWN_KEYS 185#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) { 186 if (IS_SCROLL_MOD)
181 if (keysym == XK_Up) { 187 {
182 rxvt_scr_page(aR_ UP, 1); 188 if (keysym == XK_Up)
183 return; 189 {
190 scr_page (UP, 1);
191 return;
192 }
184 } else if (keysym == XK_Down) { 193 else if (keysym == XK_Down)
185 rxvt_scr_page(aR_ DN, 1); 194 {
186 return; 195 scr_page (DN, 1);
187 } 196 return;
188 } 197 }
198 }
189#endif 199#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS 200#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) { 201 if (IS_SCROLL_MOD)
192 if (keysym == XK_Home) { 202 {
193 rxvt_scr_move_to(aR_ 0, 1); 203 if (keysym == XK_Home)
194 return; 204 {
205 scr_move_to (0, 1);
206 return;
207 }
195 } else if (keysym == XK_End) { 208 else if (keysym == XK_End)
196 rxvt_scr_move_to(aR_ 1, 0); 209 {
197 return; 210 scr_move_to (1, 0);
198 } 211 return;
199 } 212 }
213 }
200#endif 214#endif
201 }
202 215
203 if (shft) { 216 }
217
218 if (shft)
219 {
204 /* Shift + F1 - F10 generates F11 - F20 */ 220 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) { 221 if (keysym >= XK_F1 && keysym <= XK_F10)
222 {
206 keysym += (XK_F11 - XK_F1); 223 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */ 224 shft = 0; /* turn off Shift */
225 }
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 226 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
209 switch (keysym) { 227 {
210 /* normal XTerm key bindings */ 228 switch (keysym)
229 {
230 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */ 231 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0); 232 selection_request (ev.time, 0, 0);
213 return; 233 return;
214 /* rxvt extras */ 234 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 235 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP); 236 change_font (0, FONT_UP);
217 return; 237 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN); 239 change_font (0, FONT_DN);
220 return; 240 return;
221 } 241 }
222 } 242 }
223 } 243 }
224#ifdef PRINTPIPE 244#ifdef PRINTPIPE
225 if (keysym == XK_Print) { 245 if (keysym == XK_Print)
226 rxvt_scr_printscreen(aR_ ctrl | shft); 246 {
247 scr_printscreen (ctrl | shft);
227 return; 248 return;
228 } 249 }
229#endif 250#endif
230#ifdef GREEK_SUPPORT 251#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) { 252 if (keysym == ks_greekmodeswith)
232 R->greek_mode = !R->greek_mode; 253 {
254 greek_mode = !greek_mode;
233 if (R->greek_mode) { 255 if (greek_mode)
234 rxvt_xterm_seq(aR_ XTerm_title, 256 {
257 xterm_seq (XTerm_title,
235 (greek_getmode() == GREEK_ELOT928 258 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset(); 260 greek_reset();
238 } else 261 }
262 else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return; 264 return;
241 } 265 }
242#endif 266#endif
243 267
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 268 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 {
245#ifdef KEYSYM_RESOURCE 270#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
247 unsigned int l; 272 {
273 unsigned int l;
248 const unsigned char *kbuf0; 274 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC; 275 const unsigned char ch = C0_ESC;
250 276
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 277 kbuf0 = (Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++; 278 l = (unsigned int)*kbuf0++;
253 279
254 /* escape prefix */ 280 /* escape prefix */
255 if (meta) 281 if (meta)
256# ifdef META8_OPTION 282# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC) 283 if (meta_char == C0_ESC)
258# endif 284# endif
259 R->tt_write (&ch, 1); 285 tt_write (&ch, 1);
260 R->tt_write (kbuf0, l); 286 tt_write (kbuf0, l);
261 return; 287 return;
262 } else 288 }
289 else
263#endif 290#endif
264 { 291
265 newlen = 1; 292 {
266 switch (keysym) { 293 newlen = 1;
294 switch (keysym)
295 {
267#ifndef NO_BACKSPACE_KEY 296#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 297 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 298 if (PrivateModes & PrivMode_HaveBackSpace)
299 {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 301 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 302 kbuf[1] = '\0';
273 } else 303 }
274 STRCPY(kbuf, R->key_backspace); 304 else
305 STRCPY(kbuf, key_backspace);
275# ifdef MULTICHAR_SET 306# ifdef MULTICHAR_SET
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
277 int col, row; 308 {
309 int col, row;
278 310
279 newlen = STRLEN(kbuf); 311 newlen = STRLEN(kbuf);
280 col = R->screen.cur.col - 1; 312 col = screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines; 313 row = screen.cur.row + TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col])) 314 if (IS_MULTI2(screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
284 } 316 }
285# endif 317# endif
286 break; 318 break;
287#endif 319#endif
288#ifndef NO_DELETE_KEY 320#ifndef NO_DELETE_KEY
289 case XK_Delete: 321 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 322 STRCPY(kbuf, key_delete);
291# ifdef MULTICHAR_SET 323# ifdef MULTICHAR_SET
292 if (R->Options & Opt_mc_hack) { 324 if (Options & Opt_mc_hack)
293 int col, row; 325 {
294 326 int col, row;
295 newlen = STRLEN(kbuf); 327
296 col = R->screen.cur.col; 328 newlen = STRLEN(kbuf);
297 row = R->screen.cur.row + R->TermWin.saveLines; 329 col = screen.cur.col;
298 if (IS_MULTI1(R->screen.rend[row][col])) 330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
300 } 333 }
301# endif 334# endif
302 break; 335 break;
303#endif 336#endif
304 case XK_Tab: 337 case XK_Tab:
305 if (shft) 338 if (shft)
306 STRCPY(kbuf, "\033[Z"); 339 STRCPY(kbuf, "\033[Z");
307 else { 340 else
341 {
308#ifdef CTRL_TAB_MAKES_META 342#ifdef CTRL_TAB_MAKES_META
309 if (ctrl) 343 if (ctrl)
310 meta = 1; 344 meta = 1;
311#endif 345#endif
312#ifdef MOD4_TAB_MAKES_META 346#ifdef MOD4_TAB_MAKES_META
313 if (ev->state & Mod4Mask) 347 if (ev.state & Mod4Mask)
314 meta = 1; 348 meta = 1;
315#endif 349#endif
316 newlen = 0; 350 newlen = 0;
317 } 351 }
318 break; 352 break;
319 353
320 354
321#ifdef XK_KP_Left 355#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 356 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 357 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 358 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 359 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
327 STRCPY(kbuf, "\033OZ"); 361 {
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 362 STRCPY(kbuf, "\033OZ");
329 break; 363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
330 } else 364 break;
365 }
366 else
331 /* translate to std. cursor key */ 367 /* translate to std. cursor key */
332 keysym = XK_Left + (keysym - XK_KP_Left); 368 keysym = XK_Left + (keysym - XK_KP_Left);
333 /* FALLTHROUGH */ 369 /* FALLTHROUGH */
334#endif 370#endif
335 case XK_Up: /* "\033[A" */ 371 case XK_Up: /* "\033[A" */
336 case XK_Down: /* "\033[B" */ 372 case XK_Down: /* "\033[B" */
337 case XK_Right: /* "\033[C" */ 373 case XK_Right: /* "\033[C" */
338 case XK_Left: /* "\033[D" */ 374 case XK_Left: /* "\033[D" */
339 STRCPY(kbuf, "\033[Z"); 375 STRCPY(kbuf, "\033[Z");
340 kbuf[2] = ("DACB"[keysym - XK_Left]); 376 kbuf[2] = ("DACB"[keysym - XK_Left]);
341 /* do Shift first */ 377 /* do Shift first */
342 if (shft) 378 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = ("dacb"[keysym - XK_Left]);
344 else if (ctrl) { 380 else if (ctrl)
345 kbuf[1] = 'O'; 381 {
346 kbuf[2] = ("dacb"[keysym - XK_Left]); 382 kbuf[1] = 'O';
347 } else if (R->PrivateModes & PrivMode_aplCUR) 383 kbuf[2] = ("dacb"[keysym - XK_Left]);
348 kbuf[1] = 'O'; 384 }
385 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET 387#ifdef MULTICHAR_SET
350 //TODO: ?? 388 //TODO: ??
351 if (R->Options & Opt_mc_hack) { 389 if (Options & Opt_mc_hack)
352 int col, row, m; 390 {
391 int col, row, m;
353 392
354 col = R->screen.cur.col; 393 col = screen.cur.col;
355 row = R->screen.cur.row + R->TermWin.saveLines; 394 row = screen.cur.row + TermWin.saveLines;
356 m = 0; 395 m = 0;
357 if (keysym == XK_Right 396 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col])) 397 && IS_MULTI1(screen.rend[row][col]))
359 m = 1; 398 m = 1;
360 else if (keysym == XK_Left) { 399 else if (keysym == XK_Left)
361 if (col > 0) { 400 {
362 if (IS_MULTI2(R->screen.rend[row][col - 1])) 401 if (col > 0)
363 m = 1; 402 {
364 } else if (R->screen.cur.row > 0) { 403 if (IS_MULTI2(screen.rend[row][col - 1]))
365 col = R->screen.tlen[--row]; 404 m = 1;
366 if (col == -1) 405 }
367 col = R->TermWin.ncol - 1; 406 else if (screen.cur.row > 0)
368 else 407 {
369 col--; 408 col = screen.tlen[--row];
370 if (col > 0 409 if (col == -1)
371 && IS_MULTI2(R->screen.rend[row][col])) 410 col = TermWin.ncol - 1;
372 m = 1; 411 else
373 } 412 col--;
374 } 413 if (col > 0
375 if (m) 414 && IS_MULTI2(screen.rend[row][col]))
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 m = 1;
377 } 416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
378#endif 421#endif
379 break; 422 break;
380 423
381#ifndef UNSHIFTED_SCROLLKEYS 424#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 425# ifdef XK_KP_Prior
383 case XK_KP_Prior: 426 case XK_KP_Prior:
384 /* allow shift to override */ 427 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
386 STRCPY(kbuf, "\033Oy"); 429 {
387 break; 430 STRCPY(kbuf, "\033Oy");
388 } 431 break;
389 /* FALLTHROUGH */ 432 }
433 /* FALLTHROUGH */
390# endif 434# endif
391 case XK_Prior: 435 case XK_Prior:
392 STRCPY(kbuf, "\033[5~"); 436 STRCPY(kbuf, "\033[5~");
393 break; 437 break;
394# ifdef XK_KP_Next 438# ifdef XK_KP_Next
395 case XK_KP_Next: 439 case XK_KP_Next:
396 /* allow shift to override */ 440 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
398 STRCPY(kbuf, "\033Os"); 442 {
399 break; 443 STRCPY(kbuf, "\033Os");
400 } 444 break;
401 /* FALLTHROUGH */ 445 }
446 /* FALLTHROUGH */
402# endif 447# endif
403 case XK_Next: 448 case XK_Next:
404 STRCPY(kbuf, "\033[6~"); 449 STRCPY(kbuf, "\033[6~");
405 break; 450 break;
406#endif 451#endif
407 case XK_KP_Enter: 452 case XK_KP_Enter:
408 /* allow shift to override */ 453 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
410 STRCPY(kbuf, "\033OM"); 455 {
411 } else { 456 STRCPY(kbuf, "\033OM");
412 kbuf[0] = '\r'; 457 }
413 kbuf[1] = '\0'; 458 else
414 } 459 {
415 break; 460 kbuf[0] = '\r';
461 kbuf[1] = '\0';
462 }
463 break;
416 464
417#ifdef XK_KP_Begin 465#ifdef XK_KP_Begin
418 case XK_KP_Begin: 466 case XK_KP_Begin:
419 STRCPY(kbuf, "\033Ou"); 467 STRCPY(kbuf, "\033Ou");
420 break; 468 break;
421 469
422 case XK_KP_Insert: 470 case XK_KP_Insert:
423 STRCPY(kbuf, "\033Op"); 471 STRCPY(kbuf, "\033Op");
424 break; 472 break;
425 473
426 case XK_KP_Delete: 474 case XK_KP_Delete:
427 STRCPY(kbuf, "\033On"); 475 STRCPY(kbuf, "\033On");
428 break; 476 break;
429#endif 477#endif
430 case XK_KP_F1: /* "\033OP" */ 478 case XK_KP_F1: /* "\033OP" */
431 case XK_KP_F2: /* "\033OQ" */ 479 case XK_KP_F2: /* "\033OQ" */
432 case XK_KP_F3: /* "\033OR" */ 480 case XK_KP_F3: /* "\033OR" */
433 case XK_KP_F4: /* "\033OS" */ 481 case XK_KP_F4: /* "\033OS" */
434 STRCPY(kbuf, "\033OP"); 482 STRCPY(kbuf, "\033OP");
435 kbuf[2] += (keysym - XK_KP_F1); 483 kbuf[2] += (keysym - XK_KP_F1);
436 break; 484 break;
437 485
438 case XK_KP_Multiply: /* "\033Oj" : "*" */ 486 case XK_KP_Multiply: /* "\033Oj" : "*" */
439 case XK_KP_Add: /* "\033Ok" : "+" */ 487 case XK_KP_Add: /* "\033Ok" : "+" */
440 case XK_KP_Separator: /* "\033Ol" : "," */ 488 case XK_KP_Separator: /* "\033Ol" : "," */
441 case XK_KP_Subtract: /* "\033Om" : "-" */ 489 case XK_KP_Subtract: /* "\033Om" : "-" */
442 case XK_KP_Decimal: /* "\033On" : "." */ 490 case XK_KP_Decimal: /* "\033On" : "." */
443 case XK_KP_Divide: /* "\033Oo" : "/" */ 491 case XK_KP_Divide: /* "\033Oo" : "/" */
444 case XK_KP_0: /* "\033Op" : "0" */ 492 case XK_KP_0: /* "\033Op" : "0" */
445 case XK_KP_1: /* "\033Oq" : "1" */ 493 case XK_KP_1: /* "\033Oq" : "1" */
446 case XK_KP_2: /* "\033Or" : "2" */ 494 case XK_KP_2: /* "\033Or" : "2" */
447 case XK_KP_3: /* "\033Os" : "3" */ 495 case XK_KP_3: /* "\033Os" : "3" */
448 case XK_KP_4: /* "\033Ot" : "4" */ 496 case XK_KP_4: /* "\033Ot" : "4" */
449 case XK_KP_5: /* "\033Ou" : "5" */ 497 case XK_KP_5: /* "\033Ou" : "5" */
450 case XK_KP_6: /* "\033Ov" : "6" */ 498 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 499 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 500 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 501 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 502 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
456 STRCPY(kbuf, "\033Oj"); 504 {
457 kbuf[2] += (keysym - XK_KP_Multiply); 505 STRCPY(kbuf, "\033Oj");
458 } else { 506 kbuf[2] += (keysym - XK_KP_Multiply);
507 }
508 else
509 {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
461 } 512 }
462 break; 513 break;
463 514
464 case XK_Find: 515 case XK_Find:
465 STRCPY(kbuf, "\033[1~"); 516 STRCPY(kbuf, "\033[1~");
466 break; 517 break;
467 case XK_Insert: 518 case XK_Insert:
468 STRCPY(kbuf, "\033[2~"); 519 STRCPY(kbuf, "\033[2~");
469 break; 520 break;
470#ifdef DXK_Remove /* support for DEC remove like key */ 521#ifdef DXK_Remove /* support for DEC remove like key */
471 case DXK_Remove: 522 case DXK_Remove:
472 /* FALLTHROUGH */ 523 /* FALLTHROUGH */
473#endif 524#endif
474 case XK_Execute: 525 case XK_Execute:
475 STRCPY(kbuf, "\033[3~"); 526 STRCPY(kbuf, "\033[3~");
476 break; 527 break;
477 case XK_Select: 528 case XK_Select:
478 STRCPY(kbuf, "\033[4~"); 529 STRCPY(kbuf, "\033[4~");
479 break; 530 break;
480#ifdef XK_KP_End 531#ifdef XK_KP_End
481 case XK_KP_End: 532 case XK_KP_End:
482 /* allow shift to override */ 533 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
484 STRCPY(kbuf, "\033Oq"); 535 {
485 break; 536 STRCPY(kbuf, "\033Oq");
486 } 537 break;
487 /* FALLTHROUGH */ 538 }
539 /* FALLTHROUGH */
488#endif 540#endif
489 case XK_End: 541 case XK_End:
490 STRCPY(kbuf, KS_END); 542 STRCPY(kbuf, KS_END);
491 break; 543 break;
492#ifdef XK_KP_Home 544#ifdef XK_KP_Home
493 case XK_KP_Home: 545 case XK_KP_Home:
494 /* allow shift to override */ 546 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
496 STRCPY(kbuf, "\033Ow"); 548 {
497 break; 549 STRCPY(kbuf, "\033Ow");
498 } 550 break;
499 /* FALLTHROUGH */ 551 }
552 /* FALLTHROUGH */
500#endif 553#endif
501 case XK_Home: 554 case XK_Home:
502 STRCPY(kbuf, KS_HOME); 555 STRCPY(kbuf, KS_HOME);
503 break; 556 break;
504 557
505#define FKEY(n, fkey) \ 558#define FKEY(n, fkey) \
506 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey)))
507 560
508 case XK_F1: /* "\033[11~" */ 561 case XK_F1: /* "\033[11~" */
509 case XK_F2: /* "\033[12~" */ 562 case XK_F2: /* "\033[12~" */
510 case XK_F3: /* "\033[13~" */ 563 case XK_F3: /* "\033[13~" */
511 case XK_F4: /* "\033[14~" */ 564 case XK_F4: /* "\033[14~" */
512 case XK_F5: /* "\033[15~" */ 565 case XK_F5: /* "\033[15~" */
513 FKEY(11, XK_F1); 566 FKEY(11, XK_F1);
514 break; 567 break;
515 case XK_F6: /* "\033[17~" */ 568 case XK_F6: /* "\033[17~" */
516 case XK_F7: /* "\033[18~" */ 569 case XK_F7: /* "\033[18~" */
517 case XK_F8: /* "\033[19~" */ 570 case XK_F8: /* "\033[19~" */
518 case XK_F9: /* "\033[20~" */ 571 case XK_F9: /* "\033[20~" */
519 case XK_F10: /* "\033[21~" */ 572 case XK_F10: /* "\033[21~" */
520 FKEY(17, XK_F6); 573 FKEY(17, XK_F6);
521 break; 574 break;
522 case XK_F11: /* "\033[23~" */ 575 case XK_F11: /* "\033[23~" */
523 case XK_F12: /* "\033[24~" */ 576 case XK_F12: /* "\033[24~" */
524 case XK_F13: /* "\033[25~" */ 577 case XK_F13: /* "\033[25~" */
525 case XK_F14: /* "\033[26~" */ 578 case XK_F14: /* "\033[26~" */
526 FKEY(23, XK_F11); 579 FKEY(23, XK_F11);
527 break; 580 break;
528 case XK_F15: /* "\033[28~" */ 581 case XK_F15: /* "\033[28~" */
529 case XK_F16: /* "\033[29~" */ 582 case XK_F16: /* "\033[29~" */
530 FKEY(28, XK_F15); 583 FKEY(28, XK_F15);
531 break; 584 break;
532 case XK_Help: /* "\033[28~" */ 585 case XK_Help: /* "\033[28~" */
533 FKEY(28, XK_Help); 586 FKEY(28, XK_Help);
534 break; 587 break;
535 case XK_Menu: /* "\033[29~" */ 588 case XK_Menu: /* "\033[29~" */
536 FKEY(29, XK_Menu); 589 FKEY(29, XK_Menu);
537 break; 590 break;
538 case XK_F17: /* "\033[31~" */ 591 case XK_F17: /* "\033[31~" */
539 case XK_F18: /* "\033[32~" */ 592 case XK_F18: /* "\033[32~" */
540 case XK_F19: /* "\033[33~" */ 593 case XK_F19: /* "\033[33~" */
541 case XK_F20: /* "\033[34~" */ 594 case XK_F20: /* "\033[34~" */
542 case XK_F21: /* "\033[35~" */ 595 case XK_F21: /* "\033[35~" */
543 case XK_F22: /* "\033[36~" */ 596 case XK_F22: /* "\033[36~" */
544 case XK_F23: /* "\033[37~" */ 597 case XK_F23: /* "\033[37~" */
545 case XK_F24: /* "\033[38~" */ 598 case XK_F24: /* "\033[38~" */
546 case XK_F25: /* "\033[39~" */ 599 case XK_F25: /* "\033[39~" */
547 case XK_F26: /* "\033[40~" */ 600 case XK_F26: /* "\033[40~" */
548 case XK_F27: /* "\033[41~" */ 601 case XK_F27: /* "\033[41~" */
549 case XK_F28: /* "\033[42~" */ 602 case XK_F28: /* "\033[42~" */
550 case XK_F29: /* "\033[43~" */ 603 case XK_F29: /* "\033[43~" */
551 case XK_F30: /* "\033[44~" */ 604 case XK_F30: /* "\033[44~" */
552 case XK_F31: /* "\033[45~" */ 605 case XK_F31: /* "\033[45~" */
553 case XK_F32: /* "\033[46~" */ 606 case XK_F32: /* "\033[46~" */
554 case XK_F33: /* "\033[47~" */ 607 case XK_F33: /* "\033[47~" */
555 case XK_F34: /* "\033[48~" */ 608 case XK_F34: /* "\033[48~" */
556 case XK_F35: /* "\033[49~" */ 609 case XK_F35: /* "\033[49~" */
557 FKEY(31, XK_F17); 610 FKEY(31, XK_F17);
558 break; 611 break;
559#undef FKEY 612#undef FKEY
560 default: 613 default:
561 newlen = 0; 614 newlen = 0;
562 break; 615 break;
563 } 616 }
564 if (newlen) 617 if (newlen)
565 len = STRLEN(kbuf); 618 len = STRLEN(kbuf);
566 } 619 }
567 /* 620 /*
568 * Pass meta for all function keys, if 'meta' option set 621 * Pass meta for all function keys, if 'meta' option set
569 */ 622 */
570#ifdef META8_OPTION 623#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 624 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 625 kbuf[len - 1] |= 0x80;
573#endif 626#endif
627
628 }
574 } else if (ctrl && keysym == XK_minus) { 629 else if (ctrl && keysym == XK_minus)
630 {
575 len = 1; 631 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 633 }
634 else
635 {
578#ifdef META8_OPTION 636#ifdef META8_OPTION
579 /* set 8-bit on */ 637 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 638 if (meta && (meta_char == 0x80))
581 unsigned char *ch; 639 {
640 unsigned char *ch;
582 641
583 for (ch = kbuf; ch < kbuf + len; ch++) 642 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 643 *ch |= 0x80;
585 meta = 0; 644 meta = 0;
586 } 645 }
587#endif 646#endif
588#ifdef GREEK_SUPPORT 647#ifdef GREEK_SUPPORT
589 if (R->greek_mode) 648 if (greek_mode)
590 len = greek_xlat(kbuf, len); 649 len = greek_xlat(kbuf, len);
591#endif 650#endif
592 /* nil */ ; 651 /* nil */ ;
593 } 652 }
653 }
654
655 if (len <= 0)
656 return; /* not mapped */
657
658 if (Options & Opt_scrollTtyKeypress)
659 if (TermWin.view_start)
660 {
661 TermWin.view_start = 0;
662 want_refresh = 1;
594 } 663 }
595 664
596 if (len <= 0) 665 /*
597 return; /* not mapped */
598
599 if (R->Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) {
601 R->TermWin.view_start = 0;
602 R->want_refresh = 1;
603 }
604
605/*
606 * these modifications only affect the static keybuffer 666 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 667 * pass Shift/Control indicators for function keys ending with `~'
608 * 668 *
609 * eg, 669 * eg,
610 * Prior = "ESC[5~" 670 * Prior = "ESC[5~"
611 * Shift+Prior = "ESC[5$" 671 * Shift+Prior = "ESC[5$"
612 * Ctrl+Prior = "ESC[5^" 672 * Ctrl+Prior = "ESC[5^"
613 * Ctrl+Shift+Prior = "ESC[5@" 673 * Ctrl+Shift+Prior = "ESC[5@"
614 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 674 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
615 */ 675 */
616 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 676 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 678
619/* escape prefix */ 679 /* escape prefix */
620 if (meta 680 if (meta
621#ifdef META8_OPTION 681#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 682 && (meta_char == C0_ESC)
623#endif 683#endif
624 ) { 684 )
685 {
625 const unsigned char ch = C0_ESC; 686 const unsigned char ch = C0_ESC;
626 687
627 R->tt_write(&ch, 1); 688 tt_write(&ch, 1);
628 } 689 }
629#ifdef DEBUG_CMD 690#ifdef DEBUG_CMD
691 if (debug_key)
630 if (debug_key) { /* Display keyboard buffer contents */ 692 { /* Display keyboard buffer contents */
631 char *p; 693 char *p;
632 int i; 694 int i;
633 695
634 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
635 for (i = 0, p = kbuf; i < len; i++, p++) 697 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 699 fprintf(stderr, "'\n");
638 } 700 }
639#endif /* DEBUG_CMD */ 701#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 702 tt_write (kbuf, (unsigned int)len);
641} 703}
642/*}}} */ 704/*}}} */
643 705
644#if (MENUBAR_MAX) 706#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
646/* attempt to `write' count to the input buffer */ 708/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 709unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 710rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 711{
651 unsigned int n, s; 712 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 713
656 n = cmdbuf_ptr - cmdbuf_base; 714 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
658 if (n > 0 && s < count) { 716 if (n > 0 && s < count)
717 {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 718 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
660 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr));
661 cmdbuf_ptr = cmdbuf_base; 720 cmdbuf_ptr = cmdbuf_base;
662 cmdbuf_endp -= n; 721 cmdbuf_endp -= n;
663 s += n; 722 s += n;
664 } 723 }
665 if (count > s) { 724 if (count > s)
725 {
666 rxvt_print_error("data loss: cmd_write too large"); 726 rxvt_print_error("data loss: cmd_write too large");
667 count = s; 727 count = s;
668 } 728 }
669 for (; count--;) 729 for (; count--;)
670 *cmdbuf_endp++ = *str++; 730 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr;
672 R->cmdbuf_endp = cmdbuf_endp;
673 return 0; 731 return 0;
674} 732}
675#endif /* MENUBAR_MAX */ 733#endif /* MENUBAR_MAX */
676 734
677void 735void
678rxvt_term::flush () 736rxvt_term::flush ()
… …
688#endif 746#endif
689 747
690 if (want_refresh) 748 if (want_refresh)
691 { 749 {
692 scr_refresh (refresh_type); 750 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 751 scrollbar_show (1);
694#ifdef USE_XIM 752#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 753 IMSendSpot ();
696#endif 754#endif
697 }
698 755
756 }
757
699 XFlush (Xdisplay); 758 XFlush (display->display);
700} 759}
701 760
702void 761void
703rxvt_term::check_cb (check_watcher &w) 762rxvt_term::check_cb (check_watcher &w)
704{ 763{
… …
706 SET_LOCALE (locale); 765 SET_LOCALE (locale);
707 766
708 flush (); 767 flush ();
709} 768}
710 769
711void
712rxvt_term::process_x_events ()
713{
714 do
715 {
716 XEvent xev;
717
718 XNextEvent (Xdisplay, &xev);
719
720#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink)
722 && xev.type == KeyPress)
723 {
724 if (hidden_cursor)
725 {
726 hidden_cursor = 0;
727 want_refresh = 1;
728 }
729
730 blink_ev.start (NOW + BLINK_INTERVAL);
731 }
732#endif
733
734#if defined(POINTER_BLANK)
735 if ((Options & Opt_pointerBlank)
736 && (pointerBlankDelay > 0))
737 {
738 if (xev.type == MotionNotify
739 || xev.type == ButtonPress
740 || xev.type == ButtonRelease)
741 if (hidden_pointer)
742 pointer_unblank ();
743
744 if (xev.type == KeyPress && hidden_pointer == 0)
745 pointer_blank ();
746 }
747#endif
748
749#ifdef USE_XIM
750 if (!XFilterEvent (&xev, xev.xany.window))
751#endif
752 rxvt_process_x_event (this, &xev);
753 }
754 while (XPending (Xdisplay));
755}
756
757#ifdef CURSOR_BLINK 770#ifdef CURSOR_BLINK
758void 771void
759rxvt_term::blink_cb (time_watcher &w) 772rxvt_term::cursor_blink_cb (time_watcher &w)
760{ 773{
761 hidden_cursor = !hidden_cursor; 774 hidden_cursor = !hidden_cursor;
762 want_refresh = 1; 775 want_refresh = 1;
763 776
764 w.start (w.at + BLINK_INTERVAL); 777 w.start (w.at + BLINK_INTERVAL);
765} 778}
766#endif 779#endif
767 780
781#ifdef TEXT_BLINK
768void 782void
769rxvt_term::x_cb (io_watcher &w, short revents) 783rxvt_term::text_blink_cb (time_watcher &w)
770{ 784{
771 SET_R (this); 785 if (scr_refresh_rend (RS_Blink, RS_Blink))
772 SET_LOCALE (locale); 786 {
773 787 hidden_text = !hidden_text;
774 process_x_events (); 788 want_refresh = 1;
789 w.start (w.at + TEXT_BLINK_INTERVAL);
790 }
775} 791}
792#endif
776 793
777bool 794bool
778rxvt_term::pty_fill () 795rxvt_term::pty_fill ()
779{ 796{
780 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 797 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
781 798
782 memmove (cmdbuf_base, cmdbuf_ptr, n); 799 memmove (cmdbuf_base, cmdbuf_ptr, n);
783 cmdbuf_ptr = cmdbuf_base; 800 cmdbuf_ptr = cmdbuf_base;
784 cmdbuf_endp = cmdbuf_ptr + n; 801 cmdbuf_endp = cmdbuf_ptr + n;
785 802
786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
787 804
788 if (n > 0) 805 if (n > 0)
789 { 806 {
790 cmdbuf_endp += n; 807 cmdbuf_endp += n;
… …
860 refreshnow = true; 877 refreshnow = true;
861 flag = false; 878 flag = false;
862 ch = NOCHAR; 879 ch = NOCHAR;
863 break; 880 break;
864 } 881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
865 } 890 }
866 891
867 if (str >= buf + BUFSIZ) 892 if (str >= buf + BUFSIZ)
868 { 893 {
869 ch = NOCHAR; 894 ch = NOCHAR;
870 break; 895 break;
871 } 896 }
872 } 897 }
873 } 898 }
874 899
875 rxvt_scr_add_lines (this, buf, nlines, str - buf); 900 scr_add_lines (buf, nlines, str - buf);
876 901
877 /* 902 /*
878 * If there have been a lot of new lines, then update the screen 903 * If there have been a lot of new lines, then update the screen
879 * What the heck I'll cheat and only refresh less than every page-full. 904 * What the heck I'll cheat and only refresh less than every page-full.
880 * the number of pages between refreshes is refresh_limit, which 905 * the number of pages between refreshes is refresh_limit, which
… …
895 else 920 else
896 { 921 {
897 switch (ch) 922 switch (ch)
898 { 923 {
899 default: 924 default:
900 rxvt_process_nonprinting (this, ch); 925 process_nonprinting (ch);
901 break; 926 break;
902 case C0_ESC: /* escape char */ 927 case C0_ESC: /* escape char */
903 rxvt_process_escape_seq (this); 928 process_escape_seq ();
904 break; 929 break;
905 /*case 0x9b: */ /* CSI */ 930 /*case 0x9b: */ /* CSI */
906 /* rxvt_process_csi_seq (this); */ 931 /* process_csi_seq (); */
907 } 932 }
908 933
909 ch = NOCHAR; 934 ch = NOCHAR;
910 } 935 }
911 } 936 }
… …
922 { 947 {
923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
924 return *cmdbuf_ptr++; 949 return *cmdbuf_ptr++;
925 950
926 wchar_t wc; 951 wchar_t wc;
927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928 953
929 if (len == (size_t)-2) 954 if (len == (size_t)-2)
930 return NOCHAR; 955 return NOCHAR;
931 956
932 if (len == (size_t)-1) 957 if (len == (size_t)-1)
… …
943/* rxvt_cmd_getc() - Return next input character */ 968/* rxvt_cmd_getc() - Return next input character */
944/* 969/*
945 * Return the next input character after first passing any keyboard input 970 * Return the next input character after first passing any keyboard input
946 * to the command. 971 * to the command.
947 */ 972 */
948/* INTPROTO */
949uint32_t 973uint32_t
950rxvt_cmd_getc(pR) 974rxvt_term::cmd_getc ()
951{ 975{
952 for (;;) 976 for (;;)
953 { 977 {
954 uint32_t c = R->next_char (); 978 uint32_t c = next_char ();
955 if (c != NOCHAR) 979 if (c != NOCHAR)
956 return c; 980 return c;
957 981
958 // incomplete sequences should occur rarely, still, a better solution 982 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design. 983 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (R->cmd_fd, F_SETFL, 0); 984 fcntl (cmd_fd, F_SETFL, 0);
961 R->pty_fill (); 985 pty_fill ();
962 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964
965#if 0
966#define TIMEOUT_USEC 5000
967 fd_set readfds;
968 int quick_timeout, select_res;
969 int want_motion_time, want_keypress_time;
970 struct timeval value;
971#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
972 struct timeval tp;
973#endif
974
975 for (;;) {
976 /* loop until we can return something */
977
978 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
979 R->tt_write(NULL, 0);
980
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 if (R->mouse_slip_wheel_speed) {
983 quick_timeout = 1;
984 if (!R->mouse_slip_wheel_delay--
985 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
986 abs(R->mouse_slip_wheel_speed))) {
987 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
988 R->refresh_type |= SMOOTH_REFRESH;
989 R->want_refresh = 1;
990 } 987 }
991 }
992#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
993#ifdef SELECTION_SCROLLING
994 if (R->pending_scroll_selection) {
995 quick_timeout = 1;
996 if (!R->scroll_selection_delay--
997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
998 R->scroll_selection_lines)) {
999 R->selection_extend (R->selection_save_x,
1000 R->selection_save_y, R->selection_save_state);
1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1002 R->refresh_type |= SMOOTH_REFRESH;
1003 R->want_refresh = 1;
1004 }
1005 }
1006#endif
1007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1008 if (scrollbar_isUp() || scrollbar_isDn()) {
1009 quick_timeout = 1;
1010 if (!R->scroll_arrow_delay--
1011 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1012 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1;
1015 }
1016 }
1017#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1018
1019#ifdef TRANSPARENT
1020 quick_timeout |= R->want_full_refresh;
1021#endif
1022#endif
1023} 988}
1024 989
990#ifdef POINTER_BLANK
1025void 991void
1026rxvt_term::pointer_unblank () 992rxvt_term::pointer_unblank ()
1027{ 993{
1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1029 recolour_cursor (); 995 recolour_cursor ();
1030 996
1031#ifdef POINTER_BLANK
1032 hidden_pointer = 0; 997 hidden_pointer = 0;
1033 998
1034 if (Options & Opt_pointerBlank) 999 if (Options & Opt_pointerBlank)
1035 pointer_ev.start (NOW + pointerBlankDelay); 1000 pointer_ev.start (NOW + pointerBlankDelay);
1036#endif
1037} 1001}
1038 1002
1039#ifdef POINTER_BLANK
1040void 1003void
1041rxvt_term::pointer_blank () 1004rxvt_term::pointer_blank ()
1042{ 1005{
1043 if (!(Options & Opt_pointerBlank)) 1006 if (!(Options & Opt_pointerBlank))
1044 return; 1007 return;
1045 1008
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1009 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 1010 XFlush (display->display);
1048 1011
1049 hidden_pointer = 1; 1012 hidden_pointer = 1;
1050} 1013}
1051 1014
1052void 1015void
… …
1057 1020
1058 pointer_blank (); 1021 pointer_blank ();
1059} 1022}
1060#endif 1023#endif
1061 1024
1062/* INTPROTO */
1063void 1025void
1064rxvt_mouse_report(pR_ const XButtonEvent *ev) 1026rxvt_term::mouse_report (const XButtonEvent &ev)
1065{ 1027{
1066 int button_number, key_state = 0; 1028 int button_number, key_state = 0;
1067 int x, y; 1029 int x, y;
1068 1030
1069 x = ev->x; 1031 x = ev.x;
1070 y = ev->y; 1032 y = ev.y;
1071 R->pixel_position (&x, &y); 1033 pixel_position (&x, &y);
1072 1034
1073 if (R->MEvent.button == AnyButton) { 1035 if (MEvent.button == AnyButton)
1036 {
1074 button_number = 3; 1037 button_number = 3;
1075 } else { 1038 }
1039 else
1040 {
1076 button_number = R->MEvent.button - Button1; 1041 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 1042 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 1043 if (button_number >= 3)
1079 button_number += (64 - 3); 1044 button_number += (64 - 3);
1080 } 1045 }
1081 1046
1082 if (R->PrivateModes & PrivMode_MouseX10) { 1047 if (PrivateModes & PrivMode_MouseX10)
1048 {
1083 /* 1049 /*
1084 * do not report ButtonRelease 1050 * do not report ButtonRelease
1085 * no state info allowed 1051 * no state info allowed
1086 */ 1052 */
1087 key_state = 0; 1053 key_state = 0;
1088 if (button_number == 3) 1054 if (button_number == 3)
1089 return; 1055 return;
1090 } else { 1056 }
1057 else
1058 {
1091 /* XTerm mouse reporting needs these values: 1059 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 1060 * 4 = Shift
1093 * 8 = Meta 1061 * 8 = Meta
1094 * 16 = Control 1062 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1063 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1064 * 32 = Double Click
1097 */ 1065 */
1098 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1066 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1067 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1068 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1069#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1070 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1071#endif
1072
1104 } 1073 }
1105 1074
1106#ifdef DEBUG_MOUSEREPORT 1075#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1076 fprintf(stderr, "Mouse [");
1108 if (key_state & 16) 1077 if (key_state & 16)
1109 fputc('C', stderr); 1078 fputc('C', stderr);
1110 if (key_state & 4) 1079 if (key_state & 4)
1111 fputc('S', stderr); 1080 fputc('S', stderr);
1112 if (key_state & 8) 1081 if (key_state & 8)
1113 fputc('A', stderr); 1082 fputc('A', stderr);
1114 if (key_state & 32) 1083 if (key_state & 32)
1115 fputc('2', stderr); 1084 fputc('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1085 fprintf(stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1086 button_number,
1118 x + 1, 1087 x + 1,
1119 y + 1); 1088 y + 1);
1120#else 1089#else
1121 R->tt_printf("\033[M%c%c%c", 1090 tt_printf("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1091 (32 + button_number + key_state),
1123 (32 + x + 1), 1092 (32 + x + 1),
1124 (32 + y + 1)); 1093 (32 + y + 1));
1125#endif 1094#endif
1126} 1095}
1127 1096
1128#ifdef USING_W11LIB 1097#ifdef USING_W11LIB
1129/* EXTPROTO */
1130void 1098void
1131rxvt_W11_process_x_event(XEvent *ev) 1099rxvt_W11_process_x_event(XEvent *ev)
1132{ 1100{
1133 rxvt_t *r = rxvt_get_r(); 1101 rxvt_t *r = rxvt_get_r();
1134 1102
1135 rxvt_process_x_event(aR_ ev); 1103 x_cb (*ev);
1136} 1104}
1137#endif 1105#endif
1138 1106
1139/*{{{ process an X event */ 1107/*{{{ process an X event */
1140/* INTPROTO */
1141void 1108void
1142rxvt_process_x_event(pR_ XEvent *ev) 1109rxvt_term::x_cb (XEvent &ev)
1143{ 1110{
1144 int i, want_timeout; 1111 SET_R (this);
1112 SET_LOCALE (locale);
1113
1114#if defined(CURSOR_BLINK)
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1116 {
1117 if (hidden_cursor)
1118 {
1119 hidden_cursor = 0;
1120 want_refresh = 1;
1121 }
1122
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1124 }
1125#endif
1126
1127#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 {
1130 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease)
1133 if (hidden_pointer)
1134 pointer_unblank ();
1135
1136 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank ();
1138 }
1139#endif
1140
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return;
1144#endif
1145
1145 Window unused_root, unused_child; 1146 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1147 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1148 unsigned int unused_mask;
1148 1149
1149#ifdef DEBUG_X 1150#ifdef DEBUG_X
1150 const char *const eventnames[] = 1151 const char *const eventnames[] =
1151 { /* mason - this matches my system */ 1152 { /* mason - this matches my system */
1152 "", 1153 "",
1153 "", 1154 "",
1154 "KeyPress", 1155 "KeyPress",
1155 "KeyRelease", 1156 "KeyRelease",
1156 "ButtonPress", 1157 "ButtonPress",
1157 "ButtonRelease", 1158 "ButtonRelease",
1158 "MotionNotify", 1159 "MotionNotify",
1159 "EnterNotify", 1160 "EnterNotify",
1160 "LeaveNotify", 1161 "LeaveNotify",
1161 "FocusIn", 1162 "FocusIn",
1162 "FocusOut", 1163 "FocusOut",
1163 "KeymapNotify", 1164 "KeymapNotify",
1164 "Expose", 1165 "Expose",
1165 "GraphicsExpose", 1166 "GraphicsExpose",
1166 "NoExpose", 1167 "NoExpose",
1167 "VisibilityNotify", 1168 "VisibilityNotify",
1168 "CreateNotify", 1169 "CreateNotify",
1169 "DestroyNotify", 1170 "DestroyNotify",
1170 "UnmapNotify", 1171 "UnmapNotify",
1171 "MapNotify", 1172 "MapNotify",
1172 "MapRequest", 1173 "MapRequest",
1173 "ReparentNotify", 1174 "ReparentNotify",
1174 "ConfigureNotify", 1175 "ConfigureNotify",
1175 "ConfigureRequest", 1176 "ConfigureRequest",
1176 "GravityNotify", 1177 "GravityNotify",
1177 "ResizeRequest", 1178 "ResizeRequest",
1178 "CirculateNotify", 1179 "CirculateNotify",
1179 "CirculateRequest", 1180 "CirculateRequest",
1180 "PropertyNotify", 1181 "PropertyNotify",
1181 "SelectionClear", 1182 "SelectionClear",
1182 "SelectionRequest", 1183 "SelectionRequest",
1183 "SelectionNotify", 1184 "SelectionNotify",
1184 "ColormapNotify", 1185 "ColormapNotify",
1185 "ClientMessage", 1186 "ClientMessage",
1186 "MappingNotify" 1187 "MappingNotify"
1187 }; 1188 };
1188#endif 1189#endif
1189 1190
1190#ifdef DEBUG_X 1191#ifdef DEBUG_X
1191 struct timeval tp; 1192 struct timeval tp;
1192 struct tm *ltt; 1193 struct tm *ltt;
1193 (void)gettimeofday(&tp, NULL); 1194 (void)gettimeofday(&tp, NULL);
1194 ltt = localtime(&(tp.tv_sec)); 1195 ltt = localtime(&(tp.tv_sec));
1195 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1196 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));
1196#endif 1197#endif
1197 1198
1198 switch (ev->type) { 1199 switch (ev.type)
1200 {
1199 case KeyPress: 1201 case KeyPress:
1200 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1202 lookup_key (ev.xkey);
1201 break; 1203 break;
1202 1204
1203#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1204 case KeyRelease: 1206 case KeyRelease:
1205 { 1207 {
1206 if (!(ev->xkey.state & ControlMask)) 1208 if (!(ev.xkey.state & ControlMask))
1207 R->mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1208 else { 1210 else
1209 KeySym ks; 1211 {
1210 1212 KeySym ks;
1213
1211 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0);
1212 if (ks == XK_Control_L || ks == XK_Control_R) 1215 if (ks == XK_Control_L || ks == XK_Control_R)
1213 R->mouse_slip_wheel_speed = 0; 1216 mouse_slip_wheel_speed = 0;
1214 } 1217 }
1215 break; 1218 break;
1216 } 1219 }
1217#endif 1220#endif
1218 1221
1219 case ButtonPress: 1222 case ButtonPress:
1220 rxvt_button_press(aR_ (XButtonEvent *)ev); 1223 button_press (ev.xbutton);
1221 break; 1224 break;
1222 1225
1223 case ButtonRelease: 1226 case ButtonRelease:
1224 rxvt_button_release(aR_ (XButtonEvent *)ev); 1227 button_release (ev.xbutton);
1225 break; 1228 break;
1226 1229
1227 case ClientMessage: 1230 case ClientMessage:
1228 if (ev->xclient.format == 32 1231 if (ev.xclient.format == 32
1229 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1230 R->destroy (); 1233 destroy ();
1231#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1232 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1233 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1234 && (ev->xclient.data.l[0] == DndFile 1237 && (ev.xclient.data.l[0] == DndFile
1235 || ev->xclient.data.l[0] == DndDir 1238 || ev.xclient.data.l[0] == DndDir
1236 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev.xclient.data.l[0] == DndLink))
1237 /* Get Dnd data */ 1240 {
1241 /* Get Dnd data */
1238 Atom ActualType; 1242 Atom ActualType;
1239 int ActualFormat; 1243 int ActualFormat;
1240 unsigned char *data; 1244 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1245 unsigned long Size, RemainingBytes;
1242 1246
1243 XGetWindowProperty(R->Xdisplay, Xroot, 1247 XGetWindowProperty(display->display, display->root,
1244 R->xa[XA_DNDSELECTION], 1248 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1249 0L, 1000000L,
1246 False, AnyPropertyType, 1250 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1251 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1252 &Size, &RemainingBytes,
1249 &data); 1253 &data);
1250 XChangeProperty(R->Xdisplay, Xroot, 1254 XChangeProperty(display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1255 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1256 8, PropModeReplace,
1253 data, STRLEN(data)); 1257 data, STRLEN(data));
1254 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1258 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime);
1256 } 1260 }
1257#endif /* OFFIX_DND */ 1261#endif /* OFFIX_DND */
1258 break; 1262 break;
1259 1263
1260 case MappingNotify: 1264 case MappingNotify:
1261 XRefreshKeyboardMapping(&(ev->xmapping)); 1265 XRefreshKeyboardMapping(&(ev.xmapping));
1262 break; 1266 break;
1263 1267
1264 /* 1268 /*
1265 * XXX: this is not the _current_ arrangement 1269 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1270 * Here's my conclusion:
1267 * If the window is completely unobscured, use bitblt's 1271 * If the window is completely unobscured, use bitblt's
1268 * to scroll. Even then, they're only used when doing partial 1272 * to scroll. Even then, they're only used when doing partial
1269 * screen scrolling. When partially obscured, we have to fill 1273 * screen scrolling. When partially obscured, we have to fill
1270 * in the GraphicsExpose parts, which means that after each refresh, 1274 * in the GraphicsExpose parts, which means that after each refresh,
1271 * we need to wait for the graphics expose or Noexpose events, 1275 * we need to wait for the graphics expose or Noexpose events,
1272 * which ought to make things real slow! 1276 * which ought to make things real slow!
1273 */ 1277 */
1274 case VisibilityNotify: 1278 case VisibilityNotify:
1275 switch (ev->xvisibility.state) 1279 switch (ev.xvisibility.state)
1276 { 1280 {
1277 case VisibilityUnobscured: 1281 case VisibilityUnobscured:
1278 R->refresh_type = FAST_REFRESH; 1282 refresh_type = FAST_REFRESH;
1279 break; 1283 break;
1280 case VisibilityPartiallyObscured: 1284 case VisibilityPartiallyObscured:
1281 R->refresh_type = SLOW_REFRESH; 1285 refresh_type = SLOW_REFRESH;
1282 break; 1286 break;
1283 default: 1287 default:
1284 R->refresh_type = NO_REFRESH; 1288 refresh_type = NO_REFRESH;
1285 break; 1289 break;
1286 } 1290 }
1287 break; 1291 break;
1288 1292
1289 case FocusIn: 1293 case FocusIn:
1290 if (!R->TermWin.focus) { 1294 if (!TermWin.focus)
1291 R->TermWin.focus = 1; 1295 {
1292 R->want_refresh = 1; 1296 TermWin.focus = 1;
1297 want_refresh = 1;
1293#ifdef USE_XIM 1298#ifdef USE_XIM
1294 if (R->Input_Context != NULL) 1299 if (Input_Context != NULL)
1295 XSetICFocus(R->Input_Context); 1300 XSetICFocus(Input_Context);
1296#endif 1301#endif
1297#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1298 if (R->Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1299 R->blink_ev.start (NOW + BLINK_INTERVAL); 1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1300#endif 1305#endif
1301 }
1302 break;
1303 1306
1307 }
1308 break;
1309
1304 case FocusOut: 1310 case FocusOut:
1305 if (R->TermWin.focus) { 1311 if (TermWin.focus)
1306 R->TermWin.focus = 0; 1312 {
1307 R->want_refresh = 1; 1313 TermWin.focus = 0;
1314 want_refresh = 1;
1308#ifdef USE_XIM 1315#ifdef USE_XIM
1309 if (R->Input_Context != NULL) 1316 if (Input_Context != NULL)
1310 XUnsetICFocus(R->Input_Context); 1317 XUnsetICFocus(Input_Context);
1311#endif 1318#endif
1312#ifdef CURSOR_BLINK 1319#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink) 1320 if (Options & Opt_cursorBlink)
1314 R->blink_ev.stop (); 1321 cursor_blink_ev.stop ();
1315 R->hidden_cursor = 0; 1322 hidden_cursor = 0;
1316#endif 1323#endif
1317 }
1318 break;
1319 1324
1325 }
1326 break;
1327
1320 case ConfigureNotify: 1328 case ConfigureNotify:
1321 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1329 if (ev.xconfigure.window == TermWin.parent[0])
1322 int height, width; 1330 {
1331 int height, width;
1323 1332
1333 do
1324 do { /* Wrap lots of configures into one */ 1334 { /* Wrap lots of configures into one */
1325 width = ev->xconfigure.width; 1335 width = ev.xconfigure.width;
1326 height = ev->xconfigure.height; 1336 height = ev.xconfigure.height;
1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1338 }
1329 ConfigureNotify, ev)); 1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340
1330 if (R->szHint.width != width || R->szHint.height != height) { 1341 if (szHint.width != width || szHint.height != height)
1342 {
1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1332 R->resize_all_windows (width, height, 1); 1344 resize_all_windows (width, height, 1);
1333 } 1345 }
1334#ifdef DEBUG_SIZE 1346#ifdef DEBUG_SIZE
1335 else { 1347 else
1348 {
1336 D_SIZE((stderr, "Size: Not resizing")); 1349 D_SIZE((stderr, "Size: Not resizing"));
1337 } 1350 }
1338#endif 1351#endif
1339#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1340 if (R->Options & Opt_transparent) { 1353 if (Options & Opt_transparent)
1341 rxvt_check_our_parents(aR); 1354 {
1342 if (R->am_transparent) 1355 check_our_parents ();
1343 R->want_full_refresh = 1; 1356 if (am_transparent)
1344 } 1357 want_full_refresh = 1;
1358 }
1345#endif 1359#endif
1346 }
1347 break;
1348 1360
1361 }
1362 break;
1363
1349 case SelectionClear: 1364 case SelectionClear:
1350 rxvt_selection_clear(aR); 1365 selection_clear ();
1351 break; 1366 break;
1352 1367
1353 case SelectionNotify: 1368 case SelectionNotify:
1354 if (R->selection_wait == Sel_normal) 1369 if (selection_wait == Sel_normal)
1355 rxvt_selection_paste(aR_ ev->xselection.requestor, 1370 selection_paste (ev.xselection.requestor,
1356 ev->xselection.property, True); 1371 ev.xselection.property, True);
1357 break; 1372 break;
1358 1373
1359 case SelectionRequest: 1374 case SelectionRequest:
1360 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1375 selection_send (ev.xselectionrequest);
1361 break; 1376 break;
1362 1377
1363 case UnmapNotify: 1378 case UnmapNotify:
1364 R->TermWin.mapped = 0; 1379 TermWin.mapped = 0;
1365 break; 1380#ifdef TEXT_BLINK
1381 text_blink_ev.stop ();
1382#endif
1383 break;
1366 1384
1367 case MapNotify: 1385 case MapNotify:
1368 R->TermWin.mapped = 1; 1386 TermWin.mapped = 1;
1369 break; 1387#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif
1390 break;
1370 1391
1371 case PropertyNotify: 1392 case PropertyNotify:
1372 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1373 if (ev->xproperty.state == PropertyNewValue) 1394 if (ev.xproperty.state == PropertyNewValue)
1374 rxvt_selection_property(aR_ ev->xproperty.window, 1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1375 ev->xproperty.atom);
1376 break; 1396 break;
1377 } 1397
1378#ifdef TRANSPARENT 1398#ifdef TRANSPARENT
1379 /*
1380 * if user used some Esetroot compatible prog to set the root bg,
1381 * use the property to determine the pixmap. We use it later on.
1382 */
1383 if (R->xa[XA_XROOTPMAPID] == 0)
1384 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1385 "_XROOTPMAP_ID", False);
1386 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1387 break;
1388 /* FALLTHROUGH */
1389 case ReparentNotify: 1399 case ReparentNotify:
1390 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1400 rootwin_cb (ev);
1391 if (R->am_transparent) 1401 break;
1392 R->want_full_refresh = 1;
1393 }
1394#endif /* TRANSPARENT */ 1402#endif /* TRANSPARENT */
1395 break;
1396 1403
1397 case GraphicsExpose: 1404 case GraphicsExpose:
1398 case Expose: 1405 case Expose:
1399 if (ev->xany.window == R->TermWin.vt) { 1406 if (ev.xany.window == TermWin.vt)
1407 {
1400#ifdef NO_SLOW_LINK_SUPPORT 1408#ifdef NO_SLOW_LINK_SUPPORT
1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1409 scr_expose (ev.xexpose.x, ev.xexpose.y,
1402 ev->xexpose.width, ev->xexpose.height, False); 1410 ev.xexpose.width, ev.xexpose.height, False);
1403#else 1411#else
1404 // don't understand this, so commented it out 1412 // don't understand this, so commented it out
1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1413 scr_expose (ev.xexpose.x, ev.xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1414 ev.xexpose.width, ev.xexpose.height, False);
1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1415 //scr_expose (ev.xexpose.x, 0,
1408 // ev->xexpose.width, R->TermWin.height, False); 1416 // ev.xexpose.width, TermWin.height, False);
1409#endif 1417#endif
1410 R->want_refresh = 1; 1418 want_refresh = 1;
1411 } else { 1419 }
1412 XEvent unused_xevent; 1420 else
1421 {
1422 XEvent unused_event;
1413 1423
1414 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1415 Expose, 1425 Expose,
1416 &unused_xevent)) ; 1426 &unused_event)) ;
1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1418 GraphicsExpose, 1428 GraphicsExpose,
1419 &unused_xevent)) ; 1429 &unused_event)) ;
1420 if (isScrollbarWindow(ev->xany.window)) { 1430 if (isScrollbarWindow(ev.xany.window))
1421 R->scrollBar.setIdle(); 1431 {
1422 rxvt_scrollbar_show(aR_ 0); 1432 scrollBar.setIdle();
1423 } 1433 scrollbar_show (0);
1434 }
1424#ifdef MENUBAR 1435#ifdef MENUBAR
1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window))
1426 rxvt_menubar_expose(aR); 1437 menubar_expose ();
1427#endif 1438#endif
1428#ifdef RXVT_GRAPHICS 1439#ifdef RXVT_GRAPHICS
1429 rxvt_Gr_expose(aR_ ev->xany.window); 1440 Gr_expose (ev.xany.window);
1430#endif 1441#endif
1431 }
1432 break;
1433 1442
1443 }
1444 break;
1445
1434 case MotionNotify: 1446 case MotionNotify:
1435#ifdef POINTER_BLANK 1447#ifdef POINTER_BLANK
1436 if (R->hidden_pointer) 1448 if (hidden_pointer)
1437 R->pointer_unblank (); 1449 pointer_unblank ();
1438#endif 1450#endif
1439#if MENUBAR 1451#if MENUBAR
1440 if (isMenuBarWindow(ev->xany.window)) { 1452 if (isMenuBarWindow(ev.xany.window))
1441 rxvt_menubar_control(aR_ &(ev->xbutton)); 1453 {
1442 break; 1454 menubar_control (&(ev.xbutton));
1443 } 1455 break;
1456 }
1444#endif 1457#endif
1445 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1446 break; 1459 break;
1447 1460
1448 if (ev->xany.window == R->TermWin.vt) { 1461 if (ev.xany.window == TermWin.vt)
1462 {
1449 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1450 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1464 {
1451 MotionNotify, ev)) ; 1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1452 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1466 ;
1453 &unused_root, &unused_child, 1467
1454 &unused_root_x, &unused_root_y, 1468 XQueryPointer(display->display, TermWin.vt,
1455 &(ev->xbutton.x), &(ev->xbutton.y), 1469 &unused_root, &unused_child,
1456 &unused_mask); 1470 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y),
1472 &unused_mask);
1457#ifdef MOUSE_THRESHOLD 1473#ifdef MOUSE_THRESHOLD
1458 /* deal with a `jumpy' mouse */ 1474 /* deal with a `jumpy' mouse */
1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 {
1460#endif 1477#endif
1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1462 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1479 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1463#ifdef SELECTION_SCROLLING 1480#ifdef SELECTION_SCROLLING
1464 if (ev->xbutton.y<R->TermWin.int_bwidth || 1481 if (ev.xbutton.y < TermWin.int_bwidth
1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1))
1466 int dist;
1467
1468 R->pending_scroll_selection=1;
1469
1470 /* don't clobber the current delay if we are
1471 * already in the middle of scrolling.
1472 */
1473 if (R->scroll_selection_delay<=0)
1474 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1475
1476 /* save the event params so we can highlight
1477 * the selection in the pending-scroll loop
1478 */
1479 R->selection_save_x=ev->xbutton.x;
1480 R->selection_save_y=ev->xbutton.y;
1481 R->selection_save_state=
1482 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1483
1484 /* calc number of lines to scroll */
1485 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1486 R->scroll_selection_dir = UP;
1487 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1488 }
1489 else {
1490 R->scroll_selection_dir = DN;
1491 dist = ev->xbutton.y -
1492 (R->TermWin.int_bwidth + R->TermWin.height);
1493 }
1494 R->scroll_selection_lines=(Pixel2Height(dist)/
1495 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1496 MIN_IT(R->scroll_selection_lines,
1497 SELECTION_SCROLL_MAX_LINES);
1498 }
1499 else {
1500 /* we are within the text window, so we
1501 * shouldn't be scrolling
1502 */
1503 R->pending_scroll_selection = 0;
1504 }
1505#endif
1506#ifdef MOUSE_THRESHOLD
1507 }
1508#endif
1509 }
1510 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1511 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1512 MotionNotify, ev)) ;
1513 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1514 &unused_root, &unused_child,
1515 &unused_root_x, &unused_root_y,
1516 &(ev->xbutton.x), &(ev->xbutton.y),
1517 &unused_mask);
1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1519 scrollbar_size());
1520 R->scr_refresh (R->refresh_type);
1521 R->refresh_limit = 0;
1522 rxvt_scrollbar_show(aR_ 1);
1523 }
1524 break;
1525 }
1526}
1527
1528/* INTPROTO */
1529void
1530rxvt_button_press(pR_ XButtonEvent *ev)
1531{
1532 int reportmode = 0, clickintime;
1533
1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1535 if (!R->bypass_keystate)
1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1537/*
1538 * VT window processing of button press
1539 */
1540 if (ev->window == R->TermWin.vt)
1541 {
1542#if RXVT_GRAPHICS
1543 if (ev->subwindow != None)
1544 rxvt_Gr_ButtonPress (ev->x, ev->y);
1545 else
1546#endif
1547 {
1548 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1549 if (reportmode)
1550 {
1551 /* mouse report from vt window */
1552 /* save the xbutton state (for ButtonRelease) */
1553 R->MEvent.state = ev->state;
1554#ifdef MOUSE_REPORT_DOUBLECLICK
1555 if (ev->button == R->MEvent.button && clickintime)
1556 {
1557 /* same button, within alloted time */
1558 R->MEvent.clicks++;
1559 if (R->MEvent.clicks > 1)
1560 { 1483 {
1561 /* only report double clicks */ 1484 int dist;
1562 R->MEvent.clicks = 2;
1563 rxvt_mouse_report(aR_ ev);
1564 1485
1565 /* don't report the release */ 1486 pending_scroll_selection=1;
1566 R->MEvent.clicks = 0; 1487
1567 R->MEvent.button = AnyButton; 1488 /* don't clobber the current delay if we are
1568 } 1489 * already in the middle of scrolling.
1569 }
1570 else
1571 { 1490 */
1572 /* different button, or time expired */ 1491 if (scroll_selection_delay<=0)
1573 R->MEvent.clicks = 1; 1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1574 R->MEvent.button = ev->button; 1493
1575 rxvt_mouse_report(aR_ ev); 1494 /* save the event params so we can highlight
1576 } 1495 * the selection in the pending-scroll loop
1577#else
1578 R->MEvent.button = ev->button;
1579 rxvt_mouse_report(aR_ ev);
1580#endif /* MOUSE_REPORT_DOUBLECLICK */
1581 }
1582 else
1583 {
1584 if (ev->button != R->MEvent.button)
1585 R->MEvent.clicks = 0;
1586 switch (ev->button)
1587 { 1496 */
1588 case Button1: 1497 selection_save_x=ev.xbutton.x;
1589 /* allow shift+left click to extend selection */ 1498 selection_save_y=ev.xbutton.y;
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501
1502 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth)
1591 { 1504 {
1592 if (R->MEvent.button == Button1 && clickintime) 1505 scroll_selection_dir = UP;
1593 R->selection_rotate (ev->x, ev->y); 1506 dist = TermWin.int_bwidth - ev.xbutton.y;
1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 } 1507 }
1597 else 1508 else
1598 { 1509 {
1599 if (R->MEvent.button == Button1 && clickintime) 1510 scroll_selection_dir = DN;
1600 R->MEvent.clicks++; 1511 dist = ev.xbutton.y -
1601 else 1512 (TermWin.int_bwidth + TermWin.height);
1602 R->MEvent.clicks = 1;
1603
1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 } 1513 }
1514 scroll_selection_lines=(Pixel2Height(dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES);
1518 }
1519 else
1520 {
1521 /* we are within the text window, so we
1522 * shouldn't be scrolling
1523 */
1524 pending_scroll_selection = 0;
1525 }
1526#endif
1527#ifdef MOUSE_THRESHOLD
1606 1528
1529 }
1530#endif
1531
1532 }
1533 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion())
1535 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win,
1537 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win,
1539 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y),
1542 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO,
1544 scrollbar_size());
1545 scr_refresh (refresh_type);
1546 refresh_limit = 0;
1547 scrollbar_show (1);
1548 }
1549 break;
1550 }
1551}
1552
1553void
1554rxvt_term::rootwin_cb (XEvent &ev)
1555{
1556 SET_R (this);
1557 SET_LOCALE (locale);
1558
1559 if (ev.type == PropertyNotify)
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 if ((Options & Opt_transparent) && check_our_parents ())
1573 {
1574 if (am_transparent)
1575 want_full_refresh = 1;
1576 }
1577}
1578
1579void
1580rxvt_term::button_press (const XButtonEvent &ev)
1581{
1582 int reportmode = 0, clickintime;
1583
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1585 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1587 /*
1588 * VT window processing of button press
1589 */
1590 if (ev.window == TermWin.vt)
1591 {
1592#if RXVT_GRAPHICS
1593 if (ev.subwindow != None)
1594 rxvt_Gr_ButtonPress (ev.x, ev.y);
1595 else
1596#endif
1597
1598 {
1599 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1600 if (reportmode)
1601 {
1602 /* mouse report from vt window */
1603 /* save the xbutton state (for ButtonRelease) */
1604 MEvent.state = ev.state;
1605#ifdef MOUSE_REPORT_DOUBLECLICK
1606 if (ev.button == MEvent.button && clickintime)
1607 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */
1613 MEvent.clicks = 2;
1614 mouse_report (ev);
1615
1616 /* don't report the release */
1617 MEvent.clicks = 0;
1618 MEvent.button = AnyButton;
1619 }
1620 }
1621 else
1622 {
1623 /* different button, or time expired */
1624 MEvent.clicks = 1;
1625 MEvent.button = ev.button;
1626 mouse_report (ev);
1627 }
1628#else
1629 MEvent.button = ev.button;
1630 mouse_report (ev);
1631#endif /* MOUSE_REPORT_DOUBLECLICK */
1632
1633 }
1634 else
1635 {
1636 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0;
1638 switch (ev.button)
1639 {
1640 case Button1:
1641 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1643 {
1644 if (MEvent.button == Button1 && clickintime)
1645 selection_rotate (ev.x, ev.y);
1646 else
1647 selection_extend (ev.x, ev.y, 1);
1648 }
1649 else
1650 {
1651 if (MEvent.button == Button1 && clickintime)
1652 MEvent.clicks++;
1653 else
1654 MEvent.clicks = 1;
1655
1656 selection_click (MEvent.clicks, ev.x, ev.y);
1657 }
1658
1607 R->MEvent.button = Button1; 1659 MEvent.button = Button1;
1660 break;
1661
1662 case Button3:
1663 if (MEvent.button == Button3 && clickintime)
1664 selection_rotate (ev.x, ev.y);
1665 else
1666 selection_extend (ev.x, ev.y, 1);
1667 MEvent.button = Button3;
1668 break;
1669 }
1670 }
1671 MEvent.time = ev.time;
1672 return;
1673 }
1674 }
1675
1676 /*
1677 * Scrollbar window processing of button press
1678 */
1679 if (isScrollbarWindow(ev.window))
1680 {
1681 scrollBar.setIdle ();
1682 /*
1683 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider
1685 * move dn if mouse is below slider
1686 *
1687 * XTerm-style scrollbar:
1688 * Move display proportional to pointer location
1689 * pointer near top -> scroll one line
1690 * pointer near bot -> scroll full page
1691 */
1692#ifndef NO_SCROLLBAR_REPORT
1693 if (reportmode)
1694 {
1695 /*
1696 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down
1699 */
1700 if ((scrollBar.style == R_SB_NEXT
1701 && scrollbarnext_upButton(ev.y))
1702 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y)))
1704 tt_printf("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT
1706 && scrollbarnext_dnButton(ev.y))
1707 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y)))
1709 tt_printf("\033[B");
1710 else
1711 switch (ev.button)
1712 {
1713 case Button2:
1714 tt_printf("\014");
1715 break;
1716 case Button1:
1717 tt_printf("\033[6~");
1718 break;
1719 case Button3:
1720 tt_printf("\033[5~");
1721 break;
1722 }
1723 }
1724 else
1725#endif /* NO_SCROLLBAR_REPORT */
1726
1727 {
1728 char upordown = 0;
1729
1730 if (scrollBar.style == R_SB_NEXT)
1731 {
1732 if (scrollbarnext_upButton(ev.y))
1733 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y))
1735 upordown = 1; /* down */
1736 }
1737 else if (scrollBar.style == R_SB_RXVT)
1738 {
1739 if (scrollbarrxvt_upButton(ev.y))
1740 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y))
1742 upordown = 1; /* down */
1743 }
1744 if (upordown)
1745 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1747 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1748#endif
1749 if (scr_page (upordown < 0 ? UP : DN, 1))
1750 {
1751 if (upordown < 0)
1752 scrollBar.setUp ();
1753 else
1754 scrollBar.setDn ();
1755 }
1756 }
1757 else
1758 switch (ev.button)
1759 {
1760 case Button2:
1761 switch (scrollbar_align)
1762 {
1763 case R_SB_ALIGN_TOP:
1764 csrO = 0;
1608 break; 1765 break;
1609 1766 case R_SB_ALIGN_CENTRE:
1610 case Button3: 1767 csrO = (scrollBar.bot - scrollBar.top) / 2;
1611 if (R->MEvent.button == Button3 && clickintime)
1612 R->selection_rotate (ev->x, ev->y);
1613 else
1614 R->selection_extend (ev->x, ev->y, 1);
1615 R->MEvent.button = Button3;
1616 break; 1768 break;
1769 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top;
1771 break;
1772 }
1773 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y)
1775 || scrollbar_below_slider(ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO,
1777 scrollbar_size());
1778 scrollBar.setMotion ();
1779 break;
1780
1781 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1783 csrO = ev.y - scrollBar.top;
1784 /* FALLTHROUGH */
1785
1786 case Button3:
1787 if (scrollBar.style != R_SB_XTERM)
1788 {
1789 if (scrollbar_above_slider(ev.y))
1790# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1);
1792# else
1793 scr_page (UP, TermWin.nrow / 4);
1794# endif
1795 else if (scrollbar_below_slider(ev.y))
1796# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1);
1798# else
1799 scr_page (DN, TermWin.nrow / 4);
1800# endif
1801 else
1802 scrollBar.setMotion ();
1803 }
1804 else
1805 {
1806 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow
1808 * scrollbar_position(ev.y)
1809 / scrollbar_size()));
1810 }
1811 break;
1812 }
1617 } 1813 }
1618 }
1619 R->MEvent.time = ev->time;
1620 return; 1814 return;
1621 }
1622 }
1623
1624/*
1625 * Scrollbar window processing of button press
1626 */
1627 if (isScrollbarWindow(ev->window))
1628 {
1629 R->scrollBar.setIdle ();
1630 /*
1631 * Rxvt-style scrollbar:
1632 * move up if mouse is above slider
1633 * move dn if mouse is below slider
1634 *
1635 * XTerm-style scrollbar:
1636 * Move display proportional to pointer location
1637 * pointer near top -> scroll one line
1638 * pointer near bot -> scroll full page
1639 */
1640#ifndef NO_SCROLLBAR_REPORT
1641 if (reportmode) {
1642 /*
1643 * Mouse report disabled scrollbar:
1644 * arrow buttons - send up/down
1645 * click on scrollbar - send pageup/down
1646 */
1647 if ((R->scrollBar.style == R_SB_NEXT
1648 && scrollbarnext_upButton(ev->y))
1649 || (R->scrollBar.style == R_SB_RXVT
1650 && scrollbarrxvt_upButton(ev->y)))
1651 R->tt_printf("\033[A");
1652 else if ((R->scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_dnButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_dnButton(ev->y)))
1656 R->tt_printf("\033[B");
1657 else
1658 switch (ev->button) {
1659 case Button2:
1660 R->tt_printf("\014");
1661 break;
1662 case Button1:
1663 R->tt_printf("\033[6~");
1664 break;
1665 case Button3:
1666 R->tt_printf("\033[5~");
1667 break;
1668 }
1669 }
1670 else
1671#endif /* NO_SCROLLBAR_REPORT */
1672 {
1673 char upordown = 0;
1674
1675 if (R->scrollBar.style == R_SB_NEXT) {
1676 if (scrollbarnext_upButton(ev->y))
1677 upordown = -1; /* up */
1678 else if (scrollbarnext_dnButton(ev->y))
1679 upordown = 1; /* down */
1680 } else if (R->scrollBar.style == R_SB_RXVT) {
1681 if (scrollbarrxvt_upButton(ev->y))
1682 upordown = -1; /* up */
1683 else if (scrollbarrxvt_dnButton(ev->y))
1684 upordown = 1; /* down */
1685 } 1815 }
1686 if (upordown) { 1816#if MENUBAR
1817 /*
1818 * Menubar window processing of button press
1819 */
1820 if (isMenuBarWindow(ev.window))
1821 menubar_control (ev);
1822#endif
1823}
1824
1825void
1826rxvt_term::button_release (const XButtonEvent &ev)
1827{
1828 int reportmode = 0;
1829
1830 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1833
1834 if (scrollbar_isUpDn())
1835 {
1836 scrollBar.setIdle ();
1837 scrollbar_show (0);
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1839 refresh_type &= ~SMOOTH_REFRESH;
1689#endif
1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1691 if (upordown < 0)
1692 R->scrollBar.setUp ();
1693 else
1694 R->scrollBar.setDn ();
1695 }
1696 } else
1697 switch (ev->button) {
1698 case Button2:
1699 switch (R->scrollbar_align) {
1700 case R_SB_ALIGN_TOP:
1701 R->csrO = 0;
1702 break;
1703 case R_SB_ALIGN_CENTRE:
1704 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1705 break;
1706 case R_SB_ALIGN_BOTTOM:
1707 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1708 break;
1709 }
1710 if (R->scrollBar.style == R_SB_XTERM
1711 || scrollbar_above_slider(ev->y)
1712 || scrollbar_below_slider(ev->y))
1713 rxvt_scr_move_to(aR_
1714 scrollbar_position(ev->y) - R->csrO,
1715 scrollbar_size());
1716 R->scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1721 R->csrO = ev->y - R->scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (R->scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1729# else
1730 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1731# endif 1840#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1735# else
1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1737# endif
1738 else
1739 R->scrollBar.setMotion ();
1740 } else {
1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1742 (R->TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 rxvt_menubar_control(aR_ ev);
1757#endif
1758}
1759 1841
1760/* INTPROTO */
1761void
1762rxvt_button_release(pR_ XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 R->csrO = 0; /* reset csr Offset */
1767 if (!R->bypass_keystate)
1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 R->scrollBar.setIdle ();
1772 rxvt_scrollbar_show(aR_ 0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 R->refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1842 }
1777#ifdef SELECTION_SCROLLING 1843#ifdef SELECTION_SCROLLING
1778 R->pending_scroll_selection=0; 1844 pending_scroll_selection=0;
1779#endif 1845#endif
1780 if (ev->window == R->TermWin.vt) 1846 if (ev.window == TermWin.vt)
1781 { 1847 {
1782#ifdef RXVT_GRAPHICS 1848#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None) 1849 if (ev.subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1850 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1785 else 1851 else
1786#endif 1852#endif
1853
1787 { 1854 {
1788 if (reportmode) 1855 if (reportmode)
1789 { 1856 {
1790 /* mouse report from vt window */ 1857 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1858 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1859 if (ev.button >= 4)
1793 return; 1860 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1862 /* only report the release of 'slow' single clicks */
1796 if (R->MEvent.button != AnyButton 1863 if (MEvent.button != AnyButton
1797 && (ev->button != R->MEvent.button 1864 && (ev.button != MEvent.button
1798 || (ev->time - R->MEvent.time 1865 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1866 > MULTICLICK_TIME / 2)))
1800 { 1867 {
1801 R->MEvent.clicks = 0; 1868 MEvent.clicks = 0;
1802 R->MEvent.button = AnyButton; 1869 MEvent.button = AnyButton;
1803 rxvt_mouse_report(aR_ ev); 1870 mouse_report (ev);
1804 } 1871 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1872#else /* MOUSE_REPORT_DOUBLECLICK */
1806 R->MEvent.button = AnyButton; 1873 MEvent.button = AnyButton;
1807 rxvt_mouse_report(aR_ ev); 1874 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1876 return;
1810 } 1877 }
1811 /* 1878 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1879 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1880 * when overriding mouse reporting
1814 */ 1881 */
1815 if (R->PrivateModes & PrivMode_mouse_report 1882 if (PrivateModes & PrivMode_mouse_report
1816 && R->bypass_keystate 1883 && bypass_keystate
1817 && ev->button == Button1 && R->MEvent.clicks <= 1) 1884 && ev.button == Button1 && MEvent.clicks <= 1)
1818 R->selection_extend (ev->x, ev->y, 0); 1885 selection_extend (ev.x, ev.y, 0);
1819 1886
1820 switch (ev->button) { 1887 switch (ev.button)
1888 {
1821 case Button1: 1889 case Button1:
1822 case Button3: 1890 case Button3:
1823 rxvt_selection_make(aR_ ev->time); 1891 selection_make (ev.time);
1824 break; 1892 break;
1825 case Button2: 1893 case Button2:
1826 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1894 selection_request (ev.time, ev.x, ev.y);
1827 break; 1895 break;
1828#ifdef MOUSE_WHEEL 1896#ifdef MOUSE_WHEEL
1829 case Button4: 1897 case Button4:
1830 case Button5: 1898 case Button5:
1831 { 1899 {
1832 int i; 1900 int i;
1833 page_dirn v; 1901 page_dirn v;
1834 1902
1835 v = (ev->button == Button4) ? UP : DN; 1903 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1904 if (ev.state & ShiftMask)
1837 i = 1; 1905 i = 1;
1838 else if ((R->Options & Opt_mouseWheelScrollPage)) 1906 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = R->TermWin.nrow - 1; 1907 i = TermWin.nrow - 1;
1840 else 1908 else
1841 i = 5; 1909 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1910# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1911 if (ev.state & ControlMask)
1844 { 1912 {
1845 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1913 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1915 }
1848# endif 1916# endif
1849# ifdef JUMP_MOUSE_WHEEL 1917# ifdef JUMP_MOUSE_WHEEL
1850 rxvt_scr_page(aR_ v, i); 1918 scr_page (v, i);
1851 R->scr_refresh (SMOOTH_REFRESH); 1919 scr_refresh (SMOOTH_REFRESH);
1852 rxvt_scrollbar_show(aR_ 1); 1920 scrollbar_show (1);
1853# else 1921# else
1854 while (i--) 1922 while (i--)
1855 { 1923 {
1856 rxvt_scr_page(aR_ v, 1); 1924 scr_page (v, 1);
1857 R->scr_refresh (SMOOTH_REFRESH); 1925 scr_refresh (SMOOTH_REFRESH);
1858 rxvt_scrollbar_show(aR_ 1); 1926 scrollbar_show (1);
1859 } 1927 }
1860# endif 1928# endif
1861 } 1929
1862 break; 1930 }
1931 break;
1863#endif 1932#endif
1864 } 1933
1865 } 1934 }
1866 } 1935 }
1936 }
1867#ifdef MENUBAR 1937#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1938 else if (isMenuBarWindow(ev.window))
1869 rxvt_menubar_control(aR_ ev); 1939 menubar_control (ev);
1870#endif 1940#endif
1871} 1941}
1872 1942
1873 1943
1874#ifdef TRANSPARENT 1944#ifdef TRANSPARENT
1875/* 1945/*
1876 * Check our parents are still who we think they are. 1946 * Check our parents are still who we think they are.
1877 * Do transparency updates if required 1947 * Do transparency updates if required
1878 */ 1948 */
1879/* EXTPROTO */
1880int 1949int
1881rxvt_check_our_parents(pR) 1950rxvt_term::check_our_parents ()
1882{ 1951{
1883 int i, pchanged, aformat, have_pixmap, rootdepth; 1952 int i, pchanged, aformat, have_pixmap, rootdepth;
1884 unsigned long nitems, bytes_after; 1953 unsigned long nitems, bytes_after;
1885 Atom atype; 1954 Atom atype;
1886 unsigned char *prop = NULL; 1955 unsigned char *prop = NULL;
1887 Window root, oldp, *list; 1956 Window root, oldp, *list;
1888 Pixmap rootpixmap = None; 1957 Pixmap rootpixmap = None;
1889 XWindowAttributes wattr, wrootattr; 1958 XWindowAttributes wattr, wrootattr;
1890 1959
1891 pchanged = 0; 1960 pchanged = 0;
1892 1961
1893 if (!(R->Options & Opt_transparent)) 1962 if (!(Options & Opt_transparent))
1894 return pchanged; /* Don't try any more */ 1963 return pchanged; /* Don't try any more */
1895 1964
1896 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1965 XGetWindowAttributes(display->display, display->root, &wrootattr);
1897 rootdepth = wrootattr.depth; 1966 rootdepth = wrootattr.depth;
1898 1967
1899 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
1900 if (rootdepth != wattr.depth) { 1969 if (rootdepth != wattr.depth)
1970 {
1901 if (R->am_transparent) { 1971 if (am_transparent)
1972 {
1902 pchanged = 1; 1973 pchanged = 1;
1903 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1974 XSetWindowBackground(display->display, TermWin.vt,
1904 R->PixColors[Color_bg]); 1975 PixColors[Color_bg]);
1905 R->am_transparent = R->am_pixmap_trans = 0; 1976 am_transparent = am_pixmap_trans = 0;
1906 } 1977 }
1907 return pchanged; /* Don't try any more */ 1978 return pchanged; /* Don't try any more */
1908 } 1979 }
1909 1980
1910/* Get all X ops out of the queue so that our information is up-to-date. */ 1981 /* Get all X ops out of the queue so that our information is up-to-date. */
1911 XSync(R->Xdisplay, False); 1982 XSync(display->display, False);
1912 1983
1913/* 1984 /*
1914 * Make the frame window set by the window manager have 1985 * Make the frame window set by the window manager have
1915 * the root background. Some window managers put multiple nested frame 1986 * the root background. Some window managers put multiple nested frame
1916 * windows for each client, so we have to take care about that. 1987 * windows for each client, so we have to take care about that.
1917 */ 1988 */
1918 i = (R->xa[XA_XROOTPMAPID] != 0 1989 i = (xa[XA_XROOTPMAPID] != 0
1919 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID],
1920 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1921 &nitems, &bytes_after, &prop) == Success)); 1992 &nitems, &bytes_after, &prop) == Success));
1922 if (!i || prop == NULL) 1993 if (!i || prop == NULL)
1923 have_pixmap = 0; 1994 have_pixmap = 0;
1924 else { 1995 else
1996 {
1925 have_pixmap = 1; 1997 have_pixmap = 1;
1926 rootpixmap = *((Pixmap *)prop); 1998 rootpixmap = *((Pixmap *)prop);
1927 XFree(prop); 1999 XFree(prop);
1928 } 2000 }
1929 if (have_pixmap) { 2001 if (have_pixmap)
1930/* 2002 {
2003 /*
1931 * Copy Xroot pixmap transparency 2004 * Copy display->root pixmap transparency
1932 */ 2005 */
1933 int sx, sy, nx, ny; 2006 int sx, sy, nx, ny;
1934 unsigned int nw, nh; 2007 unsigned int nw, nh;
1935 Window cr; 2008 Window cr;
1936 XImage *image; 2009 XImage *image;
1937 GC gc; 2010 GC gc;
1938 XGCValues gcvalue; 2011 XGCValues gcvalue;
1939 2012
1940 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root,
1941 0, 0, &sx, &sy, &cr); 2014 0, 0, &sx, &sy, &cr);
1942 nw = (unsigned int)R->szHint.width; 2015 nw = (unsigned int)szHint.width;
1943 nh = (unsigned int)R->szHint.height; 2016 nh = (unsigned int)szHint.height;
1944 nx = ny = 0; 2017 nx = ny = 0;
1945 if (sx < 0) { 2018 if (sx < 0)
2019 {
1946 nw += sx; 2020 nw += sx;
1947 nx = -sx; 2021 nx = -sx;
1948 sx = 0; 2022 sx = 0;
1949 } 2023 }
1950 if (sy < 0) { 2024 if (sy < 0)
2025 {
1951 nh += sy; 2026 nh += sy;
1952 ny = -sy; 2027 ny = -sy;
1953 sy = 0; 2028 sy = 0;
1954 } 2029 }
1955 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1956 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1957 R->allowedxerror = -1; 2032 allowedxerror = -1;
1958 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1959 ZPixmap); 2034 ZPixmap);
1960 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1961 /* XXX: may need a delay here? */ 2036 /* XXX: may need a delay here? */
1962 R->allowedxerror = 0; 2037 allowedxerror = 0;
1963 if (image == NULL) { 2038 if (image == NULL)
2039 {
1964 if (R->am_transparent && R->am_pixmap_trans) { 2040 if (am_transparent && am_pixmap_trans)
1965 pchanged = 1; 2041 {
2042 pchanged = 1;
2043 if (TermWin.pixmap != None)
2044 {
2045 XFreePixmap(display->display, TermWin.pixmap);
2046 TermWin.pixmap = None;
2047 }
2048 }
2049 am_pixmap_trans = 0;
2050 }
2051 else
2052 {
1966 if (R->TermWin.pixmap != None) { 2053 if (TermWin.pixmap != None)
1967 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2054 XFreePixmap(display->display, TermWin.pixmap);
1968 R->TermWin.pixmap = None; 2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,
1969 } 2056 (unsigned int)szHint.width,
2057 (unsigned int)szHint.height,
2058 (unsigned int)image->depth);
2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue);
2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0,
2061 nx, ny, (unsigned int)image->width,
2062 (unsigned int)image->height);
2063 XFreeGC(display->display, gc);
2064 XDestroyImage(image);
2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2066 TermWin.pixmap);
2067 if (!am_transparent || !am_pixmap_trans)
2068 pchanged = 1;
2069 am_transparent = am_pixmap_trans = 1;
2070 }
1970 } 2071 }
1971 R->am_pixmap_trans = 0;
1972 } else {
1973 if (R->TermWin.pixmap != None)
1974 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1975 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1976 (unsigned int)R->szHint.width,
1977 (unsigned int)R->szHint.height,
1978 (unsigned int)image->depth);
1979 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1980 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1981 nx, ny, (unsigned int)image->width,
1982 (unsigned int)image->height);
1983 XFreeGC(R->Xdisplay, gc);
1984 XDestroyImage(image);
1985 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1986 R->TermWin.pixmap);
1987 if (!R->am_transparent || !R->am_pixmap_trans)
1988 pchanged = 1;
1989 R->am_transparent = R->am_pixmap_trans = 1;
1990 }
1991 }
1992 if (!R->am_pixmap_trans) { 2072 if (!am_pixmap_trans)
2073 {
1993 unsigned int n; 2074 unsigned int n;
1994/* 2075 /*
1995 * InheritPixmap transparency 2076 * InheritPixmap transparency
1996 */ 2077 */
1997 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
1998 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
1999 i++) { 2080 i++)
2081 {
2000 oldp = R->TermWin.parent[i]; 2082 oldp = TermWin.parent[i];
2001 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2083 XQueryTree(display->display, TermWin.parent[i - 1], &root,
2002 &R->TermWin.parent[i], &list, &n); 2084 &TermWin.parent[i], &list, &n);
2003 XFree(list); 2085 XFree(list);
2004 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2005 if (R->TermWin.parent[i] == Xroot) { 2087 if (TermWin.parent[i] == display->root)
2006 if (oldp != None) 2088 {
2007 pchanged = 1; 2089 if (oldp != None)
2008 break; 2090 pchanged = 1;
2009 } 2091 break;
2092 }
2010 if (oldp != R->TermWin.parent[i]) 2093 if (oldp != TermWin.parent[i])
2011 pchanged = 1; 2094 pchanged = 1;
2012 } 2095 }
2013 n = 0; 2096 n = 0;
2014 if (pchanged) { 2097 if (pchanged)
2098 {
2015 for (; n < (unsigned int)i; n++) { 2099 for (; n < (unsigned int)i; n++)
2100 {
2016 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr);
2017 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2102 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2018 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2103 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2104 {
2019 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2020 break; 2106 break;
2021 } 2107 }
2022 } 2108 }
2023 } 2109 }
2024 if (n > (int)(sizeof(R->TermWin.parent) 2110 if (n > (int)(sizeof(TermWin.parent)
2025 / sizeof(R->TermWin.parent[0]))) { 2111 / sizeof(TermWin.parent[0])))
2112 {
2026 D_X((stderr, "InheritPixmap Turning off")); 2113 D_X((stderr, "InheritPixmap Turning off"));
2027 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2114 XSetWindowBackground(display->display, TermWin.parent[0],
2028 R->PixColors[Color_fg]); 2115 PixColors[Color_fg]);
2029 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2116 XSetWindowBackground(display->display, TermWin.vt,
2030 R->PixColors[Color_bg]); 2117 PixColors[Color_bg]);
2031 R->am_transparent = 0; 2118 am_transparent = 0;
2032 /* XXX: also turn off Opt_transparent? */ 2119 /* XXX: also turn off Opt_transparent? */
2033 } else { 2120 }
2121 else
2122 {
2034 /* wait (an arbitrary period) for the WM to do its thing 2123 /* wait (an arbitrary period) for the WM to do its thing
2035 * needed for fvwm2.2.2 (and before?) */ 2124 * needed for fvwm2.2.2 (and before?) */
2036# ifdef HAVE_NANOSLEEP 2125# ifdef HAVE_NANOSLEEP
2037 struct timespec rqt; 2126 struct timespec rqt;
2038 2127
2039 rqt.tv_sec = 1; 2128 rqt.tv_sec = 1;
2040 rqt.tv_nsec = 0; 2129 rqt.tv_nsec = 0;
2041 nanosleep(&rqt, NULL); 2130 nanosleep(&rqt, NULL);
2042# else 2131# else
2043 sleep(1); 2132 sleep(1);
2044# endif 2133# endif
2045 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2046 for (n = 0; n < (unsigned int)i; n++) 2135 for (n = 0; n < (unsigned int)i; n++)
2047 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n],
2048 ParentRelative); 2137 ParentRelative);
2049 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2050 ParentRelative); 2139 ParentRelative);
2051 R->am_transparent = 1; 2140 am_transparent = 1;
2052 } 2141 }
2053 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2054 R->TermWin.parent[i] = None; 2143 TermWin.parent[i] = None;
2055 } 2144 }
2056 return pchanged; 2145 return pchanged;
2057} 2146}
2058#endif 2147#endif
2059 2148
2060/*}}} */ 2149/*}}} */
2061 2150
2062/*{{{ print pipe */ 2151/*{{{ print pipe */
2063/*----------------------------------------------------------------------*/ 2152/*----------------------------------------------------------------------*/
2064#ifdef PRINTPIPE 2153#ifdef PRINTPIPE
2065/* EXTPROTO */ 2154FILE *
2066FILE *
2067rxvt_popen_printer(pR) 2155rxvt_term::popen_printer ()
2068{ 2156{
2069 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2157 FILE *stream = popen(rs[Rs_print_pipe], "w");
2070 2158
2071 if (stream == NULL) 2159 if (stream == NULL)
2072 rxvt_print_error("can't open printer pipe"); 2160 rxvt_print_error("can't open printer pipe");
2073 return stream; 2161 return stream;
2074} 2162}
2075 2163
2076/* EXTPROTO */
2077int 2164int
2078rxvt_pclose_printer (FILE *stream) 2165rxvt_term::pclose_printer (FILE *stream)
2079{ 2166{
2080 fflush (stream); 2167 fflush (stream);
2081/* pclose() reported not to work on SunOS 4.1.3 */ 2168 /* pclose() reported not to work on SunOS 4.1.3 */
2082# if defined (__sun__) /* TODO: RESOLVE THIS */ 2169# if defined (__sun__) /* TODO: RESOLVE THIS */
2083/* pclose works provided SIGCHLD handler uses waitpid */ 2170 /* pclose works provided SIGCHLD handler uses waitpid */
2084 return pclose (stream); /* return fclose (stream); */ 2171 return pclose (stream); /* return fclose (stream); */
2085# else 2172# else
2086 return pclose (stream); 2173 return pclose (stream);
2087# endif 2174# endif
2088} 2175}
2089 2176
2090/* 2177/*
2091 * simulate attached vt100 printer 2178 * simulate attached vt100 printer
2092 */ 2179 */
2093/* INTPROTO */
2094void 2180void
2095rxvt_process_print_pipe(pR) 2181rxvt_term::process_print_pipe ()
2096{ 2182{
2097 int done; 2183 int done;
2098 FILE *fd; 2184 FILE *fd;
2099 2185
2100 if ((fd = rxvt_popen_printer(aR)) == NULL) 2186 if ((fd = popen_printer ()) == NULL)
2101 return; 2187 return;
2102 2188
2103/* 2189 /*
2104 * Send all input to the printer until either ESC[4i or ESC[?4i 2190 * Send all input to the printer until either ESC[4i or ESC[?4i
2105 * is received. 2191 * is received.
2106 */ 2192 */
2107 for (done = 0; !done;) { 2193 for (done = 0; !done;)
2194 {
2108 unsigned char buf[8]; 2195 unsigned char buf[8];
2109 unsigned char ch; 2196 unsigned char ch;
2110 unsigned int i, len; 2197 unsigned int i, len;
2111 2198
2112 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2199 if ((ch = cmd_getc ()) != C0_ESC)
2200 {
2113 if (putc(ch, fd) == EOF) 2201 if (putc(ch, fd) == EOF)
2114 break; /* done = 1 */ 2202 break; /* done = 1 */
2115 } else { 2203 }
2204 else
2205 {
2116 len = 0; 2206 len = 0;
2117 buf[len++] = ch; 2207 buf[len++] = ch;
2118 2208
2119 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2209 if ((buf[len++] = cmd_getc ()) == '[')
2120 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2210 {
2121 buf[len++] = '?'; 2211 if ((ch = cmd_getc ()) == '?')
2122 ch = rxvt_cmd_getc(aR); 2212 {
2123 } 2213 buf[len++] = '?';
2214 ch = cmd_getc ();
2215 }
2124 if ((buf[len++] = ch) == '4') { 2216 if ((buf[len++] = ch) == '4')
2217 {
2125 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2218 if ((buf[len++] = cmd_getc ()) == 'i')
2126 break; /* done = 1 */ 2219 break; /* done = 1 */
2127 } 2220 }
2221 }
2222 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF)
2224 {
2225 done = 1;
2226 break;
2227 }
2228 }
2128 } 2229 }
2129 for (i = 0; i < len; i++)
2130 if (putc(buf[i], fd) == EOF) {
2131 done = 1;
2132 break;
2133 }
2134 }
2135 }
2136 rxvt_pclose_printer(fd); 2230 pclose_printer (fd);
2137} 2231}
2138#endif /* PRINTPIPE */ 2232#endif /* PRINTPIPE */
2139/*}}} */ 2233/*}}} */
2140 2234
2141/* *INDENT-OFF* */ 2235/* *INDENT-OFF* */
2142enum { 2236enum {
2143 C1_40 = 0x40, 2237 C1_40 = 0x40,
2144 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2238 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2145 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2239 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2146 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2240 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2147 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2241 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2148}; 2242};
2149/* *INDENT-ON* */ 2243/* *INDENT-ON* */
2150 2244
2151/*{{{ process non-printing single characters */ 2245/*{{{ process non-printing single characters */
2152/* INTPROTO */
2153void 2246void
2154rxvt_process_nonprinting(pR_ unsigned char ch) 2247rxvt_term::process_nonprinting (unsigned char ch)
2155{ 2248{
2156 switch (ch) { 2249 switch (ch)
2250 {
2157 case C0_ENQ: /* terminal Status */ 2251 case C0_ENQ: /* terminal Status */
2158 if (R->rs[Rs_answerbackstring]) 2252 if (rs[Rs_answerbackstring])
2159 R->tt_write( 2253 tt_write(
2160 (const unsigned char *)R->rs[Rs_answerbackstring], 2254 (const unsigned char *)rs[Rs_answerbackstring],
2161 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2255 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2162 else 2256 else
2163 R->tt_write((unsigned char *)VT100_ANS, 2257 tt_write((unsigned char *)VT100_ANS,
2164 (unsigned int)STRLEN(VT100_ANS)); 2258 (unsigned int)STRLEN(VT100_ANS));
2165 break; 2259 break;
2166 case C0_BEL: /* bell */ 2260 case C0_BEL: /* bell */
2167 rxvt_scr_bell(aR); 2261 scr_bell ();
2168 break; 2262 break;
2169 case C0_BS: /* backspace */ 2263 case C0_BS: /* backspace */
2170 rxvt_scr_backspace(aR); 2264 scr_backspace ();
2171 break; 2265 break;
2172 case C0_HT: /* tab */ 2266 case C0_HT: /* tab */
2173 rxvt_scr_tab(aR_ 1); 2267 scr_tab (1);
2174 break; 2268 break;
2175 case C0_CR: /* carriage return */ 2269 case C0_CR: /* carriage return */
2176 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2270 scr_gotorc (0, 0, R_RELATIVE);
2177 break; 2271 break;
2178 case C0_VT: /* vertical tab, form feed */ 2272 case C0_VT: /* vertical tab, form feed */
2179 case C0_FF: 2273 case C0_FF:
2180 case C0_LF: /* line feed */ 2274 case C0_LF: /* line feed */
2181 rxvt_scr_index(aR_ UP); 2275 scr_index (UP);
2182 break; 2276 break;
2183 case C0_SO: /* shift out - acs */ 2277 case C0_SO: /* shift out - acs */
2184 rxvt_scr_charset_choose(aR_ 1); 2278 scr_charset_choose (1);
2185 break; 2279 break;
2186 case C0_SI: /* shift in - acs */ 2280 case C0_SI: /* shift in - acs */
2187 rxvt_scr_charset_choose(aR_ 0); 2281 scr_charset_choose (0);
2188 break; 2282 break;
2189 } 2283 }
2190} 2284}
2191/*}}} */ 2285/*}}} */
2192 2286
2193 2287
2194/*{{{ process VT52 escape sequences */ 2288/*{{{ process VT52 escape sequences */
2195/* INTPROTO */
2196void 2289void
2197rxvt_process_escape_vt52(pR_ unsigned char ch) 2290rxvt_term::process_escape_vt52 (unsigned char ch)
2198{ 2291{
2199 int row, col; 2292 int row, col;
2293
2294 switch (ch)
2200 2295 {
2201 switch (ch) {
2202 case 'A': /* cursor up */ 2296 case 'A': /* cursor up */
2203 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2297 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2204 break; 2298 break;
2205 case 'B': /* cursor down */ 2299 case 'B': /* cursor down */
2206 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2207 break; 2301 break;
2208 case 'C': /* cursor right */ 2302 case 'C': /* cursor right */
2209 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2210 break; 2304 break;
2211 case 'D': /* cursor left */ 2305 case 'D': /* cursor left */
2212 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2213 break; 2307 break;
2214 case 'H': /* cursor home */ 2308 case 'H': /* cursor home */
2215 rxvt_scr_gotorc(aR_ 0, 0, 0); 2309 scr_gotorc (0, 0, 0);
2216 break; 2310 break;
2217 case 'I': /* cursor up and scroll down if needed */ 2311 case 'I': /* cursor up and scroll down if needed */
2218 rxvt_scr_index(aR_ DN); 2312 scr_index (DN);
2219 break; 2313 break;
2220 case 'J': /* erase to end of screen */ 2314 case 'J': /* erase to end of screen */
2221 R->scr_erase_screen (0); 2315 scr_erase_screen (0);
2222 break; 2316 break;
2223 case 'K': /* erase to end of line */ 2317 case 'K': /* erase to end of line */
2224 rxvt_scr_erase_line(aR_ 0); 2318 scr_erase_line (0);
2225 break; 2319 break;
2226 case 'Y': /* move to specified row and col */ 2320 case 'Y': /* move to specified row and col */
2227 /* full command is 'ESC Y row col' where row and col 2321 /* full command is 'ESC Y row col' where row and col
2228 * are encoded by adding 32 and sending the ascii 2322 * are encoded by adding 32 and sending the ascii
2229 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2323 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2230 * etc. */ 2324 * etc. */
2231 row = rxvt_cmd_getc(aR) - ' '; 2325 row = cmd_getc () - ' ';
2232 col = rxvt_cmd_getc(aR) - ' '; 2326 col = cmd_getc () - ' ';
2233 rxvt_scr_gotorc(aR_ row, col, 0); 2327 scr_gotorc (row, col, 0);
2234 break; 2328 break;
2235 case 'Z': /* identify the terminal type */ 2329 case 'Z': /* identify the terminal type */
2236 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2237 break; 2331 break;
2238 case '<': /* turn off VT52 mode */ 2332 case '<': /* turn off VT52 mode */
2239 PrivMode(0, PrivMode_vt52); 2333 PrivMode(0, PrivMode_vt52);
2240 break; 2334 break;
2241 case 'F': /* use special graphics character set */ 2335 case 'F': /* use special graphics character set */
2242 case 'G': /* use regular character set */ 2336 case 'G': /* use regular character set */
2243 /* unimplemented */ 2337 /* unimplemented */
2244 break; 2338 break;
2245 case '=': /* use alternate keypad mode */ 2339 case '=': /* use alternate keypad mode */
2246 case '>': /* use regular keypad mode */ 2340 case '>': /* use regular keypad mode */
2247 /* unimplemented */ 2341 /* unimplemented */
2248 break; 2342 break;
2249 } 2343 }
2250} 2344}
2251/*}}} */ 2345/*}}} */
2252 2346
2253 2347
2254/*{{{ process escape sequences */ 2348/*{{{ process escape sequences */
2255/* INTPROTO */
2256void 2349void
2257rxvt_process_escape_seq(pR) 2350rxvt_term::process_escape_seq ()
2258{ 2351{
2259 unsigned char ch = rxvt_cmd_getc(aR); 2352 unsigned char ch = cmd_getc ();
2260 2353
2261 if (R->PrivateModes & PrivMode_vt52) { 2354 if (PrivateModes & PrivMode_vt52)
2262 rxvt_process_escape_vt52(aR_ ch);
2263 return;
2264 }
2265 2355 {
2356 process_escape_vt52 (ch);
2357 return;
2358 }
2359
2266 switch (ch) { 2360 switch (ch)
2361 {
2267 /* case 1: do_tek_mode (); break; */ 2362 /* case 1: do_tek_mode (); break; */
2268 case '#': 2363 case '#':
2269 if (rxvt_cmd_getc(aR) == '8') 2364 if (cmd_getc () == '8')
2270 rxvt_scr_E(aR); 2365 scr_E ();
2271 break; 2366 break;
2272 case '(': 2367 case '(':
2273 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2368 scr_charset_set (0, (unsigned int)cmd_getc ());
2274 break; 2369 break;
2275 case ')': 2370 case ')':
2276 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2371 scr_charset_set (1, (unsigned int)cmd_getc ());
2277 break; 2372 break;
2278 case '*': 2373 case '*':
2279 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2374 scr_charset_set (2, (unsigned int)cmd_getc ());
2280 break; 2375 break;
2281 case '+': 2376 case '+':
2282 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2377 scr_charset_set (3, (unsigned int)cmd_getc ());
2283 break; 2378 break;
2284#ifdef MULTICHAR_SET 2379#ifdef MULTICHAR_SET
2285 case '$': 2380 case '$':
2286 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2287 break; 2382 break;
2288#endif 2383#endif
2289#ifndef NO_FRILLS 2384#ifndef NO_FRILLS
2290 case '6': 2385 case '6':
2291 rxvt_scr_backindex(aR); 2386 scr_backindex ();
2292 break; 2387 break;
2293#endif 2388#endif
2294 case '7': 2389 case '7':
2295 rxvt_scr_cursor(aR_ SAVE); 2390 scr_cursor (SAVE);
2296 break; 2391 break;
2297 case '8': 2392 case '8':
2298 rxvt_scr_cursor(aR_ RESTORE); 2393 scr_cursor (RESTORE);
2299 break; 2394 break;
2300#ifndef NO_FRILLS 2395#ifndef NO_FRILLS
2301 case '9': 2396 case '9':
2302 rxvt_scr_forwardindex(aR); 2397 scr_forwardindex ();
2303 break; 2398 break;
2304#endif 2399#endif
2305 case '=': 2400 case '=':
2306 case '>': 2401 case '>':
2307 PrivMode((ch == '='), PrivMode_aplKP); 2402 PrivMode((ch == '='), PrivMode_aplKP);
2308 break; 2403 break;
2309 2404
2310 case C1_40: 2405 case C1_40:
2311 rxvt_cmd_getc(aR); 2406 cmd_getc ();
2312 break; 2407 break;
2313 case C1_44: 2408 case C1_44:
2314 rxvt_scr_index(aR_ UP); 2409 scr_index (UP);
2315 break; 2410 break;
2316 2411
2317 /* 8.3.87: NEXT LINE */ 2412 /* 8.3.87: NEXT LINE */
2318 case C1_NEL: /* ESC E */ 2413 case C1_NEL: /* ESC E */
2319 { 2414 {
2320 uint32_t nlcr[] = { '\n', '\r' }; 2415 uint32_t nlcr[] = { '\n', '\r' };
2321 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2416 scr_add_lines (nlcr, 1, 2);
2322 } 2417 }
2323 break; 2418 break;
2324 2419
2325 /* kidnapped escape sequence: Should be 8.3.48 */ 2420 /* kidnapped escape sequence: Should be 8.3.48 */
2326 case C1_ESA: /* ESC G */ 2421 case C1_ESA: /* ESC G */
2327 rxvt_process_graphics(aR); 2422 process_graphics ();
2328 break; 2423 break;
2329 2424
2330 /* 8.3.63: CHARACTER TABULATION SET */ 2425 /* 8.3.63: CHARACTER TABULATION SET */
2331 case C1_HTS: /* ESC H */ 2426 case C1_HTS: /* ESC H */
2332 rxvt_scr_set_tab(aR_ 1); 2427 scr_set_tab (1);
2333 break; 2428 break;
2334 2429
2335 /* 8.3.105: REVERSE LINE FEED */ 2430 /* 8.3.105: REVERSE LINE FEED */
2336 case C1_RI: /* ESC M */ 2431 case C1_RI: /* ESC M */
2337 rxvt_scr_index(aR_ DN); 2432 scr_index (DN);
2338 break; 2433 break;
2339 2434
2340 /* 8.3.142: SINGLE-SHIFT TWO */ 2435 /* 8.3.142: SINGLE-SHIFT TWO */
2341 /*case C1_SS2: scr_single_shift (2); break; */ 2436 /*case C1_SS2: scr_single_shift (2); break; */
2342 2437
2343 /* 8.3.143: SINGLE-SHIFT THREE */ 2438 /* 8.3.143: SINGLE-SHIFT THREE */
2344 /*case C1_SS3: scr_single_shift (3); break; */ 2439 /*case C1_SS3: scr_single_shift (3); break; */
2345 2440
2346 /* 8.3.27: DEVICE CONTROL STRING */ 2441 /* 8.3.27: DEVICE CONTROL STRING */
2347 case C1_DCS: /* ESC P */ 2442 case C1_DCS: /* ESC P */
2348 rxvt_process_dcs_seq(aR); 2443 process_dcs_seq ();
2349 break; 2444 break;
2350 2445
2351 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2352 case C1_SCI: /* ESC Z */ 2447 case C1_SCI: /* ESC Z */
2353 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2448 tt_write((const unsigned char *)ESCZ_ANSWER,
2354 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2355 break; /* steal obsolete ESC [ c */ 2450 break; /* steal obsolete ESC [ c */
2356 2451
2357 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2358 case C1_CSI: /* ESC [ */ 2453 case C1_CSI: /* ESC [ */
2359 rxvt_process_csi_seq(aR); 2454 process_csi_seq ();
2360 break; 2455 break;
2361 2456
2362 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2457 /* 8.3.90: OPERATING SYSTEM COMMAND */
2363 case C1_OSC: /* ESC ] */ 2458 case C1_OSC: /* ESC ] */
2364 rxvt_process_osc_seq(aR); 2459 process_osc_seq ();
2365 break; 2460 break;
2366 2461
2367 /* 8.3.106: RESET TO INITIAL STATE */ 2462 /* 8.3.106: RESET TO INITIAL STATE */
2368 case 'c': 2463 case 'c':
2369 rxvt_scr_poweron(aR); 2464 scr_poweron ();
2370 rxvt_scrollbar_show(aR_ 1); 2465 scrollbar_show (1);
2371 break; 2466 break;
2372 2467
2373 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2374 case 'n': 2469 case 'n':
2375 rxvt_scr_charset_choose(aR_ 2); 2470 scr_charset_choose (2);
2376 break; 2471 break;
2377 2472
2378 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2473 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2379 case 'o': 2474 case 'o':
2380 rxvt_scr_charset_choose(aR_ 3); 2475 scr_charset_choose (3);
2381 break; 2476 break;
2382 } 2477 }
2383} 2478}
2384/*}}} */ 2479/*}}} */
2385 2480
2386/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2481/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2387/* *INDENT-OFF* */ 2482/* *INDENT-OFF* */
2388enum { 2483enum {
2389 CSI_ICH = 0x40, 2484 CSI_ICH = 0x40,
2390 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2485 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2391 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2486 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2392 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2487 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2393 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2488 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2394 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2489 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2395 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2490 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2396 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2491 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2397 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2492 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2398}; 2493};
2399 2494
2400#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2401 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2402 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2403#define get_byte_array_bit(array, bit) \ 2498#define get_byte_array_bit(array, bit) \
2404 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7))))
2405 2500
2406const unsigned char csi_defaults[] = { 2501const unsigned char csi_defaults[] =
2502 {
2407 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2408 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2504 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2409 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2505 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2410 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2506 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2411 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2507 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2412 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2508 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2413 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2509 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2414 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2510 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2415}; 2511 };
2416/* *INDENT-ON* */ 2512/* *INDENT-ON* */
2417 2513
2418/* INTPROTO */
2419void 2514void
2420rxvt_process_csi_seq(pR) 2515rxvt_term::process_csi_seq ()
2421{ 2516{
2422 unsigned char ch, priv, i; 2517 unsigned char ch, priv, i;
2423 unsigned int nargs, p; 2518 unsigned int nargs, p;
2424 int n, ndef; 2519 int n, ndef;
2425 int arg[ESC_ARGS]; 2520 int arg[ESC_ARGS];
2426 2521
2427 for (nargs = ESC_ARGS; nargs > 0;) 2522 for (nargs = ESC_ARGS; nargs > 0;)
2428 arg[--nargs] = 0; 2523 arg[--nargs] = 0;
2429 2524
2430 priv = 0; 2525 priv = 0;
2526 ch = cmd_getc ();
2527 if (ch >= '<' && ch <= '?')
2528 { /* '<' '=' '>' '?' */
2529 priv = ch;
2431 ch = rxvt_cmd_getc(aR); 2530 ch = cmd_getc ();
2432 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2433 priv = ch;
2434 ch = rxvt_cmd_getc(aR);
2435 } 2531 }
2436/* read any numerical arguments */ 2532 /* read any numerical arguments */
2437 for (n = -1; ch < CSI_ICH; ) { 2533 for (n = -1; ch < CSI_ICH; )
2534 {
2438 if (isdigit(ch)) { 2535 if (isdigit(ch))
2536 {
2439 if (n < 0) 2537 if (n < 0)
2440 n = ch - '0'; 2538 n = ch - '0';
2441 else 2539 else
2442 n = n * 10 + ch - '0'; 2540 n = n * 10 + ch - '0';
2541 }
2443 } else if (ch == ';') { 2542 else if (ch == ';')
2543 {
2444 if (nargs < ESC_ARGS) 2544 if (nargs < ESC_ARGS)
2445 arg[nargs++] = n; 2545 arg[nargs++] = n;
2446 n = -1; 2546 n = -1;
2547 }
2447 } else if (ch == '\b') { 2548 else if (ch == '\b')
2448 rxvt_scr_backspace(aR); 2549 {
2550 scr_backspace ();
2551 }
2449 } else if (ch == C0_ESC) { 2552 else if (ch == C0_ESC)
2450 rxvt_process_escape_seq(aR); 2553 {
2554 process_escape_seq ();
2555 return;
2556 }
2557 else if (ch < ' ')
2558 {
2559 process_nonprinting (ch);
2560 }
2561 ch = cmd_getc ();
2562 }
2563
2564 if (ch > CSI_7F)
2451 return; 2565 return;
2452 } else if (ch < ' ') {
2453 rxvt_process_nonprinting(aR_ ch);
2454 }
2455 ch = rxvt_cmd_getc(aR);
2456 }
2457 2566
2458 if (ch > CSI_7F)
2459 return;
2460
2461 if (nargs < ESC_ARGS) 2567 if (nargs < ESC_ARGS)
2462 arg[nargs++] = n; 2568 arg[nargs++] = n;
2463 2569
2464 i = ch - CSI_ICH; 2570 i = ch - CSI_ICH;
2465 ndef = get_byte_array_bit(csi_defaults, i); 2571 ndef = get_byte_array_bit(csi_defaults, i);
2466 for (p = 0; p < nargs; p++) 2572 for (p = 0; p < nargs; p++)
2467 if (arg[p] == -1) 2573 if (arg[p] == -1)
2468 arg[p] = ndef; 2574 arg[p] = ndef;
2469 2575
2470#ifdef DEBUG_CMD 2576#ifdef DEBUG_CMD
2471 fprintf(stderr, "CSI "); 2577 fprintf(stderr, "CSI ");
2472 for (p = 0; p < nargs; p++) 2578 for (p = 0; p < nargs; p++)
2473 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2474 fprintf(stderr, "%c\n", ch); 2580 fprintf(stderr, "%c\n", ch);
2475#endif 2581#endif
2476 2582
2477/* 2583 /*
2478 * private mode handling 2584 * private mode handling
2479 */ 2585 */
2480 if (priv) { 2586 if (priv)
2481 switch (priv) { 2587 {
2482 case '>': 2588 switch (priv)
2589 {
2590 case '>':
2483 if (ch == CSI_DA) /* secondary device attributes */ 2591 if (ch == CSI_DA) /* secondary device attributes */
2484 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2485 break; 2593 break;
2486 case '?': 2594 case '?':
2487 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2488 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2596 process_terminal_mode (ch, priv, nargs, arg);
2489 break; 2597 break;
2490 } 2598 }
2491 return; 2599 return;
2492 } 2600 }
2493 2601
2494 switch (ch) { 2602 switch (ch)
2495/* 2603 {
2604 /*
2496 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses)
2497 */ 2606 */
2498#ifdef PRINTPIPE 2607#ifdef PRINTPIPE
2499 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2500 switch (arg[0]) { 2609 switch (arg[0])
2610 {
2501 case 0: /* initiate transfer to primary aux device */ 2611 case 0: /* initiate transfer to primary aux device */
2502 rxvt_scr_printscreen(aR_ 0); 2612 scr_printscreen (0);
2503 break; 2613 break;
2504 case 5: /* start relay to primary aux device */ 2614 case 5: /* start relay to primary aux device */
2505 rxvt_process_print_pipe(aR); 2615 process_print_pipe ();
2616 break;
2617 }
2506 break; 2618 break;
2507 }
2508 break;
2509#endif 2619#endif
2510 2620
2511 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2621 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2512 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2622 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2513 arg[0] = -arg[0]; 2623 arg[0] = -arg[0];
2514 /* FALLTHROUGH */ 2624 /* FALLTHROUGH */
2515 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2625 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2516 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2626 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2517 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2627 scr_gotorc (arg[0], 0, RELATIVE);
2518 break; 2628 break;
2519 2629
2520 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2630 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2521 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2631 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2522#ifdef ISO6429 2632#ifdef ISO6429
2523 arg[0] = -arg[0]; 2633 arg[0] = -arg[0];
2524#else /* emulate common DEC VTs */ 2634#else /* emulate common DEC VTs */
2525 arg[0] = arg[0] ? -arg[0] : -1; 2635 arg[0] = arg[0] ? -arg[0] : -1;
2526#endif 2636#endif
2527 /* FALLTHROUGH */ 2637 /* FALLTHROUGH */
2528 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2638 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2529 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2639 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2530#ifdef ISO6429 2640#ifdef ISO6429
2531 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2641 scr_gotorc (0, arg[0], RELATIVE);
2532#else /* emulate common DEC VTs */ 2642#else /* emulate common DEC VTs */
2533 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2643 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2534#endif 2644#endif
2535 break; 2645 break;
2536 2646
2537 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2647 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2538 arg[0] = -arg[0]; 2648 arg[0] = -arg[0];
2539 /* FALLTHROUGH */ 2649 /* FALLTHROUGH */
2540 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2650 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2541 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2651 scr_gotorc (arg[0], 0, R_RELATIVE);
2542 break; 2652 break;
2543 2653
2544 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2654 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2545 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2655 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2546 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2656 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2547 break; 2657 break;
2548 2658
2549 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2659 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2550 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2660 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2551 break; 2661 break;
2552 2662
2553 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2663 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2554 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2664 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2555 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2665 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2556 break; 2666 break;
2557 2667
2558 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2668 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2559 arg[0] = -arg[0]; 2669 arg[0] = -arg[0];
2560 /* FALLTHROUGH */ 2670 /* FALLTHROUGH */
2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2671 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2562 rxvt_scr_tab(aR_ arg[0]); 2672 scr_tab (arg[0]);
2563 break; 2673 break;
2564 2674
2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2675 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2566 R->scr_erase_screen (arg[0]); 2676 scr_erase_screen (arg[0]);
2567 break; 2677 break;
2568 2678
2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2679 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2570 rxvt_scr_erase_line(aR_ arg[0]); 2680 scr_erase_line (arg[0]);
2571 break; 2681 break;
2572 2682
2573 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2683 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2574 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2684 scr_insdel_chars (arg[0], INSERT);
2575 break; 2685 break;
2576 2686
2577 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2687 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2578 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2688 scr_insdel_lines (arg[0], INSERT);
2579 break; 2689 break;
2580 2690
2581 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2691 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2582 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2692 scr_insdel_lines (arg[0], DELETE);
2583 break; 2693 break;
2584 2694
2585 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2695 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2586 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2696 scr_insdel_chars (arg[0], ERASE);
2587 break; 2697 break;
2588 2698
2589 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2699 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2590 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2700 scr_insdel_chars (arg[0], DELETE);
2591 break; 2701 break;
2592 2702
2593 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2703 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2594 arg[0] = -arg[0]; 2704 arg[0] = -arg[0];
2595 /* FALLTHROUGH */ 2705 /* FALLTHROUGH */
2596 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2597 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2598 break; 2708 break;
2599 2709
2600 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2601 R->tt_write((const unsigned char *)VT100_ANS, 2711 tt_write((const unsigned char *)VT100_ANS,
2602 (unsigned int)(sizeof(VT100_ANS) - 1)); 2712 (unsigned int)(sizeof(VT100_ANS) - 1));
2603 break; 2713 break;
2604 2714
2605 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2606 rxvt_process_sgr_mode(aR_ nargs, arg); 2716 process_sgr_mode (nargs, arg);
2607 break; 2717 break;
2608 2718
2609 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2610 switch (arg[0]) { 2720 switch (arg[0])
2721 {
2611 case 5: /* DSR requested */ 2722 case 5: /* DSR requested */
2612 R->tt_printf("\033[0n"); 2723 tt_printf("\033[0n");
2613 break; 2724 break;
2614 case 6: /* CPR requested */ 2725 case 6: /* CPR requested */
2615 rxvt_scr_report_position(aR); 2726 scr_report_position ();
2616 break; 2727 break;
2617#if defined (ENABLE_DISPLAY_ANSWER) 2728#if defined (ENABLE_DISPLAY_ANSWER)
2618 case 7: /* unofficial extension */ 2729 case 7: /* unofficial extension */
2619 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2730 tt_printf("%-.250s\n", rs[Rs_display_name]);
2620 break; 2731 break;
2621#endif 2732#endif
2622 case 8: /* unofficial extension */ 2733 case 8: /* unofficial extension */
2623 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2735 break;
2736 }
2624 break; 2737 break;
2625 }
2626 break;
2627 2738
2628 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2629 switch (arg[0]) { 2740 switch (arg[0])
2741 {
2630 case 0: /* char tab stop cleared at active position */ 2742 case 0: /* char tab stop cleared at active position */
2631 rxvt_scr_set_tab(aR_ 0); 2743 scr_set_tab (0);
2632 break; 2744 break;
2633 /* case 1: */ /* line tab stop cleared in active line */ 2745 /* case 1: */ /* line tab stop cleared in active line */
2634 /* case 2: */ /* char tab stops cleared in active line */ 2746 /* case 2: */ /* char tab stops cleared in active line */
2635 case 3: /* all char tab stops are cleared */ 2747 case 3: /* all char tab stops are cleared */
2636 /* case 4: */ /* all line tab stops are cleared */ 2748 /* case 4: */ /* all line tab stops are cleared */
2637 case 5: /* all tab stops are cleared */ 2749 case 5: /* all tab stops are cleared */
2638 rxvt_scr_set_tab(aR_ -1); 2750 scr_set_tab (-1);
2751 break;
2752 }
2639 break; 2753 break;
2640 }
2641 break;
2642 2754
2643 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2755 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2644 switch (arg[0]) { 2756 switch (arg[0])
2757 {
2645 case 0: /* char tab stop set at active position */ 2758 case 0: /* char tab stop set at active position */
2646 rxvt_scr_set_tab(aR_ 1); 2759 scr_set_tab (1);
2647 break; /* = ESC H */ 2760 break; /* = ESC H */
2648 /* case 1: */ /* line tab stop set at active line */ 2761 /* case 1: */ /* line tab stop set at active line */
2649 case 2: /* char tab stop cleared at active position */ 2762 case 2: /* char tab stop cleared at active position */
2650 rxvt_scr_set_tab(aR_ 0); 2763 scr_set_tab (0);
2651 break; /* = ESC [ 0 g */ 2764 break; /* = ESC [ 0 g */
2652 /* case 3: */ /* line tab stop cleared at active line */ 2765 /* case 3: */ /* line tab stop cleared at active line */
2653 /* case 4: */ /* char tab stops cleared at active line */ 2766 /* case 4: */ /* char tab stops cleared at active line */
2654 case 5: /* all char tab stops are cleared */ 2767 case 5: /* all char tab stops are cleared */
2655 rxvt_scr_set_tab(aR_ -1); 2768 scr_set_tab (-1);
2656 break; /* = ESC [ 3 g */ 2769 break; /* = ESC [ 3 g */
2657 /* case 6: */ /* all line tab stops are cleared */ 2770 /* case 6: */ /* all line tab stops are cleared */
2658 } 2771 }
2659 break; 2772 break;
2660 2773
2661 case CSI_RM: /* 8.3.107: RESET MODE */ 2774 case CSI_RM: /* 8.3.107: RESET MODE */
2662 if (arg[0] == 4) 2775 if (arg[0] == 4)
2663 rxvt_scr_insert_mode(aR_ 0); 2776 scr_insert_mode (0);
2664 break; 2777 break;
2665 2778
2666 case CSI_SM: /* 8.3.126: SET MODE */ 2779 case CSI_SM: /* 8.3.126: SET MODE */
2667 if (arg[0] == 4) 2780 if (arg[0] == 4)
2668 rxvt_scr_insert_mode(aR_ 1); 2781 scr_insert_mode (1);
2669 break; 2782 break;
2670 2783
2671/* 2784 /*
2672 * PRIVATE USE beyond this point. All CSI_7? sequences here 2785 * PRIVATE USE beyond this point. All CSI_7? sequences here
2673 */ 2786 */
2674 case CSI_72: /* DECSTBM: set top and bottom margins */ 2787 case CSI_72: /* DECSTBM: set top and bottom margins */
2675 if (nargs == 1) 2788 if (nargs == 1)
2676 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2789 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2677 else if (nargs == 0 || arg[0] >= arg[1]) 2790 else if (nargs == 0 || arg[0] >= arg[1])
2678 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2791 scr_scroll_region (0, MAX_ROWS - 1);
2679 else 2792 else
2680 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2793 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2681 break; 2794 break;
2682 2795
2683 case CSI_73: 2796 case CSI_73:
2684 rxvt_scr_cursor(aR_ SAVE); 2797 scr_cursor (SAVE);
2685 break; 2798 break;
2686 case CSI_75: 2799 case CSI_75:
2687 rxvt_scr_cursor(aR_ RESTORE); 2800 scr_cursor (RESTORE);
2688 break; 2801 break;
2689 2802
2690#ifndef NO_FRILLS 2803#ifndef NO_FRILLS
2691 case CSI_74: 2804 case CSI_74:
2692 rxvt_process_window_ops(aR_ arg, nargs); 2805 process_window_ops (arg, nargs);
2693 break; 2806 break;
2694#endif 2807#endif
2695 2808
2696 case CSI_78: /* DECREQTPARM */ 2809 case CSI_78: /* DECREQTPARM */
2697 if (arg[0] == 0 || arg[0] == 1) 2810 if (arg[0] == 0 || arg[0] == 1)
2698 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2811 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2699 /* FALLTHROUGH */ 2812 /* FALLTHROUGH */
2700 2813
2701 default: 2814 default:
2702 break; 2815 break;
2703 } 2816 }
2704} 2817}
2705/*}}} */ 2818/*}}} */
2706 2819
2707#ifndef NO_FRILLS 2820#ifndef NO_FRILLS
2708/* ARGSUSED */ 2821/* ARGSUSED */
2709/* INTPROTO */
2710void 2822void
2711rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2823rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2712{ 2824{
2713 int x, y; 2825 int x, y;
2714#if 0 2826#if 0
2715 char *s; 2827 char *s;
2716#endif 2828#endif
2717 XWindowAttributes wattr; 2829 XWindowAttributes wattr;
2718 Window wdummy; 2830 Window wdummy;
2719 2831
2720 if (nargs == 0) 2832 if (nargs == 0)
2721 return; 2833 return;
2722 switch (args[0]) { 2834 switch (args[0])
2835 {
2723 /* 2836 /*
2724 * commands 2837 * commands
2725 */ 2838 */
2726 case 1: /* deiconify window */ 2839 case 1: /* deiconify window */
2727 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2840 XMapWindow(display->display, TermWin.parent[0]);
2728 break; 2841 break;
2729 case 2: /* iconify window */ 2842 case 2: /* iconify window */
2730 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2843 XIconifyWindow(display->display, TermWin.parent[0],
2731 DefaultScreen(R->Xdisplay)); 2844 DefaultScreen(display->display));
2732 break; 2845 break;
2733 case 3: /* set position (pixels) */ 2846 case 3: /* set position (pixels) */
2734 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]);
2735 break; 2848 break;
2736 case 4: /* set size (pixels) */ 2849 case 4: /* set size (pixels) */
2737 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2738 break; 2851 break;
2739 case 5: /* raise window */ 2852 case 5: /* raise window */
2740 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2853 XRaiseWindow(display->display, TermWin.parent[0]);
2741 break; 2854 break;
2742 case 6: /* lower window */ 2855 case 6: /* lower window */
2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2856 XLowerWindow(display->display, TermWin.parent[0]);
2744 break; 2857 break;
2745 case 7: /* refresh window */ 2858 case 7: /* refresh window */
2746 R->scr_touch (true); 2859 scr_touch (true);
2747 break; 2860 break;
2748 case 8: /* set size (chars) */ 2861 case 8: /* set size (chars) */
2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2750 (unsigned int)(args[1] * R->TermWin.fheight)); 2863 (unsigned int)(args[1] * TermWin.fheight));
2751 break; 2864 break;
2752 default: 2865 default:
2753 if (args[0] >= 24) /* set height (chars) */ 2866 if (args[0] >= 24) /* set height (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2867 set_widthheight ((unsigned int)TermWin.width,
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2868 (unsigned int)(args[1] * TermWin.fheight));
2756 break; 2869 break;
2757 /* 2870 /*
2758 * reports - some output format copied from XTerm 2871 * reports - some output format copied from XTerm
2759 */ 2872 */
2760 case 11: /* report window state */ 2873 case 11: /* report window state */
2761 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2762 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2763 break; 2876 break;
2764 case 13: /* report window position */ 2877 case 13: /* report window position */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2766 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root,
2767 -wattr.border_width, -wattr.border_width, 2880 -wattr.border_width, -wattr.border_width,
2768 &x, &y, &wdummy); 2881 &x, &y, &wdummy);
2769 R->tt_printf("\033[3;%d;%dt", x, y); 2882 tt_printf("\033[3;%d;%dt", x, y);
2770 break; 2883 break;
2771 case 14: /* report window size (pixels) */ 2884 case 14: /* report window size (pixels) */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2773 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2774 break; 2887 break;
2775 case 18: /* report window size (chars) */ 2888 case 18: /* report window size (chars) */
2776 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2777 break; 2890 break;
2778#if 0 /* XXX: currently disabled due to security concerns */ 2891#if 0 /* XXX: currently disabled due to security concerns */
2779 case 20: /* report icon label */ 2892 case 20: /* report icon label */
2780 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2893 XGetIconName(display->display, TermWin.parent[0], &s);
2781 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2894 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2782 break; 2895 break;
2783 case 21: /* report window title */ 2896 case 21: /* report window title */
2784 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2897 XFetchName(display->display, TermWin.parent[0], &s);
2785 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2898 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2899 break;
2787#endif 2900#endif
2901
2788 } 2902 }
2789} 2903}
2790#endif 2904#endif
2791 2905
2792/*----------------------------------------------------------------------*/ 2906/*----------------------------------------------------------------------*/
2793/* 2907/*
2794 * get input up until STRING TERMINATOR (or BEL) 2908 * get input up until STRING TERMINATOR (or BEL)
2795 * ends_how is terminator used. returned input must be free()d 2909 * ends_how is terminator used. returned input must be free()d
2796 */ 2910 */
2797/* INTPROTO */
2798unsigned char * 2911unsigned char *
2799rxvt_get_to_st(pR_ unsigned char *ends_how) 2912rxvt_term::get_to_st (unsigned char *ends_how)
2800{ 2913{
2801 int seen_esc = 0; /* seen escape? */ 2914 int seen_esc = 0; /* seen escape? */
2802 unsigned int n = 0; 2915 unsigned int n = 0;
2803 unsigned char *s; 2916 unsigned char *s;
2804 unsigned char ch, string[STRING_MAX]; 2917 unsigned char ch, string[STRING_MAX];
2805 2918
2806 for (; (ch = rxvt_cmd_getc(aR));) { 2919 for (; (ch = cmd_getc ());)
2920 {
2807 if (ch == C0_BEL 2921 if (ch == C0_BEL
2808 || ch == CHAR_ST 2922 || ch == CHAR_ST
2809 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2810 break; 2924 break;
2811 if (ch == C0_ESC) { 2925 if (ch == C0_ESC)
2926 {
2812 seen_esc = 1; 2927 seen_esc = 1;
2813 continue; 2928 continue;
2929 }
2814 } else if (ch == '\t') 2930 else if (ch == '\t')
2815 ch = ' '; /* translate '\t' to space */ 2931 ch = ' '; /* translate '\t' to space */
2816 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2817 return NULL; /* other control character - exit */ 2933 return NULL; /* other control character - exit */
2818 if (n < sizeof(string) - 1) 2934 if (n < sizeof(string) - 1)
2819 string[n++] = ch; 2935 string[n++] = ch;
2820 seen_esc = 0; 2936 seen_esc = 0;
2821 } 2937 }
2822 string[n++] = '\0'; 2938 string[n++] = '\0';
2823 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL)
2824 return NULL; 2940 return NULL;
2825 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2941 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2826 STRNCPY(s, string, n); 2942 STRNCPY(s, string, n);
2827 return s; 2943 return s;
2828} 2944}
2829 2945
2830/*----------------------------------------------------------------------*/ 2946/*----------------------------------------------------------------------*/
2831/* 2947/*
2832 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2948 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2833 */ 2949 */
2834/* INTPROTO */
2835void 2950void
2836rxvt_process_dcs_seq(pR) 2951rxvt_term::process_dcs_seq ()
2837{ 2952{
2838 unsigned char eh, *s; 2953 unsigned char eh, *s;
2839/* 2954 /*
2840 * Not handled yet 2955 * Not handled yet
2841 */ 2956 */
2842 s = rxvt_get_to_st(aR_ &eh); 2957 s = get_to_st (&eh);
2843 if (s) 2958 if (s)
2844 free(s); 2959 free(s);
2845 return; 2960 return;
2846} 2961}
2847 2962
2848/*----------------------------------------------------------------------*/ 2963/*----------------------------------------------------------------------*/
2849/* 2964/*
2850 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2851 */ 2966 */
2852/* INTPROTO */
2853void 2967void
2854rxvt_process_osc_seq(pR) 2968rxvt_term::process_osc_seq ()
2855{ 2969{
2856 unsigned char ch, eh, *s; 2970 unsigned char ch, eh, *s;
2857 int arg; 2971 int arg;
2858 2972
2859 ch = rxvt_cmd_getc(aR); 2973 ch = cmd_getc ();
2860 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2974 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2861 arg = arg * 10 + (ch - '0'); 2975 arg = arg * 10 + (ch - '0');
2862 2976
2863 if (ch == ';') { 2977 if (ch == ';')
2864 s = rxvt_get_to_st(aR_ &eh); 2978 {
2865 if (s) { 2979 s = get_to_st (&eh);
2866 /* 2980 if (s)
2981 {
2982 /*
2867 * rxvt_menubar_dispatch() violates the constness of the string, 2983 * rxvt_menubar_dispatch() violates the constness of the string,
2868 * so do it here 2984 * so do it here
2869 */ 2985 */
2870 if (arg == XTerm_Menu) 2986 if (arg == XTerm_Menu)
2871#if 0 /* XXX: currently disabled due to security concerns */ 2987#if 0 /* XXX: currently disabled due to security concerns */
2872 rxvt_menubar_dispatch(aR_ (char *)s); 2988 menubar_dispatch ((char *)s);
2873#else 2989#else
2874 0; 2990 (void)0;
2875#endif 2991#endif
2876 else 2992 else
2877 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2993 xterm_seq (arg, (char *)s, eh);
2878 free(s); 2994 free(s);
2879 } 2995 }
2880 } 2996 }
2881} 2997}
2882/* 2998/*
2883 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2884 * 0 = change iconName/title 3000 * 0 = change iconName/title
… …
2898 * 20 = bg pixmap 3014 * 20 = bg pixmap
2899 * 39 = change default fg color 3015 * 39 = change default fg color
2900 * 49 = change default bg color 3016 * 49 = change default bg color
2901 * 55 = dump scrollback buffer and all of screen 3017 * 55 = dump scrollback buffer and all of screen
2902 */ 3018 */
2903/* EXTPROTO */
2904void 3019void
2905rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused)))
2906{ 3021{
2907 int changed = 0; 3022 int changed = 0;
2908 int color; 3023 int color;
2909 char *buf, *name; 3024 char *buf, *name;
2910 3025
2911 assert(str != NULL); 3026 assert(str != NULL);
2912 switch (op) { 3027 switch (op)
3028 {
2913 case XTerm_name: 3029 case XTerm_name:
2914 rxvt_set_title(aR_ str); 3030 set_title (str);
2915 /* FALLTHROUGH */ 3031 /* FALLTHROUGH */
2916 case XTerm_iconName: 3032 case XTerm_iconName:
2917 rxvt_set_iconName(aR_ str); 3033 set_iconName (str);
2918 break; 3034 break;
2919 case XTerm_title: 3035 case XTerm_title:
2920 rxvt_set_title(aR_ str); 3036 set_title (str);
2921 break; 3037 break;
2922 case XTerm_Color: 3038 case XTerm_Color:
2923 for (buf = (char *)str; buf && *buf;) { 3039 for (buf = (char *)str; buf && *buf;)
3040 {
2924 if ((name = STRCHR(buf, ';')) == NULL) 3041 if ((name = STRCHR(buf, ';')) == NULL)
2925 break; 3042 break;
2926 *name++ = '\0'; 3043 *name++ = '\0';
2927 color = atoi(buf); 3044 color = atoi(buf);
2928 if (color < 0 || color >= TOTAL_COLORS) 3045 if (color < 0 || color >= TOTAL_COLORS)
2929 break; 3046 break;
2930 if ((buf = STRCHR(name, ';')) != NULL) 3047 if ((buf = STRCHR(name, ';')) != NULL)
2931 *buf++ = '\0'; 3048 *buf++ = '\0';
2932 rxvt_set_window_color(aR_ color + minCOLOR, name); 3049 set_window_color (color + minCOLOR, name);
2933 } 3050 }
2934 break; 3051 break;
2935#ifndef NO_CURSORCOLOR 3052#ifndef NO_CURSORCOLOR
2936 case XTerm_Color_cursor: 3053 case XTerm_Color_cursor:
2937 rxvt_set_window_color(aR_ Color_cursor, str); 3054 set_window_color (Color_cursor, str);
2938 break; 3055 break;
2939#endif 3056#endif
2940 case XTerm_Color_pointer: 3057 case XTerm_Color_pointer:
2941 rxvt_set_window_color(aR_ Color_pointer, str); 3058 set_window_color (Color_pointer, str);
2942 break; 3059 break;
2943#ifndef NO_BOLD_UNDERLINE_REVERSE 3060#ifndef NO_BOLD_UNDERLINE_REVERSE
2944 case XTerm_Color_BD: 3061 case XTerm_Color_BD:
2945 rxvt_set_window_color(aR_ Color_BD, str); 3062 set_window_color (Color_BD, str);
2946 break; 3063 break;
2947 case XTerm_Color_UL: 3064 case XTerm_Color_UL:
2948 rxvt_set_window_color(aR_ Color_UL, str); 3065 set_window_color (Color_UL, str);
2949 break; 3066 break;
2950 case XTerm_Color_RV: 3067 case XTerm_Color_RV:
2951 rxvt_set_window_color(aR_ Color_RV, str); 3068 set_window_color (Color_RV, str);
2952 break; 3069 break;
2953#endif 3070#endif
2954 3071
2955 case XTerm_Menu: 3072 case XTerm_Menu:
2956 /* 3073 /*
2957 * rxvt_menubar_dispatch() violates the constness of the string, 3074 * rxvt_menubar_dispatch() violates the constness of the string,
2958 * so DON'T do it here 3075 * so DON'T do it here
2959 */ 3076 */
2960 break; 3077 break;
2961 case XTerm_Pixmap: 3078 case XTerm_Pixmap:
2962 if (*str != ';') { 3079 if (*str != ';')
3080 {
2963#if XPM_BACKGROUND 3081#if XPM_BACKGROUND
2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3082 scale_pixmap (""); /* reset to default scaling */
2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3083 set_bgPixmap (str); /* change pixmap */
2966#endif 3084#endif
2967 R->scr_touch (true); 3085 scr_touch (true);
2968 } 3086 }
2969 while ((str = STRCHR(str, ';')) != NULL) { 3087 while ((str = STRCHR(str, ';')) != NULL)
2970 str++; 3088 {
3089 str++;
2971#if XPM_BACKGROUND 3090#if XPM_BACKGROUND
2972 changed += rxvt_scale_pixmap(aR_ str); 3091 changed += scale_pixmap (str);
2973#endif 3092#endif
2974 } 3093
2975 if (changed) { 3094 }
3095 if (changed)
3096 {
2976#ifdef XPM_BACKGROUND 3097#ifdef XPM_BACKGROUND
2977 rxvt_resize_pixmap(aR); 3098 resize_pixmap ();
2978#endif 3099#endif
2979 R->scr_touch (true); 3100 scr_touch (true);
2980 } 3101 }
2981 break; 3102 break;
2982 3103
2983 case XTerm_restoreFG: 3104 case XTerm_restoreFG:
2984 rxvt_set_window_color(aR_ Color_fg, str); 3105 set_window_color (Color_fg, str);
2985 break; 3106 break;
2986 case XTerm_restoreBG: 3107 case XTerm_restoreBG:
2987 rxvt_set_window_color(aR_ Color_bg, str); 3108 set_window_color (Color_bg, str);
2988 break; 3109 break;
2989 case XTerm_logfile: 3110 case XTerm_logfile:
2990 break; 3111 break;
2991 case XTerm_font: 3112 case XTerm_font:
2992 rxvt_change_font(aR_ 0, str); 3113 change_font (0, str);
2993 break; 3114 break;
2994#if 0 3115#if 0
2995 case XTerm_dumpscreen: /* no error notices */ 3116 case XTerm_dumpscreen: /* no error notices */
2996 { 3117 {
2997 int fd; 3118 int fd;
2998 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2999 rxvt_scr_dump(aR_ fd); 3120 {
3000 close(fd); 3121 scr_dump (fd);
3001 } 3122 close(fd);
3002 } 3123 }
3003 break; 3124 }
3125 break;
3004#endif 3126#endif
3127
3005 } 3128 }
3006} 3129}
3007/*----------------------------------------------------------------------*/ 3130/*----------------------------------------------------------------------*/
3008 3131
3009/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3014 * 's' = save 3137 * 's' = save
3015 * 'r' = restore 3138 * 'r' = restore
3016 * 't' = toggle 3139 * 't' = toggle
3017 * so no need for fancy checking 3140 * so no need for fancy checking
3018 */ 3141 */
3019/* INTPROTO */
3020int 3142int
3021rxvt_privcases(pR_ int mode, unsigned long bit) 3143rxvt_term::privcases (int mode, unsigned long bit)
3022{ 3144{
3023 int state; 3145 int state;
3024 3146
3025 if (mode == 's') { 3147 if (mode == 's')
3148 {
3026 R->SavedModes |= (R->PrivateModes & bit); 3149 SavedModes |= (PrivateModes & bit);
3027 return -1; 3150 return -1;
3028 } else { 3151 }
3152 else
3153 {
3029 if (mode == 'r') 3154 if (mode == 'r')
3030 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3031 else 3156 else
3032 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3157 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3033 PrivMode(state, bit); 3158 PrivMode(state, bit);
3034 } 3159 }
3035 return state; 3160 return state;
3036} 3161}
3037 3162
3038/* we're not using priv _yet_ */ 3163/* we're not using priv _yet_ */
3039/* INTPROTO */
3040void 3164void
3041rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3165rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg)
3042{ 3166{
3043 unsigned int i, j; 3167 unsigned int i, j;
3044 int state; 3168 int state;
3045 static const struct { 3169 static const struct
3170 {
3046 const int argval; 3171 const int argval;
3047 const unsigned long bit; 3172 const unsigned long bit;
3173 }
3048 } argtopriv[] = { 3174 argtopriv[] = {
3049 { 1, PrivMode_aplCUR }, 3175 { 1, PrivMode_aplCUR },
3050 { 2, PrivMode_vt52 }, 3176 { 2, PrivMode_vt52 },
3051 { 3, PrivMode_132 }, 3177 { 3, PrivMode_132 },
3052 { 4, PrivMode_smoothScroll }, 3178 { 4, PrivMode_smoothScroll },
3053 { 5, PrivMode_rVideo }, 3179 { 5, PrivMode_rVideo },
3054 { 6, PrivMode_relOrigin }, 3180 { 6, PrivMode_relOrigin },
3055 { 7, PrivMode_Autowrap }, 3181 { 7, PrivMode_Autowrap },
3056 { 9, PrivMode_MouseX10 }, 3182 { 9, PrivMode_MouseX10 },
3057#ifdef menuBar_esc 3183#ifdef menuBar_esc
3058 { menuBar_esc, PrivMode_menuBar }, 3184 { menuBar_esc, PrivMode_menuBar },
3059#endif 3185#endif
3060#ifdef scrollBar_esc 3186#ifdef scrollBar_esc
3061 { scrollBar_esc, PrivMode_scrollBar }, 3187 { scrollBar_esc, PrivMode_scrollBar },
3062#endif 3188#endif
3063 { 25, PrivMode_VisibleCursor }, 3189 { 25, PrivMode_VisibleCursor },
3064 { 35, PrivMode_ShiftKeys }, 3190 { 35, PrivMode_ShiftKeys },
3065 { 40, PrivMode_132OK }, 3191 { 40, PrivMode_132OK },
3066 { 47, PrivMode_Screen }, 3192 { 47, PrivMode_Screen },
3067 { 66, PrivMode_aplKP }, 3193 { 66, PrivMode_aplKP },
3068#ifndef NO_BACKSPACE_KEY 3194#ifndef NO_BACKSPACE_KEY
3069 { 67, PrivMode_BackSpace }, 3195 { 67, PrivMode_BackSpace },
3070#endif 3196#endif
3071 { 1000, PrivMode_MouseX11 }, 3197 { 1000, PrivMode_MouseX11 },
3072 { 1010, PrivMode_TtyOutputInh }, 3198 { 1010, PrivMode_TtyOutputInh },
3073 { 1011, PrivMode_Keypress }, 3199 { 1011, PrivMode_Keypress },
3074 { 1047, PrivMode_Screen }, 3200 { 1047, PrivMode_Screen },
3075 }; 3201 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3202 };
3076 3203
3077 if (nargs == 0) 3204 if (nargs == 0)
3078 return; 3205 return;
3079 3206
3080/* make lo/hi boolean */ 3207 /* make lo/hi boolean */
3081 if (mode == 'l') 3208 if (mode == 'l')
3082 mode = 0; /* reset */ 3209 mode = 0; /* reset */
3083 else if (mode == 'h') 3210 else if (mode == 'h')
3084 mode = 1; /* set */ 3211 mode = 1; /* set */
3085 3212
3086 for (i = 0; i < nargs; i++) { 3213 for (i = 0; i < nargs; i++)
3214 {
3087 state = -1; 3215 state = -1;
3088 3216
3089 /* basic handling */ 3217 /* basic handling */
3090 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3091 if (argtopriv[j].argval == arg[i]) { 3219 if (argtopriv[j].argval == arg[i])
3220 {
3092 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3221 state = privcases (mode, argtopriv[j].bit);
3093 break; 3222 break;
3094 } 3223 }
3095 3224
3096 /* extra handling for values with state unkept */ 3225 /* extra handling for values with state unkept */
3097 if (state == -1) 3226 if (state == -1)
3098 switch (arg[i]) { 3227 switch (arg[i])
3228 {
3099 case 1048: /* alternative cursor save */ 3229 case 1048: /* alternative cursor save */
3100 if (mode == 0) 3230 if (mode == 0)
3101 rxvt_scr_cursor(aR_ RESTORE); 3231 scr_cursor (RESTORE);
3102 else if (mode == 1) 3232 else if (mode == 1)
3103 rxvt_scr_cursor(aR_ SAVE); 3233 scr_cursor (SAVE);
3104 /* FALLTHROUGH */ 3234 /* FALLTHROUGH */
3105 default: 3235 default:
3106 continue; /* for(;i;) */ 3236 continue; /* for(;i;) */
3107 } 3237 }
3108 3238
3109 /* extra handling for values with valid 0 or 1 state */ 3239 /* extra handling for values with valid 0 or 1 state */
3110 switch (arg[i]) { 3240 switch (arg[i])
3241 {
3111 /* case 1: - application cursor keys */ 3242 /* case 1: - application cursor keys */
3112 case 2: /* VT52 mode */ 3243 case 2: /* VT52 mode */
3113 /* oddball mode. should be set regardless of set/reset 3244 /* oddball mode. should be set regardless of set/reset
3114 * parameter. Return from VT52 mode with an ESC < from 3245 * parameter. Return from VT52 mode with an ESC < from
3115 * within VT52 mode 3246 * within VT52 mode
3116 */ 3247 */
3117 PrivMode(1, PrivMode_vt52); 3248 PrivMode(1, PrivMode_vt52);
3118 break; 3249 break;
3119 case 3: /* 80/132 */ 3250 case 3: /* 80/132 */
3120 if (R->PrivateModes & PrivMode_132OK) 3251 if (PrivateModes & PrivMode_132OK)
3121 rxvt_set_widthheight(aR_
3122 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3123 (unsigned int)R->TermWin.height); 3253 (unsigned int)TermWin.height);
3124 break; 3254 break;
3125 case 4: /* smooth scrolling */ 3255 case 4: /* smooth scrolling */
3126 if (state) 3256 if (state)
3127 R->Options &= ~Opt_jumpScroll; 3257 Options &= ~Opt_jumpScroll;
3128 else 3258 else
3129 R->Options |= Opt_jumpScroll; 3259 Options |= Opt_jumpScroll;
3130 break; 3260 break;
3131 case 5: /* reverse video */ 3261 case 5: /* reverse video */
3132 rxvt_scr_rvideo_mode(aR_ state); 3262 scr_rvideo_mode (state);
3133 break; 3263 break;
3134 case 6: /* relative/absolute origins */ 3264 case 6: /* relative/absolute origins */
3135 rxvt_scr_relative_origin(aR_ state); 3265 scr_relative_origin (state);
3136 break; 3266 break;
3137 case 7: /* autowrap */ 3267 case 7: /* autowrap */
3138 rxvt_scr_autowrap(aR_ state); 3268 scr_autowrap (state);
3139 break; 3269 break;
3140 /* case 8: - auto repeat, can't do on a per window basis */ 3270 /* case 8: - auto repeat, can't do on a per window basis */
3141 case 9: /* X10 mouse reporting */ 3271 case 9: /* X10 mouse reporting */
3142 if (state) /* orthogonal */ 3272 if (state) /* orthogonal */
3143 R->PrivateModes &= ~(PrivMode_MouseX11); 3273 PrivateModes &= ~(PrivMode_MouseX11);
3144 break; 3274 break;
3145#ifdef menuBar_esc 3275#ifdef menuBar_esc
3146 case menuBar_esc: 3276 case menuBar_esc:
3147#ifdef MENUBAR 3277#ifdef MENUBAR
3148 rxvt_map_menuBar(aR_ state); 3278 map_menuBar (state);
3149#endif 3279#endif
3150 break; 3280 break;
3151#endif 3281#endif
3152#ifdef scrollBar_esc 3282#ifdef scrollBar_esc
3153 case scrollBar_esc: 3283 case scrollBar_esc:
3154 if (rxvt_scrollbar_mapping(aR_ state)) { 3284 if (scrollbar_mapping (state))
3155 R->resize_all_windows (0, 0, 0); 3285 {
3286 resize_all_windows (0, 0, 0);
3156 R->scr_touch (true); 3287 scr_touch (true);
3157 } 3288 }
3158 break; 3289 break;
3159#endif 3290#endif
3160 case 25: /* visible/invisible cursor */ 3291 case 25: /* visible/invisible cursor */
3161 rxvt_scr_cursor_visible(aR_ state); 3292 scr_cursor_visible (state);
3162 break; 3293 break;
3163 /* case 35: - shift keys */ 3294 /* case 35: - shift keys */
3164 /* case 40: - 80 <--> 132 mode */ 3295 /* case 40: - 80 <--> 132 mode */
3165 case 47: /* secondary screen */ 3296 case 47: /* secondary screen */
3166 rxvt_scr_change_screen(aR_ state); 3297 scr_change_screen (state);
3167 break; 3298 break;
3168 /* case 66: - application key pad */ 3299 /* case 66: - application key pad */
3169 /* case 67: - backspace key */ 3300 /* case 67: - backspace key */
3170 case 1000: /* X11 mouse reporting */ 3301 case 1000: /* X11 mouse reporting */
3171 if (state) /* orthogonal */ 3302 if (state) /* orthogonal */
3172 R->PrivateModes &= ~(PrivMode_MouseX10); 3303 PrivateModes &= ~(PrivMode_MouseX10);
3173 break; 3304 break;
3174#if 0 3305#if 0
3175 case 1001: 3306 case 1001:
3176 break; /* X11 mouse highlighting */ 3307 break; /* X11 mouse highlighting */
3177#endif 3308#endif
3178 case 1010: /* scroll to bottom on TTY output inhibit */ 3309 case 1010: /* scroll to bottom on TTY output inhibit */
3179 if (state) 3310 if (state)
3180 R->Options &= ~Opt_scrollTtyOutput; 3311 Options &= ~Opt_scrollTtyOutput;
3181 else 3312 else
3182 R->Options |= Opt_scrollTtyOutput; 3313 Options |= Opt_scrollTtyOutput;
3183 break; 3314 break;
3184 case 1011: /* scroll to bottom on key press */ 3315 case 1011: /* scroll to bottom on key press */
3185 if (state) 3316 if (state)
3186 R->Options |= Opt_scrollTtyKeypress; 3317 Options |= Opt_scrollTtyKeypress;
3187 else 3318 else
3188 R->Options &= ~Opt_scrollTtyKeypress; 3319 Options &= ~Opt_scrollTtyKeypress;
3189 break; 3320 break;
3190 case 1047: /* secondary screen w/ clearing */ 3321 case 1047: /* secondary screen w/ clearing */
3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3191 if (R->current_screen != PRIMARY) 3323 if (current_screen != PRIMARY)
3192 R->scr_erase_screen (2); 3324 scr_erase_screen (2);
3193 rxvt_scr_change_screen(aR_ state); 3325 scr_change_screen (state);
3194 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
3195 default: 3327 default:
3196 break; 3328 break;
3197 } 3329 }
3198 } 3330 }
3199} 3331}
3200/*}}} */ 3332/*}}} */
3201 3333
3202/*{{{ process sgr sequences */ 3334/*{{{ process sgr sequences */
3203/* INTPROTO */
3204void 3335void
3205rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3206{ 3337{
3207 unsigned int i; 3338 unsigned int i;
3208 short rendset; 3339 short rendset;
3209 int rendstyle; 3340 int rendstyle;
3210 3341
3211 if (nargs == 0) { 3342 if (nargs == 0)
3212 rxvt_scr_rendition(aR_ 0, ~RS_None);
3213 return;
3214 } 3343 {
3344 scr_rendition (0, ~RS_None);
3345 return;
3346 }
3215 for (i = 0; i < nargs; i++) { 3347 for (i = 0; i < nargs; i++)
3348 {
3216 rendset = -1; 3349 rendset = -1;
3217 switch (arg[i]) { 3350 switch (arg[i])
3218 case 0: 3351 {
3352 case 0:
3219 rendset = 0, rendstyle = ~RS_None; 3353 rendset = 0, rendstyle = ~RS_None;
3220 break; 3354 break;
3221 case 1: 3355 case 1:
3222 rendset = 1, rendstyle = RS_Bold; 3356 rendset = 1, rendstyle = RS_Bold;
3223 break; 3357 break;
3224 case 4: 3358 case 4:
3225 rendset = 1, rendstyle = RS_Uline; 3359 rendset = 1, rendstyle = RS_Uline;
3226 break; 3360 break;
3227 case 5: 3361 case 5:
3228 rendset = 1, rendstyle = RS_Blink; 3362 rendset = 1, rendstyle = RS_Blink;
3229 break; 3363 break;
3230 case 7: 3364 case 7:
3231 rendset = 1, rendstyle = RS_RVid; 3365 rendset = 1, rendstyle = RS_RVid;
3232 break; 3366 break;
3233 case 22: 3367 case 22:
3234 rendset = 0, rendstyle = RS_Bold; 3368 rendset = 0, rendstyle = RS_Bold;
3235 break; 3369 break;
3236 case 24: 3370 case 24:
3237 rendset = 0, rendstyle = RS_Uline; 3371 rendset = 0, rendstyle = RS_Uline;
3238 break; 3372 break;
3239 case 25: 3373 case 25:
3240 rendset = 0, rendstyle = RS_Blink; 3374 rendset = 0, rendstyle = RS_Blink;
3241 break; 3375 break;
3242 case 27: 3376 case 27:
3243 rendset = 0, rendstyle = RS_RVid; 3377 rendset = 0, rendstyle = RS_RVid;
3244 break; 3378 break;
3245 } 3379 }
3246 if (rendset != -1) { 3380 if (rendset != -1)
3247 rxvt_scr_rendition(aR_ rendset, rendstyle); 3381 {
3382 scr_rendition (rendset, rendstyle);
3248 continue; /* for(;i;) */ 3383 continue; /* for(;i;) */
3249 } 3384 }
3250 3385
3251 switch (arg[i]) { 3386 switch (arg[i])
3252 case 30: 3387 {
3388 case 30:
3253 case 31: /* set fg color */ 3389 case 31: /* set fg color */
3254 case 32: 3390 case 32:
3255 case 33: 3391 case 33:
3256 case 34: 3392 case 34:
3257 case 35: 3393 case 35:
3258 case 36: 3394 case 36:
3259 case 37: 3395 case 37:
3260 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3261 Color_fg); 3397 Color_fg);
3262 break; 3398 break;
3263#ifdef TTY_256COLOR 3399#ifdef TTY_256COLOR
3264 case 38: 3400 case 38:
3265 if (nargs > i + 2 && arg[i + 1] == 5) { 3401 if (nargs > i + 2 && arg[i + 1] == 5)
3402 {
3266 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3267 Color_fg); 3404 Color_fg);
3268 i += 2; 3405 i += 2;
3269 } 3406 }
3270 break; 3407 break;
3271#endif 3408#endif
3272 case 39: /* default fg */ 3409 case 39: /* default fg */
3273 rxvt_scr_color(aR_ Color_fg, Color_fg); 3410 scr_color (Color_fg, Color_fg);
3274 break; 3411 break;
3275 3412
3276 case 40: 3413 case 40:
3277 case 41: /* set bg color */ 3414 case 41: /* set bg color */
3278 case 42: 3415 case 42:
3279 case 43: 3416 case 43:
3280 case 44: 3417 case 44:
3281 case 45: 3418 case 45:
3282 case 46: 3419 case 46:
3283 case 47: 3420 case 47:
3284 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3285 Color_bg); 3422 Color_bg);
3286 break; 3423 break;
3287#ifdef TTY_256COLOR 3424#ifdef TTY_256COLOR
3288 case 48: 3425 case 48:
3289 if (nargs > i + 2 && arg[i + 1] == 5) { 3426 if (nargs > i + 2 && arg[i + 1] == 5)
3427 {
3290 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3291 Color_bg); 3429 Color_bg);
3292 i += 2; 3430 i += 2;
3293 } 3431 }
3294 break; 3432 break;
3295#endif 3433#endif
3296 case 49: /* default bg */ 3434 case 49: /* default bg */
3297 rxvt_scr_color(aR_ Color_bg, Color_bg); 3435 scr_color (Color_bg, Color_bg);
3298 break; 3436 break;
3299 3437
3300#ifndef NO_BRIGHTCOLOR 3438#ifndef NO_BRIGHTCOLOR
3301 case 90: 3439 case 90:
3302 case 91: /* set bright fg color */ 3440 case 91: /* set bright fg color */
3303 case 92: 3441 case 92:
3304 case 93: 3442 case 93:
3305 case 94: 3443 case 94:
3306 case 95: 3444 case 95:
3307 case 96: 3445 case 96:
3308 case 97: 3446 case 97:
3309 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3310 Color_fg); 3448 Color_fg);
3311 break; 3449 break;
3312 case 100: 3450 case 100:
3313 case 101: /* set bright bg color */ 3451 case 101: /* set bright bg color */
3314 case 102: 3452 case 102:
3315 case 103: 3453 case 103:
3316 case 104: 3454 case 104:
3317 case 105: 3455 case 105:
3318 case 106: 3456 case 106:
3319 case 107: 3457 case 107:
3320 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3321 Color_bg); 3459 Color_bg);
3322 break; 3460 break;
3323#endif 3461#endif
3324 } 3462
3463 }
3325 } 3464 }
3326} 3465}
3327/*}}} */ 3466/*}}} */
3328 3467
3329/*{{{ process Rob Nation's own graphics mode sequences */ 3468/*{{{ process Rob Nation's own graphics mode sequences */
3330/* INTPROTO */
3331void 3469void
3332rxvt_process_graphics(pR) 3470rxvt_term::process_graphics ()
3333{ 3471{
3334 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3472 unsigned char ch, cmd = cmd_getc ();
3335 3473
3336#ifndef RXVT_GRAPHICS 3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q')
3337 if (cmd == 'Q') { /* query graphics */ 3476 { /* query graphics */
3338 R->tt_printf("\033G0\n"); /* no graphics */ 3477 tt_printf("\033G0\n"); /* no graphics */
3339 return; 3478 return;
3340 } 3479 }
3341/* swallow other graphics sequences until terminating ':' */ 3480 /* swallow other graphics sequences until terminating ':' */
3342 do 3481 do
3343 ch = rxvt_cmd_getc(aR); 3482 ch = cmd_getc ();
3344 while (ch != ':'); 3483 while (ch != ':');
3345#else 3484#else
3346 unsigned int nargs; 3485 unsigned int nargs;
3347 int args[NGRX_PTS]; 3486 int args[NGRX_PTS];
3348 unsigned char *text = NULL; 3487 unsigned char *text = NULL;
3349 3488
3489 if (cmd == 'Q')
3350 if (cmd == 'Q') { /* query graphics */ 3490 { /* query graphics */
3351 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3491 tt_printf("\033G1\n"); /* yes, graphics (color) */
3352 return; 3492 return;
3353 } 3493 }
3354 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3494 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3495 {
3355 int neg; 3496 int neg;
3356 3497
3357 ch = rxvt_cmd_getc(aR); 3498 ch = cmd_getc ();
3358 neg = (ch == '-'); 3499 neg = (ch == '-');
3359 if (neg || ch == '+') 3500 if (neg || ch == '+')
3360 ch = rxvt_cmd_getc(aR); 3501 ch = cmd_getc ();
3361 3502
3362 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3503 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3363 args[nargs] = args[nargs] * 10 + (ch - '0'); 3504 args[nargs] = args[nargs] * 10 + (ch - '0');
3364 if (neg) 3505 if (neg)
3365 args[nargs] = -args[nargs]; 3506 args[nargs] = -args[nargs];
3366 3507
3367 nargs++; 3508 nargs++;
3368 args[nargs] = 0; 3509 args[nargs] = 0;
3369 if (ch != ';') 3510 if (ch != ';')
3370 break; 3511 break;
3371 } 3512 }
3372 3513
3373 if ((cmd == 'T') && (nargs >= 5)) { 3514 if ((cmd == 'T') && (nargs >= 5))
3515 {
3374 int i, len = args[4]; 3516 int i, len = args[4];
3375 3517
3376 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3518 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3377 3519
3378 if (text != NULL) { 3520 if (text != NULL)
3521 {
3379 for (i = 0; i < len; i++) 3522 for (i = 0; i < len; i++)
3380 text[i] = rxvt_cmd_getc(aR); 3523 text[i] = cmd_getc ();
3381 text[len] = '\0'; 3524 text[len] = '\0';
3382 } 3525 }
3383 } 3526 }
3384 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3527 Gr_do_graphics (cmd, nargs, args, text);
3385#endif 3528#endif
3386} 3529}
3387/*}}} */ 3530/*}}} */
3388 3531
3389/* ------------------------------------------------------------------------- */ 3532/* ------------------------------------------------------------------------- */
… …
3415 3558
3416 if (len) 3559 if (len)
3417 { 3560 {
3418 if (v_buflen == 0) 3561 if (v_buflen == 0)
3419 { 3562 {
3420 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3563 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3564
3421 if (written == len) 3565 if ((unsigned int)written == len)
3422 return; 3566 return;
3423 3567
3424 data += written; 3568 data += written;
3425 len -= written; 3569 len -= written;
3426 } 3570 }

Diff Legend

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