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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.45 by pcg, Tue Feb 24 21:46:15 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines