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.9 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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