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

Diff Legend

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