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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.41 by pcg, Tue Feb 10 00:40:39 2004 UTC

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

Diff Legend

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