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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

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

Diff Legend

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