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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.52 by pcg, Sun Feb 22 10:37:54 2004 UTC

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

Diff Legend

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