ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.7 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.7 2003/11/26 10:42:34 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb) 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
71{ 103{
72 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
73} 105}
74 106
75rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
76{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123 if (TermWin.parent[0])
124 XDestroyWindow (display->display, TermWin.parent[0]);
125#if defined(MENUBAR) && (MENUBAR_MAX > 1)
126 if (menuBar.win)
127 XDestroyWindow (display->display, menuBar.win);
128 delete menuBar.drawable;
129#endif
130 }
131
132 // TODO: free pixcolours, colours should become part of rxvt_display
133
77 delete PixColors; 134 delete PixColors;
135
136 displays.put (display);
137
138 scr_release ();
139
140 free (env_windowid);
141 free (env_display);
142 free (env_term);
143 free (env_colorfgbg);
144 free (locale);
145 free (codeset);
146
147 delete envv;
148 delete argv;
149}
150
151void
152rxvt_term::destroy ()
153{
154 if (display)
155 {
156 rootwin_ev.stop (display);
157 termwin_ev.stop (display);
158 vt_ev.stop (display);
159#ifdef USE_XIM
160 im_destroy ();
161 im_ev.stop (display);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev.stop (display);
165#endif
166#ifdef MENUBAR
167 menubar_ev.stop (display);
168#endif
169 }
170
171 check_ev.stop ();
172 pty_ev.stop ();
173#ifdef CURSOR_BLINK
174 cursor_blink_ev.stop ();
175#endif
176#ifdef TEXT_BLINK
177 text_blink_ev.stop ();
178#endif
179#ifdef POINTER_BLANK
180 pointer_ev.stop ();
181#endif
182
183 destroy_ev.start (0);
184}
185
186void
187rxvt_term::destroy_cb (time_watcher &w)
188{
189 SET_R (this);
190
191 delete this;
78} 192}
79 193
80/*----------------------------------------------------------------------*/ 194/*----------------------------------------------------------------------*/
81/* rxvt_init() */ 195/* rxvt_init () */
82/* LIBPROTO */ 196/* LIBPROTO */
83rxvt_t 197rxvt_t
84rxvt_init(int argc, const char *const *argv) 198rxvt_init (int argc, const char *const *argv)
85{ 199{
86 SET_R(new rxvt_term); 200 SET_R (new rxvt_term);
87 dR;
88 201
89 if (!R->init_vars () || !R->init (argc, argv)) 202 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
90 { 203 {
91 delete R; 204 delete GET_R;
92 return NULL; 205 SET_R (0);
93 } 206 }
94 207
95 return R; 208 return GET_R;
209}
210
211static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
212
213void
214rxvt_init_signals ()
215{
216 /* install exit handler for cleanup */
217#if 0
218#ifdef HAVE_ATEXIT
219 atexit (rxvt_clean_exit);
220#else
221#endif
222#endif
223
224 struct sigaction sa;
225
226 sigfillset (&sa.sa_mask);
227 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
228 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
229 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
230 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
231 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
233 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
234
235 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
236 /* signal (SIGURG, SIG_DFL); */
237
238 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
239 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
96} 240}
97 241
98bool 242bool
99rxvt_term::init (int argc, const char *const *argv) 243rxvt_term::init (int argc, const char *const *argv)
100{ 244{
101 dR;//TODO (scrollbar, setidle)
102
103 /* 245 /*
104 * Save and then give up any super-user privileges 246 * Save and then give up any super-user privileges
105 * If we need privileges in any area then we must specifically request it. 247 * If we need privileges in any area then we must specifically request it.
106 * We should only need to be root in these cases: 248 * We should only need to be root in these cases:
107 * 1. write utmp entries on some systems 249 * 1. write utmp entries on some systems
108 * 2. chown tty on some systems 250 * 2. chown tty on some systems
109 */ 251 */
110 rxvt_privileges (this, SAVE); 252 privileges (SAVE);
111 rxvt_privileges (this, IGNORE); 253 privileges (IGNORE);
112 254
113 rxvt_init_secondary (this); 255 init_secondary ();
114 256
115 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 257 const char **cmd_argv = init_resources (argc, argv);
116 258
259 set_locale ("");
260
117#if (MENUBAR_MAX) 261#if MENUBAR_MAX
118 rxvt_menubar_read (this, rs[Rs_menu]); 262 menubar_read (rs[Rs_menu]);
119#endif 263#endif
120#ifdef HAVE_SCROLLBARS 264#ifdef HAVE_SCROLLBARS
121 if (Options & Opt_scrollBar) 265 if (Options & Opt_scrollBar)
122 scrollbar_setIdle (); /* set existence for size calculations */ 266 scrollBar.setIdle (); /* set existence for size calculations */
123#endif 267#endif
124 268
125 rxvt_Create_Windows (this, argc, argv); 269 create_windows (argc, argv);
126 270
127 rxvt_init_xlocale (this); 271 init_xlocale ();
128 272
129 rxvt_scr_reset (this); /* initialize screen */ 273 scr_reset (); /* initialize screen */
130#ifdef RXVT_GRAPHICS
131 rxvt_Gr_reset (this); /* reset graphics */
132#endif
133 274
134#if 0 275#if 0
135#ifdef DEBUG_X
136 XSynchronize(Xdisplay, True); 276 XSynchronize (display->display, True);
137 XSetErrorHandler((XErrorHandler) abort);
138#else
139 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
140#endif
141#endif 277#endif
142 278
143#ifdef HAVE_SCROLLBARS 279#ifdef HAVE_SCROLLBARS
144 if (Options & Opt_scrollBar) 280 if (Options & Opt_scrollBar)
145 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 281 resize_scrollbar (); /* create and map scrollbar */
146#endif 282#endif
147#if (MENUBAR_MAX) 283#if (MENUBAR_MAX)
148 if (menubar_visible(r)) 284 if (menubar_visible ())
149 XMapWindow (Xdisplay, menuBar.win); 285 XMapWindow (display->display, menuBar.win);
150#endif 286#endif
151#ifdef TRANSPARENT 287#ifdef TRANSPARENT
152 if (Options & Opt_transparent) 288 if (Options & Opt_transparent)
153 { 289 {
154 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 290 XSelectInput (display->display, display->root, PropertyChangeMask);
155 rxvt_check_our_parents (this); 291 check_our_parents ();
156 } 292 }
157#endif 293#endif
294
295 rootwin_ev.start (display, display->root);
296
158 XMapWindow (Xdisplay, TermWin.vt); 297 XMapWindow (display->display, TermWin.vt);
159 XMapWindow (Xdisplay, TermWin.parent[0]); 298 XMapWindow (display->display, TermWin.parent[0]);
160 299
161 rxvt_init_env (this);
162 rxvt_init_command (this, cmd_argv); 300 init_command (cmd_argv);
163 301
164 x_ev.start (Xfd, EVENT_READ);
165 pty_ev.start (cmd_fd, EVENT_READ); 302 pty_ev.start (cmd_fd, EVENT_READ);
166 303
167 flush (); 304 check_ev.start ();
168 305
169 return true; 306 return true;
170} 307}
171 308
172/* ------------------------------------------------------------------------- * 309/* ------------------------------------------------------------------------- *
176 * Catch a SIGCHLD signal and exit if the direct child has died 313 * Catch a SIGCHLD signal and exit if the direct child has died
177 */ 314 */
178/* ARGSUSED */ 315/* ARGSUSED */
179/* EXTPROTO */ 316/* EXTPROTO */
180RETSIGTYPE 317RETSIGTYPE
181rxvt_Child_signal(int sig __attribute__ ((unused))) 318rxvt_Child_signal (int sig __attribute__ ((unused)))
182{ 319{
183 dR;
184 int pid, save_errno = errno; 320 int pid, save_errno = errno;
185
186 do {
187 errno = 0;
188 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 321 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
189 322 ;
190 if (pid == R->cmd_pid)
191 exit(EXIT_SUCCESS);
192
193 errno = save_errno; 323 errno = save_errno;
194 signal(SIGCHLD, rxvt_Child_signal); 324
325#if 0
326 if (pid == cmd_pid)
327 exit (EXIT_SUCCESS);
328#endif
195} 329}
196 330
197/* 331/*
198 * Catch a fatal signal and tidy up before quitting 332 * Catch a fatal signal and tidy up before quitting
199 */ 333 */
200/* EXTPROTO */ 334/* EXTPROTO */
201RETSIGTYPE 335RETSIGTYPE
202rxvt_Exit_signal(int sig) 336rxvt_Exit_signal (int sig)
203{ 337{
204 signal(sig, SIG_DFL); 338 signal (sig, SIG_DFL);
205#ifdef DEBUG_CMD 339#ifdef DEBUG_CMD
206 rxvt_print_error("signal %d", sig); 340 rxvt_print_error ("signal %d", sig);
207#endif 341#endif
208 rxvt_clean_exit(); 342 rxvt_clean_exit ();
209 kill(getpid(), sig); 343 kill (getpid (), sig);
210} 344}
211 345
212/* ARGSUSED */
213/* INTPROTO */ 346/* INTPROTO */
214int 347int
215rxvt_xerror_handler(const Display * display 348rxvt_xerror_handler (Display *display, XErrorEvent *event)
216 __attribute__ ((unused)), const XErrorEvent * event)
217{ 349{
218 dR;
219
220 if (R->allowedxerror == -1) { 350 if (GET_R->allowedxerror == -1)
221 R->allowedxerror = event->error_code; 351 GET_R->allowedxerror = event->error_code;
222 return 0; /* ignored anyway */ 352 else
223 } 353 {
224 rxvt_print_error("XError: Request: %d . %d, Error: %d", 354 old_xerror_handler (display, event);
225 event->request_code, event->minor_code, 355 GET_R->destroy ();
226 event->error_code); 356 }
227/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 357
228 exit(EXIT_FAILURE); 358 return 0;
229/* NOTREACHED */
230} 359}
231 360
232/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
233/* 362/*
234 * Exit gracefully, clearing the utmp entry and restoring tty attributes 363 * Exit gracefully, clearing the utmp entry and restoring tty attributes
235 * TODO: if debugging, this should free up any known resources if we can 364 * TODO: if debugging, this should free up any known resources if we can
236 */ 365 */
237/* EXTPROTO */ 366/* EXTPROTO */
238void 367void
239rxvt_clean_exit(void) 368rxvt_clean_exit ()
240{ 369{
241 dR; 370 // TODO: rxvtd should clean up all ressources
242 371 if (GET_R)
243#ifdef DEBUG_SCREEN 372 GET_R->destroy ();
244 rxvt_scr_release(aR);
245#endif
246#ifndef NO_SETOWNER_TTYDEV
247 rxvt_privileged_ttydev(aR_ RESTORE);
248#endif
249#ifdef UTMP_SUPPORT
250 rxvt_privileged_utmp(aR_ RESTORE);
251#endif
252#ifdef USE_XIM
253 if (R->Input_Context != NULL) {
254 XDestroyIC(R->Input_Context);
255 R->Input_Context = NULL;
256 }
257#endif
258} 373}
259 374
260/* ------------------------------------------------------------------------- * 375/* ------------------------------------------------------------------------- *
261 * MEMORY ALLOCATION WRAPPERS * 376 * MEMORY ALLOCATION WRAPPERS *
262 * ------------------------------------------------------------------------- */ 377 * ------------------------------------------------------------------------- */
263/* EXTPROTO */ 378/* EXTPROTO */
264void * 379void *
265rxvt_malloc(size_t size) 380rxvt_malloc (size_t size)
266{ 381{
267 void *p; 382 void *p;
268 383
269 p = malloc(size); 384 p = malloc (size);
270 if (p) 385 if (p)
271 return p; 386 return p;
272 387
273 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
274 rxvt_clean_exit(); 389 rxvt_clean_exit ();
275 exit(EXIT_FAILURE); 390 exit (EXIT_FAILURE);
276/* NOTREACHED */ 391 /* NOTREACHED */
277} 392}
278 393
279/* EXTPROTO */ 394/* EXTPROTO */
280void * 395void *
281rxvt_calloc(size_t number, size_t size) 396rxvt_calloc (size_t number, size_t size)
282{ 397{
283 void *p; 398 void *p;
284 399
285 p = calloc(number, size); 400 p = calloc (number, size);
286 if (p) 401 if (p)
287 return p; 402 return p;
288 403
289 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
290 rxvt_clean_exit(); 405 rxvt_clean_exit ();
291 exit(EXIT_FAILURE); 406 exit (EXIT_FAILURE);
292/* NOTREACHED */ 407 /* NOTREACHED */
293} 408}
294 409
295/* EXTPROTO */ 410/* EXTPROTO */
296void * 411void *
297rxvt_realloc(void *ptr, size_t size) 412rxvt_realloc (void *ptr, size_t size)
298{ 413{
299 void *p; 414 void *p;
300 415
301 if (ptr) 416 if (ptr)
302 p = realloc(ptr, size); 417 p = realloc (ptr, size);
303 else 418 else
304 p = malloc(size); 419 p = malloc (size);
305 if (p) 420 if (p)
306 return p; 421 return p;
307 422
308 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
309 rxvt_clean_exit(); 424 rxvt_clean_exit ();
310 exit(EXIT_FAILURE); 425 exit (EXIT_FAILURE);
311/* NOTREACHED */ 426 /* NOTREACHED */
312} 427}
313 428
314/* ------------------------------------------------------------------------- * 429/* ------------------------------------------------------------------------- *
315 * PRIVILEGED OPERATIONS * 430 * PRIVILEGED OPERATIONS *
316 * ------------------------------------------------------------------------- */ 431 * ------------------------------------------------------------------------- */
317/* take care of suid/sgid super-user (root) privileges */ 432/* take care of suid/sgid super-user (root) privileges */
318/* INTPROTO */
319void 433void
320rxvt_privileges(pR_ int mode) 434rxvt_term::privileges (int mode)
321{ 435{
322#if ! defined(__CYGWIN32__) 436#if ! defined(__CYGWIN32__)
323# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 437# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
324/* setreuid() is the poor man's setuid(), seteuid() */ 438 /* setreuid () is the poor man's setuid (), seteuid () */
325# define seteuid(a) setreuid(-1, (a)) 439# define seteuid(a) setreuid(-1, (a))
326# define setegid(a) setregid(-1, (a)) 440# define setegid(a) setregid(-1, (a))
327# define HAVE_SETEUID 441# define HAVE_SETEUID
328# endif 442# endif
329# ifdef HAVE_SETEUID 443# ifdef HAVE_SETEUID
330 switch (mode) { 444 switch (mode)
445 {
331 case IGNORE: 446 case IGNORE:
332 /* 447 /*
333 * change effective uid/gid - not real uid/gid - so we can switch 448 * change effective uid/gid - not real uid/gid - so we can switch
334 * back to root later, as required 449 * back to root later, as required
335 */ 450 */
336 seteuid(getuid()); 451 seteuid (getuid ());
337 setegid(getgid()); 452 setegid (getgid ());
338 break; 453 break;
339 case SAVE: 454 case SAVE:
340 R->euid = geteuid(); 455 euid = geteuid ();
341 R->egid = getegid(); 456 egid = getegid ();
342 break; 457 break;
343 case RESTORE: 458 case RESTORE:
344 seteuid(R->euid); 459 seteuid (euid);
345 setegid(R->egid); 460 setegid (egid);
346 break; 461 break;
347 } 462 }
348# else 463# else
349 switch (mode) { 464 switch (mode)
465 {
350 case IGNORE: 466 case IGNORE:
351 setuid(getuid()); 467 setuid (getuid ());
352 setgid(getgid()); 468 setgid (getgid ());
353 /* FALLTHROUGH */ 469 /* FALLTHROUGH */
354 case SAVE: 470 case SAVE:
355 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
356 case RESTORE: 472 case RESTORE:
357 break; 473 break;
358 } 474 }
359# endif 475# endif
360#endif 476#endif
361} 477}
362 478
363#ifdef UTMP_SUPPORT 479#ifdef UTMP_SUPPORT
364/* EXTPROTO */
365void 480void
366rxvt_privileged_utmp(pR_ char action) 481rxvt_term::privileged_utmp (char action)
367{ 482{
368 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 483 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
369 action, R->next_utmp_action, getpid())); 484 action, next_utmp_action, getpid ()));
370 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 485 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
371 || (R->Options & Opt_utmpInhibit) 486 || (Options & Opt_utmpInhibit)
372 || R->ttydev == NULL || *R->ttydev == '\0') 487 || ttydev == NULL || *ttydev == '\0')
373 return; 488 return;
374 489
375 rxvt_privileges(aR_ RESTORE); 490 privileges (RESTORE);
376 if (action == SAVE) { 491 if (action == SAVE)
492 {
377 R->next_utmp_action = RESTORE; 493 next_utmp_action = RESTORE;
378 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 494 makeutent (ttydev, rs[Rs_display_name]);
495 }
496 else
379 } else { /* action == RESTORE */ 497 { /* action == RESTORE */
380 R->next_utmp_action = IGNORE; 498 next_utmp_action = IGNORE;
381 rxvt_cleanutent(aR); 499 cleanutent ();
382 } 500 }
383 rxvt_privileges(aR_ IGNORE); 501 privileges (IGNORE);
384} 502}
385#endif 503#endif
386 504
387#ifndef NO_SETOWNER_TTYDEV 505#ifndef NO_SETOWNER_TTYDEV
388/* EXTPROTO */
389void 506void
390rxvt_privileged_ttydev(pR_ char action) 507rxvt_term::privileged_ttydev (char action)
391{ 508{
392 D_MAIN((stderr, 509 D_MAIN ((stderr,
393 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 510 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
394 action, R->next_tty_action, getpid())); 511 action, next_tty_action, getpid ()));
395 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 512 if (next_tty_action != action || (action != SAVE && action != RESTORE)
396 || R->ttydev == NULL || *R->ttydev == '\0') 513 || ttydev == NULL || *ttydev == '\0')
397 return; 514 return;
398 515
399 rxvt_privileges(aR_ RESTORE); 516 privileges (RESTORE);
400 517
401 if (action == SAVE) { 518 if (action == SAVE)
519 {
402 R->next_tty_action = RESTORE; 520 next_tty_action = RESTORE;
403# ifndef RESET_TTY_TO_COMMON_DEFAULTS 521# ifndef RESET_TTY_TO_COMMON_DEFAULTS
404/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 522 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
405 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 523 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
406 R->next_tty_action = IGNORE; 524 next_tty_action = IGNORE;
407 else 525 else
408# endif 526# endif
527
409 { 528 {
410 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 529 chown (ttydev, getuid (), ttygid); /* fail silently */
411 chmod(R->ttydev, R->ttymode); 530 chmod (ttydev, ttymode);
412# ifdef HAVE_REVOKE 531# ifdef HAVE_REVOKE
413 revoke(R->ttydev); 532 revoke (ttydev);
414# endif 533# endif
534
415 } 535 }
536 }
537 else
416 } else { /* action == RESTORE */ 538 { /* action == RESTORE */
417 R->next_tty_action = IGNORE; 539 next_tty_action = IGNORE;
418# ifndef RESET_TTY_TO_COMMON_DEFAULTS 540# ifndef RESET_TTY_TO_COMMON_DEFAULTS
419 chmod(R->ttydev, R->ttyfd_stat.st_mode); 541 chmod (ttydev, ttyfd_stat.st_mode);
420 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 542 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
421# else 543# else
422 chmod(R->ttydev, 544 chmod (ttydev,
423 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 545 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
424 chown(R->ttydev, 0, 0); 546 chown (ttydev, 0, 0);
425# endif 547# endif
426 }
427 548
549 }
550
428 rxvt_privileges(aR_ IGNORE); 551 privileges (IGNORE);
429 552
430# ifndef RESET_TTY_TO_COMMON_DEFAULTS 553# ifndef RESET_TTY_TO_COMMON_DEFAULTS
431 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 554 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
432 action == RESTORE ? "Restoring" : (action == 555 action == RESTORE ? "Restoring" : (action ==
433 SAVE ? "Saving" : 556 SAVE ? "Saving" :
434 "UNKNOWN ERROR for"), R->ttydev, 557 "UNKNOWN ERROR for"), ttydev,
435 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 558 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
436 R->ttyfd_stat.st_gid)); 559 ttyfd_stat.st_gid));
437# endif 560# endif
438} 561}
439#endif 562#endif
440 563
441/*----------------------------------------------------------------------*/ 564/*----------------------------------------------------------------------*/
442/* 565/*
443 * window size/position calculcations for XSizeHint and other storage. 566 * window size/position calculcations for XSizeHint and other storage.
444 * if width/height are non-zero then override calculated width/height 567 * if width/height are non-zero then override calculated width/height
445 */ 568 */
446/* EXTPROTO */
447void 569void
448rxvt_window_calc(pR_ unsigned int width, unsigned int height) 570rxvt_term::window_calc (unsigned int width, unsigned int height)
449{ 571{
450 short recalc_x, recalc_y; 572 short recalc_x, recalc_y;
451 int x, y, sb_w, mb_h, flags; 573 int x, y, sb_w, mb_h, flags;
452 unsigned int w, h; 574 unsigned int w, h;
453 unsigned int max_width, max_height; 575 unsigned int max_width, max_height;
454 576
455 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 577 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
456 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 578 TermWin.ncol, TermWin.nrow, szHint.width,
457 R->szHint.height)); 579 szHint.height));
458 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 580 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
459 R->szHint.win_gravity = NorthWestGravity; 581 szHint.win_gravity = NorthWestGravity;
460/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 582 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
461 583
462 recalc_x = recalc_y = 0; 584 recalc_x = recalc_y = 0;
463 flags = 0; 585 flags = 0;
464 if (!R->parsed_geometry) { 586 if (!parsed_geometry)
587 {
465 R->parsed_geometry = 1; 588 parsed_geometry = 1;
466 if (R->rs[Rs_geometry]) 589 if (rs[Rs_geometry])
467 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 590 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
468 if (flags & WidthValue) { 591 if (flags & WidthValue)
592 {
469 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 593 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
470 R->szHint.flags |= USSize; 594 szHint.flags |= USSize;
471 } 595 }
472 if (flags & HeightValue) { 596 if (flags & HeightValue)
597 {
473 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 598 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
474 R->szHint.flags |= USSize; 599 szHint.flags |= USSize;
475 } 600 }
476 if (flags & XValue) { 601 if (flags & XValue)
602 {
477 R->szHint.x = x; 603 szHint.x = x;
478 R->szHint.flags |= USPosition; 604 szHint.flags |= USPosition;
479 if (flags & XNegative) { 605 if (flags & XNegative)
606 {
480 recalc_x = 1; 607 recalc_x = 1;
481 R->szHint.win_gravity = NorthEastGravity; 608 szHint.win_gravity = NorthEastGravity;
482 } 609 }
483 } 610 }
484 if (flags & YValue) { 611 if (flags & YValue)
612 {
485 R->szHint.y = y; 613 szHint.y = y;
486 R->szHint.flags |= USPosition; 614 szHint.flags |= USPosition;
487 if (flags & YNegative) { 615 if (flags & YNegative)
616 {
488 recalc_y = 1; 617 recalc_y = 1;
489 if (R->szHint.win_gravity == NorthEastGravity) 618 if (szHint.win_gravity == NorthEastGravity)
490 R->szHint.win_gravity = SouthEastGravity; 619 szHint.win_gravity = SouthEastGravity;
491 else 620 else
492 R->szHint.win_gravity = SouthWestGravity; 621 szHint.win_gravity = SouthWestGravity;
493 } 622 }
494 } 623 }
495 } 624 }
496/* TODO: BOUNDS */ 625 /* TODO: BOUNDS */
497 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 626 TermWin.width = TermWin.ncol * TermWin.fwidth;
498 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 627 TermWin.height = TermWin.nrow * TermWin.fheight;
499 max_width = MAX_COLS * R->TermWin.fwidth; 628 max_width = MAX_COLS * TermWin.fwidth;
500 max_height = MAX_ROWS * R->TermWin.fheight; 629 max_height = MAX_ROWS * TermWin.fheight;
501 630
502 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 631 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
503 632
504 sb_w = mb_h = 0; 633 sb_w = mb_h = 0;
505 R->window_vt_x = R->window_vt_y = 0; 634 window_vt_x = window_vt_y = 0;
506 if (scrollbar_visible(R)) { 635 if (scrollbar_visible ())
636 {
507 sb_w = scrollbar_TotalWidth(); 637 sb_w = scrollbar_TotalWidth ();
508 R->szHint.base_width += sb_w; 638 szHint.base_width += sb_w;
509 if (!(R->Options & Opt_scrollBar_right)) 639 if (! (Options & Opt_scrollBar_right))
510 R->window_vt_x = sb_w; 640 window_vt_x = sb_w;
511 } 641 }
512 if (menubar_visible(R)) { 642 if (menubar_visible ())
643 {
513 mb_h = menuBar_TotalHeight(); 644 mb_h = menuBar_TotalHeight ();
514 R->szHint.base_height += mb_h; 645 szHint.base_height += mb_h;
515 R->window_vt_y = mb_h; 646 window_vt_y = mb_h;
516 } 647 }
517 R->szHint.width_inc = R->TermWin.fwidth; 648 szHint.width_inc = TermWin.fwidth;
518 R->szHint.height_inc = R->TermWin.fheight; 649 szHint.height_inc = TermWin.fheight;
519 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 650 szHint.min_width = szHint.base_width + szHint.width_inc;
520 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 651 szHint.min_height = szHint.base_height + szHint.height_inc;
521 652
522 if (width && width - R->szHint.base_width < max_width) { 653 if (width && width - szHint.base_width < max_width)
654 {
523 R->szHint.width = width; 655 szHint.width = width;
524 R->TermWin.width = width - R->szHint.base_width; 656 TermWin.width = width - szHint.base_width;
525 } else { 657 }
658 else
659 {
526 MIN_IT(R->TermWin.width, max_width); 660 MIN_IT (TermWin.width, max_width);
527 R->szHint.width = R->szHint.base_width + R->TermWin.width; 661 szHint.width = szHint.base_width + TermWin.width;
528 } 662 }
529 if (height && height - R->szHint.base_height < max_height) { 663 if (height && height - szHint.base_height < max_height)
664 {
530 R->szHint.height = height; 665 szHint.height = height;
531 R->TermWin.height = height - R->szHint.base_height; 666 TermWin.height = height - szHint.base_height;
532 } else { 667 }
668 else
669 {
533 MIN_IT(R->TermWin.height, max_height); 670 MIN_IT (TermWin.height, max_height);
534 R->szHint.height = R->szHint.base_height + R->TermWin.height; 671 szHint.height = szHint.base_height + TermWin.height;
535 } 672 }
536 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 673 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
537 R->window_sb_x = R->szHint.width - sb_w; 674 window_sb_x = szHint.width - sb_w;
538 675
539 if (recalc_x) 676 if (recalc_x)
540 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 677 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
541 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 678 - szHint.width - 2 * TermWin.ext_bwidth);
542 if (recalc_y) 679 if (recalc_y)
543 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 680 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
544 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 681 - szHint.height - 2 * TermWin.ext_bwidth);
545 682
546 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 683 TermWin.ncol = TermWin.width / TermWin.fwidth;
547 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 684 TermWin.nrow = TermWin.height / TermWin.fheight;
548 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 685 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
549 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 686 TermWin.ncol, TermWin.nrow, szHint.width,
550 R->szHint.height)); 687 szHint.height));
551 return; 688 return;
552} 689}
553 690
554/*----------------------------------------------------------------------*/ 691/*----------------------------------------------------------------------*/
555/* 692/*
556 * Tell the teletype handler what size the window is. 693 * Tell the teletype handler what size the window is.
557 * Called after a window size change. 694 * Called after a window size change.
558 */ 695 */
559/* EXTPROTO */
560void 696void
561rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 697rxvt_term::tt_winch ()
562{ 698{
563 struct winsize ws; 699 struct winsize ws;
564 700
565 if (fd < 0) 701 if (cmd_fd < 0)
566 return; 702 return;
703
567 ws.ws_col = col; 704 ws.ws_col = TermWin.ncol;
568 ws.ws_row = row; 705 ws.ws_row = TermWin.nrow;
569 ws.ws_xpixel = ws.ws_ypixel = 0; 706 ws.ws_xpixel = ws.ws_ypixel = 0;
570#ifndef DEBUG_SIZE 707#ifndef DEBUG_SIZE
571 (void)ioctl(fd, TIOCSWINSZ, &ws); 708 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
572#else 709#else
573 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 710 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
574 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 711 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
575 }
576# ifdef SIGWINCH 712# ifdef SIGWINCH
577 else if (pid) /* force through to the command */ 713 else if (cmd_pid) /* force through to the command */
578 kill(pid, SIGWINCH); 714 kill (cmd_pid, SIGWINCH);
579# endif 715# endif
580#endif 716#endif
581} 717}
582 718
583/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
584/* rxvt_change_font() - Switch to a new font */ 720/* rxvt_change_font () - Switch to a new font */
585/* 721/*
586 * init = 1 - initialize 722 * init = 1 - initialize
587 * 723 *
588 * fontname == FONT_UP - switch to bigger font 724 * fontname == FONT_UP - switch to bigger font
589 * fontname == FONT_DN - switch to smaller font 725 * fontname == FONT_DN - switch to smaller font
590 */ 726 */
591/* EXTPROTO */ 727bool
592void
593rxvt_change_font(pR_ int init, const char *fontname) 728rxvt_term::change_font (const char *fontname)
594{ 729{
595} 730 if (fontname == FONT_UP)
731 {
732 // TODO
733 }
734 else if (fontname == FONT_DN)
735 {
736 // TODO
737 }
738 else
739 {
740 rxvt_fontset *fs = new rxvt_fontset (this);
596 741
597/* INTPROTO */ 742 if (fs && fs->populate (fontname))
598void 743 {
744 delete TermWin.fontset;
745 TermWin.fontset = fs;
746 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent;
749
750 // TODO: screen needs to be told about new fonts
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
599rxvt_font_up_down(pR_ int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
600{ 768{
769 return false;
601} 770}
602 771
603/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
604/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
605/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
606/* EXTPROTO */
607void 775void
608rxvt_set_title(pR_ const char *str) 776rxvt_term::set_title (const char *str)
609{ 777{
610#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
611 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
612#else 780#else
613 char *name; 781 char *name;
614 782
615 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
616 name = NULL; 784 name = NULL;
617 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
618 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
619 if (name) 787 if (name)
620 XFree(name); 788 XFree (name);
621#endif 789#endif
622} 790}
623 791
624/* EXTPROTO */
625void 792void
626rxvt_set_iconName(pR_ const char *str) 793rxvt_term::set_iconName (const char *str)
627{ 794{
628#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
629 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
630#else 797#else
631 char *name; 798 char *name;
632 799
633 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
634 name = NULL; 801 name = NULL;
635 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
636 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
637 if (name) 804 if (name)
638 XFree(name); 805 XFree (name);
639#endif 806#endif
640} 807}
641 808
642#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
643/* EXTPROTO */
644void 810void
645rxvt_set_window_color(pR_ int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
646{ 812{
647 rxvt_color xcol; 813 rxvt_color xcol;
648 int i; 814 int i;
649 815
650 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
651 return; 817 return;
652 818
653/* handle color aliases */ 819 /* handle color aliases */
654 if (isdigit(*color)) { 820 if (isdigit (*color))
821 {
655 i = atoi(color); 822 i = atoi (color);
823 if (i >= 8 && i <= 15)
656 if (i >= 8 && i <= 15) { /* bright colors */ 824 { /* bright colors */
657 i -= 8; 825 i -= 8;
658# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
659 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
660 SET_PIXCOLOR(R, idx); 828 SET_PIXCOLOR (idx);
661 goto Done; 829 goto Done;
662# endif 830# endif
831
663 } 832 }
664 if (i >= 0 && i <= 7) { /* normal colors */ 833 if (i >= 0 && i <= 7)
834 { /* normal colors */
665 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
666 SET_PIXCOLOR(R, idx); 836 SET_PIXCOLOR (idx);
667 goto Done; 837 goto Done;
668 } 838 }
669 } 839 }
670 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
671 return; 841 return;
672/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 842 /* XStoreColor (display->display, XCMAP, XColor*); */
673 843
674/* 844 /*
675 * FIXME: should free colors here, but no idea how to do it so instead, 845 * FIXME: should free colors here, but no idea how to do it so instead,
676 * so just keep gobbling up the colormap 846 * so just keep gobbling up the colormap
677 */ 847 */
678# if 0 848# if 0
679 for (i = Color_Black; i <= Color_White; i++) 849 for (i = Color_Black; i <= Color_White; i++)
680 if (R->PixColors[idx] == R->PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
681 break; 851 break;
682 if (i > Color_White) { 852 if (i > Color_White)
853 {
683 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
684 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
685 DisplayPlanes(R->Xdisplay, Xscreen)); 856 DisplayPlanes (display->display, display->screen));
686 } 857 }
687# endif 858# endif
688 859
689 R->PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
690 SET_PIXCOLOR(R, idx); 861 SET_PIXCOLOR (idx);
691 862
692/* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
693/* Cursor cursor; */ 864 /* Cursor cursor; */
694 Done: 865Done:
695 if (idx == Color_bg && !(R->Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
696 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
697 R->PixColors[Color_bg]); 868 PixColors[Color_bg]);
698 869
699/* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
700 871
701 rxvt_set_colorfgbg(aR); 872 set_colorfgbg ();
702 rxvt_recolour_cursor(aR); 873 recolour_cursor ();
703/* the only reasonable way to enforce a clean update */ 874 /* the only reasonable way to enforce a clean update */
704 rxvt_scr_poweron(aR); 875 scr_poweron ();
705} 876}
706 877
707#else 878#else
708# define rxvt_set_window_color(aR_ idx,color) ((void)0) 879# define set_window_color (idx,color) ((void)0)
709#endif /* XTERM_COLOR_CHANGE */ 880#endif /* XTERM_COLOR_CHANGE */
710 881
711/* EXTPROTO */
712void 882void
713rxvt_recolour_cursor(pR) 883rxvt_term::recolour_cursor ()
714{ 884{
715 rxvt_color xcol[2];
716
717#if TODO 885#if TODO
886 rxvt_color xcol[2];
887
718 xcol[0] = R->PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
719 xcol[1] = R->PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
720 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
721 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
722#endif 892#endif
723} 893}
724 894
725/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
726/* 896/*
727 * find if fg/bg matches any of the normal (low-intensity) colors 897 * find if fg/bg matches any of the normal (low-intensity) colors
728 */ 898 */
729/* INTPROTO */
730void 899void
731rxvt_set_colorfgbg(pR) 900rxvt_term::set_colorfgbg ()
732{ 901{
733 unsigned int i; 902 unsigned int i;
734 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
735 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
736 905
737 R->env_colorfgbg = 906 env_colorfgbg =
738 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
739 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
740 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
741 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[Color_fg] == R->PixColors[i]) { 911 if (PixColors[Color_fg] == PixColors[i])
912 {
743 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
744 break; 914 break;
745 } 915 }
746 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
747 if (R->PixColors[Color_bg] == R->PixColors[i]) { 917 if (PixColors[Color_bg] == PixColors[i])
918 {
748 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
749#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
750 xpmb = "default;"; 921 xpmb = "default;";
751#endif 922#endif
752 break; 923 break;
753 } 924 }
925
754 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
755 putenv(R->env_colorfgbg);
756 927
757#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
758 R->colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
759 for (i = minCOLOR; i <= maxCOLOR; i++) { 930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
760 if (R->PixColors[Color_fg] == R->PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
761 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
762 if (R->PixColors[Color_bg] == R->PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
763 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
764 } 936 }
765#endif 937#endif
766} 938}
767 939
768/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
769/* 941/*
770 * Colour determination for low colour displays, routine from 942 * Colour determination for low colour displays, routine from
771 * Hans de Goede <hans@highrise.nl> 943 * Hans de Goede <hans@highrise.nl>
772 */ 944 */
773 945
774/* EXTPROTO */
775int 946int
776rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
777{ 948{
778 screen_in_out->set(aR_ colour);
779
780 if (!screen_in_out->set(aR_ colour)) { 949 if (!screen_in_out->set (display, colour))
950 {
781 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
782 return false; 952 return false;
783 } 953 }
784 954
785 return true; 955 return true;
786} 956}
787 957
788/* -------------------------------------------------------------------- * 958/* -------------------------------------------------------------------- *
789 * - WINDOW RESIZING - * 959 * - WINDOW RESIZING - *
790 * -------------------------------------------------------------------- */ 960 * -------------------------------------------------------------------- */
791/* EXTPROTO */
792void 961void
793rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 962rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
794 int ignoreparent)
795{ 963{
796 int fix_screen; 964 int fix_screen;
797 965
798#ifdef SMART_RESIZE 966#ifdef SMART_RESIZE
799 int old_width = R->szHint.width, old_height = R->szHint.height; 967 int old_width = szHint.width, old_height = szHint.height;
800#endif 968#endif
801 969
802 rxvt_window_calc(aR_ width, height); 970 window_calc (width, height);
803 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
804 if (!ignoreparent) { 972 if (!ignoreparent)
973 {
805#ifdef SMART_RESIZE 974#ifdef SMART_RESIZE
806/* 975 /*
807 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
808 * reposition window on resize depending on placement on screen 977 * reposition window on resize depending on placement on screen
809 */ 978 */
810 int x, y, x1, y1; 979 int x, y, x1, y1;
811 int dx, dy; 980 int dx, dy;
812 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
813 Window unused_cr; 982 Window unused_cr;
814 983
815 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
816 0, 0, &x, &y, &unused_cr); 985 0, 0, &x, &y, &unused_cr);
817 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
818 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 987 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
819 /* 988 /*
820 * if Xroot isn't the parent window, a WM will probably have offset 989 * if display->root isn't the parent window, a WM will probably have offset
821 * our position for handles and decorations. Counter it 990 * our position for handles and decorations. Counter it
822 */ 991 */
823 if (x1 != x || y1 != y) { 992 if (x1 != x || y1 != y)
993 {
824 x -= x1; 994 x -= x1;
825 y -= y1; 995 y -= y1;
826 } 996 }
827 997
828 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
829 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
830 dx = old_width - R->szHint.width; 1000 dx = old_width - szHint.width;
831 dy = old_height - R->szHint.height; 1001 dy = old_height - szHint.height;
832 1002
833 /* Check position of the center of the window */ 1003 /* Check position of the center of the window */
834 if (x < x1) /* left half */ 1004 if (x < x1) /* left half */
835 dx = 0; 1005 dx = 0;
836 else if (x == x1) /* exact center */ 1006 else if (x == x1) /* exact center */
837 dx /= 2; 1007 dx /= 2;
838 if (y < y1) /* top half */ 1008 if (y < y1) /* top half */
839 dy = 0; 1009 dy = 0;
840 else if (y == y1) /* exact center */ 1010 else if (y == y1) /* exact center */
841 dy /= 2; 1011 dy /= 2;
842 1012
843 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
844 R->szHint.width, R->szHint.height); 1014 szHint.width, szHint.height);
845#else 1015#else
846 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
847 R->szHint.height); 1017 szHint.height);
848#endif 1018#endif
849 }
850 1019
1020 }
1021
851 fix_screen = (R->TermWin.ncol != R->prev_ncol 1022 fix_screen = (TermWin.ncol != prev_ncol
852 || R->TermWin.nrow != R->prev_nrow); 1023 || TermWin.nrow != prev_nrow);
1024
853 if (fix_screen || width != R->old_width || height != R->old_height) { 1025 if (fix_screen || width != old_width || height != old_height)
1026 {
854 if (scrollbar_visible(R)) { 1027 if (scrollbar_visible ())
1028 {
855 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
856 0, scrollbar_TotalWidth(), R->szHint.height); 1030 0, scrollbar_TotalWidth (), szHint.height);
857 rxvt_Resize_scrollBar(aR); 1031 resize_scrollbar ();
858 } 1032 }
1033
859 if (menubar_visible(R)) 1034 if (menubar_visible ())
860 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
861 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1037
862 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
863 R->window_vt_y, TermWin_TotalWidth(), 1039 window_vt_y, TermWin_TotalWidth (),
864 TermWin_TotalHeight()); 1040 TermWin_TotalHeight ());
865#ifdef RXVT_GRAPHICS
866 if (R->old_height)
867 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
868 R->old_height - R->szHint.base_height);
869#endif
870 rxvt_scr_clear(aR); 1041 scr_clear ();
871#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
872 rxvt_resize_pixmap(aR); 1043 resize_pixmap ();
873#endif 1044#endif
874 }
875 1045
1046 }
1047
876 if (fix_screen || R->old_height == 0) { 1048 if (fix_screen || old_height == 0)
1049 {
877 int curr_screen = -1; 1050 int curr_screen = -1;
878 uint16_t old_ncol = R->prev_ncol; 1051 int old_ncol = prev_ncol;
879 1052
880 /* scr_reset only works on the primary screen */ 1053 /* scr_reset only works on the primary screen */
881 if (R->old_height) /* this is not the first time through */ 1054 if (old_height) /* this is not the first time through */
1055 {
1056 unsigned int ncol = TermWin.ncol;
1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
882 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
883 rxvt_scr_reset(aR); 1059 TermWin.ncol = ncol;
884 if (curr_screen >= 0) { /* this is not the first time through */
885 rxvt_scr_change_screen(aR_ curr_screen);
886 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
887 } 1060 }
888 }
889 1061
1062 scr_reset ();
1063
1064 if (curr_screen >= 0) /* this is not the first time through */
1065 {
1066 scr_change_screen (curr_screen);
1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1068 }
1069 }
1070
890 R->old_width = R->szHint.width; 1071 old_width = szHint.width;
891 R->old_height = R->szHint.height; 1072 old_height = szHint.height;
892 1073
893#ifdef USE_XIM 1074#ifdef USE_XIM
894 rxvt_IMSetStatusPosition(aR); 1075 IMSetStatusPosition ();
895#endif 1076#endif
896} 1077}
897 1078
898/* 1079/*
899 * Set the width/height of the vt window in characters. Units are pixels. 1080 * Set the width/height of the vt window in characters. Units are pixels.
900 * good for toggling 80/132 columns 1081 * good for toggling 80/132 columns
901 */ 1082 */
902/* EXTPROTO */
903void 1083void
904rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1084rxvt_term::set_widthheight (unsigned int width, unsigned int height)
905{ 1085{
906 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
907 1087
908 if (width == 0 || height == 0) { 1088 if (width == 0 || height == 0)
1089 {
909 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
910 if (width == 0) 1091 if (width == 0)
911 width = wattr.width - R->szHint.base_width; 1092 width = wattr.width - szHint.base_width;
912 if (height == 0) 1093 if (height == 0)
913 height = wattr.height - R->szHint.base_height; 1094 height = wattr.height - szHint.base_height;
914 } 1095 }
915 if (width != R->TermWin.width || height != R->TermWin.height) { 1096 if (width != TermWin.width || height != TermWin.height)
1097 {
916 width += R->szHint.base_width; 1098 width += szHint.base_width;
917 height += R->szHint.base_height; 1099 height += szHint.base_height;
918 rxvt_resize_all_windows(aR_ width, height, 0); 1100 resize_all_windows (width, height, 0);
919 } 1101 }
920} 1102}
921 1103
922/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
923 * - X INPUT METHOD ROUTINES - * 1105 * - X INPUT METHOD ROUTINES - *
924 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
925#ifdef USE_XIM 1107#ifdef USE_XIM
926/* INTPROTO */ 1108
927void 1109void
928rxvt_setSize(pR_ XRectangle * size) 1110rxvt_term::im_set_size (XRectangle *size)
929{ 1111{
930 size->x = R->TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
931 size->y = R->TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
932 size->width = Width2Pixel(R->TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
933 size->height = Height2Pixel(R->TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
934} 1116}
935 1117
936/* INTPROTO */
937void 1118void
938rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
939{ 1120{
940 *fg = R->PixColors[Color_fg]; 1121 *fg = PixColors[Color_fg];
941 *bg = R->PixColors[Color_bg]; 1122 *bg = PixColors[Color_bg];
942} 1123}
943 1124
944/* Checking whether input method is running. */ 1125/* Checking whether input method is running. */
945/* INTPROTO */
946Bool 1126bool
947rxvt_IMisRunning(pR) 1127rxvt_term::IMisRunning ()
948{ 1128{
949 char *p; 1129 char *p;
950 Atom atom; 1130 Atom atom;
951 Window win; 1131 Window win;
952 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
953 1133
954/* get current locale modifier */ 1134 /* get current locale modifier */
955 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 {
956 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
957 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
958 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
959 *p = '\0'; 1140 *p = '\0';
960 1141
961 atom = XInternAtom(R->Xdisplay, server, False); 1142 atom = XInternAtom (display->display, server, False);
962 win = XGetSelectionOwner(R->Xdisplay, atom); 1143 win = XGetSelectionOwner (display->display, atom);
963 if (win != None) 1144 if (win != None)
964 return True; 1145 return True;
965 } 1146 }
966 return False; 1147 return False;
967} 1148}
968 1149
969/* EXTPROTO */
970void 1150void
971rxvt_IMSendSpot(pR) 1151rxvt_term::IMSendSpot ()
972{ 1152{
973 XPoint spot; 1153 XPoint spot;
974 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
975 1155
976 if (R->Input_Context == NULL 1156 if (Input_Context == NULL
977 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
978 || !(R->event_type == KeyPress 1158 || ! (event_type == KeyPress
979 || R->event_type == Expose 1159 || event_type == Expose
980 || R->event_type == NoExpose 1160 || event_type == NoExpose
981 || R->event_type == SelectionNotify 1161 || event_type == SelectionNotify
982 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
983 || !rxvt_IMisRunning(aR)) 1163 || !IMisRunning ())
984 return; 1164 return;
985 1165
986 rxvt_setPosition(aR_ & spot); 1166 im_set_position (&spot);
987 1167
988 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
989 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
990 XFree(preedit_attr); 1170 XFree (preedit_attr);
991} 1171}
992 1172
993/* EXTPROTO */
994void 1173void
995rxvt_setTermFontSet(pR_ int idx)
996{
997 char *string;
998 long length;
999 int success = 0;
1000
1001 if (idx < 0 || idx >= MAX_NFONTS)
1002 return;
1003}
1004
1005/* INTPROTO */
1006void
1007rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1008 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1009{ 1176{
1010 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1011 1178
1012 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1013 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1181
1014 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1015 mbh -= R->TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1016 1184
1017 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1018 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1019 1187
1020 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1021 + vtx;
1022 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1023 1190
1024 status_rect->x = vtx; 1191 status_rect->x = vtx;
1025 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1026 1193
1027 status_rect->width = needed_rect->width ? needed_rect->width 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1028 : Width2Pixel(R->TermWin.ncol + 1);
1029 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1030} 1196}
1031 1197
1032/* ARGSUSED */
1033/* INTPROTO */
1034void 1198void
1035rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1199rxvt_term::im_destroy ()
1036 __attribute__ ((unused)), XPointer call_data
1037 __attribute__ ((unused)))
1038{ 1200{
1039 dR; 1201 if (Input_Context)
1040 1202 {
1203 XDestroyIC (Input_Context);
1041 R->Input_Context = NULL; 1204 Input_Context = NULL;
1042/* To avoid Segmentation Fault in C locale: Solaris only? */ 1205 }
1043 if (STRCMP(R->locale, "C"))
1044 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1045 rxvt_IMInstantiateCallback, NULL);
1046}
1047 1206
1048/* 1207 if (input_method)
1049 * X manual pages and include files don't match on some systems:
1050 * some think this is an XIDProc and others an XIMProc so we can't
1051 * use the first argument - need to update this to be nice for
1052 * both types via some sort of configure detection
1053 */
1054/* ARGSUSED */
1055/* EXTPROTO */
1056void
1057rxvt_IMInstantiateCallback(Display * unused
1058 __attribute__ ((unused)), XPointer client_data
1059 __attribute__ ((unused)), XPointer call_data
1060 __attribute__ ((unused)))
1061{
1062 dR;
1063 int i, found, had_im;
1064 const char *p;
1065 char **s;
1066 char buf[IMBUFSIZ];
1067
1068 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1069 if (R->Input_Context)
1070 return;
1071
1072 found = had_im = 0;
1073 p = R->rs[Rs_inputMethod];
1074 if (p && *p) {
1075 had_im = 1;
1076 s = rxvt_splitcommastring(p);
1077 for (i = 0; s[i]; i++) {
1078 if (*s[i]) {
1079 STRCPY(buf, "@im=");
1080 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1081 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1082 && (rxvt_IM_get_IC(aR) == True)) {
1083 found = 1;
1084 break;
1085 }
1086 }
1087 }
1088 for (i = 0; s[i]; i++)
1089 free(s[i]);
1090 free(s);
1091 } 1208 {
1092 if (found) 1209 display->put_xim (input_method);
1093 return; 1210 input_method = 0;
1094
1095/* try with XMODIFIERS env. var. */
1096 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1097 rxvt_IM_get_IC(aR);
1098 return;
1099 } 1211 }
1100
1101/* try with no modifiers base IF the user didn't specify an IM */
1102 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1103 && rxvt_IM_get_IC(aR) == True)
1104 return;
1105} 1212}
1106 1213
1107/* 1214/*
1108 * Try to open a XIM with the current modifiers, then see if we can 1215 * Try to open a XIM with the current modifiers, then see if we can
1109 * open a suitable preedit type 1216 * open a suitable preedit type
1110 */ 1217 */
1111/* INTPROTO */
1112Bool 1218bool
1113rxvt_IM_get_IC(pR) 1219rxvt_term::IM_get_IC (const char *modifiers)
1114{ 1220{
1115 int i, j, found; 1221 int i, j, found;
1116 XIM xim; 1222 XIM xim;
1117 XPoint spot; 1223 XPoint spot;
1118 XRectangle rect, status_rect, needed_rect; 1224 XRectangle rect, status_rect, needed_rect;
1119 unsigned long fg, bg; 1225 unsigned long fg, bg;
1120 const char *p; 1226 const char *p;
1121 char **s; 1227 char **s;
1122 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1123 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1124 XIMCallback ximcallback;
1125 1230
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false;
1233
1126 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1127 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1235 input_method = display->get_xim (locale, modifiers);
1128 if (xim == NULL) 1236 if (input_method == NULL)
1129 return False; 1237 return false;
1130 1238
1239 xim = input_method->xim;
1240
1131 xim_styles = NULL; 1241 xim_styles = NULL;
1132 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1133 || !xim_styles || !xim_styles->count_styles) { 1243 || !xim_styles || !xim_styles->count_styles)
1134 XCloseIM(xim); 1244 {
1245 display->put_xim (input_method);
1135 return False; 1246 return false;
1136 } 1247 }
1137 1248
1138 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1139 : "OverTheSpot,OffTheSpot,Root";
1140 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1141 for (i = found = 0; !found && s[i]; i++) { 1251 for (i = found = 0; !found && s[i]; i++)
1252 {
1142 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1143 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1144 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1145 R->input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1146 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1147 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1148 1259
1149 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1150 if (R->input_style == xim_styles->supported_styles[j]) { 1261 if (input_style == xim_styles->supported_styles[j])
1262 {
1151 found = 1; 1263 found = 1;
1264 break;
1265 }
1266 }
1267
1268 for (i = 0; s[i]; i++)
1269 free (s[i]);
1270
1271 free (s);
1272 XFree (xim_styles);
1273
1274 if (!found)
1275 {
1276 display->put_xim (input_method);
1277 return false;
1278 }
1279
1280 preedit_attr = status_attr = NULL;
1281
1282 if (input_style & XIMPreeditPosition)
1283 {
1284 im_set_size (&rect);
1285 im_set_position (&spot);
1286 im_set_color (&fg, &bg);
1287
1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1289 XNSpotLocation, &spot,
1290 XNForeground, fg, XNBackground, bg,
1291 //XNFontSet, TermWin.fontset,
1292 NULL);
1293 }
1294 else if (input_style & XIMPreeditArea)
1295 {
1296 im_set_color (&fg, &bg);
1297
1298 /*
1299 * The necessary width of preedit area is unknown
1300 * until create input context.
1301 */
1302 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1305
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1307 XNForeground, fg, XNBackground, bg,
1308 //XNFontSet, TermWin.fontset,
1309 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 }
1315
1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1317 XNClientWindow, TermWin.parent[0],
1318 XNFocusWindow, TermWin.parent[0],
1319 preedit_attr ? XNPreeditAttributes : NULL,
1320 preedit_attr,
1321 status_attr ? XNStatusAttributes : NULL,
1322 status_attr, NULL);
1323 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr);
1325
1326 if (Input_Context == NULL)
1327 {
1328 rxvt_print_error ("failed to create input context");
1329 display->put_xim (input_method);
1330 return false;
1331 }
1332
1333 if (input_style & XIMPreeditArea)
1334 IMSetStatusPosition ();
1335
1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1337 return true;
1338}
1339
1340void
1341rxvt_term::im_cb ()
1342{
1343 int i, found, had_im;
1344 const char *p;
1345 char **s;
1346 char buf[IMBUFSIZ];
1347
1348 im_destroy ();
1349
1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1351 if (Input_Context)
1352 return;
1353
1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1355 if (rs[Rs_imLocale])
1356 SET_LOCALE (rs[Rs_imLocale]);
1357#endif
1358
1359 p = rs[Rs_inputMethod];
1360 if (p && *p)
1361 {
1362 bool found = false;
1363
1364 s = rxvt_splitcommastring (p);
1365 for (i = 0; s[i]; i++)
1366 {
1367 if (*s[i])
1368 {
1369 STRCPY (buf, "@im=");
1370 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1371 if (IM_get_IC (buf))
1372 {
1373 found = true;
1152 break; 1374 break;
1375 }
1153 } 1376 }
1154 } 1377 }
1155 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1156 free(s[i]); 1379 free (s[i]);
1157 free(s); 1380 free (s);
1158 XFree(xim_styles);
1159 1381
1160 if (!found) { 1382 if (found)
1161 XCloseIM(xim); 1383 goto done;
1162 return False;
1163 } 1384 }
1164 1385
1165 ximcallback.callback = rxvt_IMDestroyCallback; 1386 /* try with XMODIFIERS env. var. */
1387 if (IM_get_IC (""))
1388 goto done;
1166 1389
1167/* XXX: not sure why we need this (as well as IC one below) */ 1390 /* try with no modifiers base IF the user didn't specify an IM */
1168 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1391 if (IM_get_IC ("@im=none"))
1392 goto done;
1169 1393
1170 preedit_attr = status_attr = NULL; 1394done:
1171 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1172 if (R->input_style & XIMPreeditPosition) { 1396 if (rs[Rs_imLocale])
1173 rxvt_setSize(aR_ & rect); 1397 SET_LOCALE (locale);
1174 rxvt_setPosition(aR_ & spot); 1398#endif
1175 rxvt_setColor(aR_ & fg, &bg);
1176
1177 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1178 XNSpotLocation, &spot,
1179 XNForeground, fg, XNBackground, bg,
1180 //XNFontSet, R->TermWin.fontset,
1181 NULL);
1182 } else if (R->input_style & XIMPreeditArea) {
1183 rxvt_setColor(aR_ & fg, &bg);
1184
1185 /*
1186 * The necessary width of preedit area is unknown
1187 * until create input context.
1188 */
1189 needed_rect.width = 0;
1190
1191 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1192
1193 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1194 XNForeground, fg, XNBackground, bg,
1195 //XNFontSet, R->TermWin.fontset,
1196 NULL);
1197 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1198 XNForeground, fg, XNBackground, bg,
1199 //XNFontSet, R->TermWin.fontset,
1200 NULL);
1201 }
1202 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1203 XNClientWindow, R->TermWin.parent[0],
1204 XNFocusWindow, R->TermWin.parent[0],
1205 XNDestroyCallback, &ximcallback,
1206 preedit_attr ? XNPreeditAttributes : NULL,
1207 preedit_attr,
1208 status_attr ? XNStatusAttributes : NULL,
1209 status_attr, NULL);
1210 if (preedit_attr)
1211 XFree(preedit_attr);
1212 if (status_attr)
1213 XFree(status_attr);
1214 if (R->Input_Context == NULL) {
1215 rxvt_print_error("failed to create input context");
1216 XCloseIM(xim);
1217 return False;
1218 }
1219 if (R->input_style & XIMPreeditArea)
1220 rxvt_IMSetStatusPosition(aR);
1221 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1222 return True;
1223} 1399}
1224 1400
1225/* EXTPROTO */
1226void 1401void
1227rxvt_IMSetStatusPosition(pR) 1402rxvt_term::IMSetStatusPosition ()
1228{ 1403{
1229 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1230 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1231 1406
1232 if (R->Input_Context == NULL 1407 if (Input_Context == NULL
1233 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1234 || !rxvt_IMisRunning(aR)) 1409 || !IMisRunning ())
1235 return; 1410 return;
1236 1411
1237/* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1238 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1239 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1240 XFree(status_attr); 1415 XFree (status_attr);
1241 1416
1242 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1243 1418
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1245 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1246 1421
1247 XSetICValues(R->Input_Context, 1422 XSetICValues (Input_Context,
1248 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1249 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1250 1425
1251 XFree(preedit_attr); 1426 XFree (preedit_attr);
1252 XFree(status_attr); 1427 XFree (status_attr);
1253} 1428}
1254#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1255 1430
1256/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1257rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines