[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.247 by ayin, Tue Aug 28 16:56:40 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
56	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
57		57
58	bool	58	bool
59	rxvt_set_locale (const char *locale) NOTHROW	59	rxvt_set_locale (const char *locale) NOTHROW
60	{	60	{
		61	int size = strlen (locale) + 1;
		62
		63	if (size > sizeof (curlocale))
		64	rxvt_fatal ("locale string too long, aborting.\n");
		65
61	if (!locale \|\| !strncmp (locale, curlocale, 128))	66	if (!locale \|\| !memcmp (locale, curlocale, size))
62	return false;	67	return false;
63		68
64	strncpy (curlocale, locale, 128);	69	memcpy (curlocale, locale, size);
65	setlocale (LC_CTYPE, curlocale);	70	setlocale (LC_CTYPE, curlocale);
66	return true;	71	return true;
67	}	72	}
68		73
69	void	74	void
…		…
143	}	148	}
144	#endif	149	#endif
145		150
146	rxvt_term::rxvt_term ()	151	rxvt_term::rxvt_term ()
147	:	152	:
148	#if TRANSPARENT	153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	154	rootwin_ev (this, &rxvt_term::rootwin_cb),
		155	#endif
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev(this, &rxvt_term::update_background_cb),
150	#endif	158	#endif
151	#ifdef HAVE_SCROLLBARS	159	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),	160	scrollbar_ev (this, &rxvt_term::x_cb),
153	#endif	161	#endif
154	#ifdef CURSOR_BLINK	162	#ifdef CURSOR_BLINK
…		…
169	#ifdef POINTER_BLANK	177	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	178	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	179	#endif
172	#ifdef USE_XIM	180	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	181	im_ev (this, &rxvt_term::im_cb),
		182	#endif
		183	#ifndef NO_BELL
		184	bell_ev (this, &rxvt_term::bell_cb),
174	#endif	185	#endif
175	termwin_ev (this, &rxvt_term::x_cb),	186	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	187	vt_ev (this, &rxvt_term::x_cb),
177	child_ev (this, &rxvt_term::child_cb),	188	child_ev (this, &rxvt_term::child_cb),
178	check_ev (this, &rxvt_term::check_cb),	189	check_ev (this, &rxvt_term::check_cb),
…		…
195	void rxvt_term::emergency_cleanup ()	206	void rxvt_term::emergency_cleanup ()
196	{	207	{
197	if (cmd_pid)	208	if (cmd_pid)
198	kill (-cmd_pid, SIGHUP);	209	kill (-cmd_pid, SIGHUP);
199		210
		211	pty_ev.stop ();
200	delete pty; pty = 0;	212	delete pty; pty = 0;
201	}	213	}
202		214
203	rxvt_term::~rxvt_term ()	215	rxvt_term::~rxvt_term ()
204	{	216	{
…		…
213	#endif	225	#endif
214	delete fontset[0];	226	delete fontset[0];
215		227
216	if (display)	228	if (display)
217	{	229	{
218	dDisp;
219
220	selection_clear ();	230	selection_clear ();
221		231
222	#ifdef USE_XIM	232	#ifdef USE_XIM
223	im_destroy ();	233	im_destroy ();
224	#endif	234	#endif
225	#ifdef XTERM_SCROLLBAR	235	#ifdef XTERM_SCROLLBAR
226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	236	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227	if (ShadowGC) XFreeGC (disp, ShadowGC);	237	if (ShadowGC) XFreeGC (dpy, ShadowGC);
228	#endif	238	#endif
229	#ifdef PLAIN_SCROLLBAR	239	#ifdef PLAIN_SCROLLBAR
230	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	240	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231	#endif	241	#endif
232	#ifdef NEXT_SCROLLBAR	242	#ifdef NEXT_SCROLLBAR
233	if (blackGC) XFreeGC (disp, blackGC);	243	if (blackGC) XFreeGC (dpy, blackGC);
234	if (whiteGC) XFreeGC (disp, whiteGC);	244	if (whiteGC) XFreeGC (dpy, whiteGC);
235	if (grayGC) XFreeGC (disp, grayGC);	245	if (grayGC) XFreeGC (dpy, grayGC);
236	if (darkGC) XFreeGC (disp, darkGC);	246	if (darkGC) XFreeGC (dpy, darkGC);
237	if (stippleGC) XFreeGC (disp, stippleGC);	247	if (stippleGC) XFreeGC (dpy, stippleGC);
238	if (dimple) XFreePixmap (disp, dimple);	248	if (dimple) XFreePixmap (dpy, dimple);
239	if (upArrow) XFreePixmap (disp, upArrow);	249	if (upArrow) XFreePixmap (dpy, upArrow);
240	if (downArrow) XFreePixmap (disp, downArrow);	250	if (downArrow) XFreePixmap (dpy, downArrow);
241	if (upArrowHi) XFreePixmap (disp, upArrowHi);	251	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242	if (downArrowHi) XFreePixmap (disp, downArrowHi);	252	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243	#endif	253	#endif
244	#ifdef RXVT_SCROLLBAR	254	#ifdef RXVT_SCROLLBAR
245	if (topShadowGC) XFreeGC (disp, topShadowGC);	255	if (topShadowGC) XFreeGC (dpy, topShadowGC);
246	if (botShadowGC) XFreeGC (disp, botShadowGC);	256	if (botShadowGC) XFreeGC (dpy, botShadowGC);
247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	257	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248	#endif	258	#endif
249	if (gc) XFreeGC (disp, gc);	259	if (gc) XFreeGC (dpy, gc);
250		260
251	delete drawable;	261	delete drawable;
252	// destroy all windows	262	// destroy all windows
253	if (parent[0])	263	if (parent[0])
254	XDestroyWindow (disp, parent[0]);	264	XDestroyWindow (dpy, parent[0]);
255	}
256		265
257	// TODO: free pixcolours, colours should become part of rxvt_display	266	for (int i = 0; i < TOTAL_COLORS; i++)
258	delete pix_colors_focused;	267	if (ISSET_PIXCOLOR (i))
		268	{
		269	pix_colors_focused [i].free (this);
259	#if OFF_FOCUS_FADING	270	#if OFF_FOCUS_FADING
		271	pix_colors_unfocused [i].free (this);
		272	#endif
		273	}
		274
		275	clear ();
		276	}
		277
		278	delete [] pix_colors_focused;
		279	#if OFF_FOCUS_FADING
260	delete pix_colors_unfocused;	280	delete [] pix_colors_unfocused;
261	#endif	281	#endif
262		282
263	displays.put (display);	283	displays.put (display);
264		284
265	scr_release ();	285	scr_release ();
…		…
268	for (int i = 0; i < allocated.size (); i++)	288	for (int i = 0; i < allocated.size (); i++)
269	free (allocated [i]);	289	free (allocated [i]);
270		290
271	free (selection.text);	291	free (selection.text);
272	// TODO: manage env vars in child only(!)	292	// TODO: manage env vars in child only(!)
273	free (env_windowid);
274	free (env_display);	293	free (env_display);
275	free (env_term);	294	free (env_term);
276	free (env_colorfgbg);
277	free (locale);	295	free (locale);
278	free (v_buffer);	296	free (v_buffer);
279	free (incr_buf);	297	free (incr_buf);
280		298
281	delete envv;	299	delete envv;
…		…
292	{	310	{
293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294		312
295	cmd_pid = 0;	313	cmd_pid = 0;
296		314
297	if (!OPTION (Opt_hold))	315	if (!option (Opt_hold))
298	destroy ();	316	destroy ();
299	}	317	}
300		318
301	void	319	void
302	rxvt_term::destroy ()	320	rxvt_term::destroy ()
303	{	321	{
304	if (destroy_ev.active)	322	if (destroy_ev.active)
305	return;	323	return;
306		324
307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))	325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308	return;
309		326
310	#if ENABLE_OVERLAY	327	#if ENABLE_OVERLAY
311	scr_overlay_off ();	328	scr_overlay_off ();
312	#endif	329	#endif
313		330
…		…
317	im_ev.stop (display);	334	im_ev.stop (display);
318	#endif	335	#endif
319	#if HAVE_SCROLLBARS	336	#if HAVE_SCROLLBARS
320	scrollbar_ev.stop (display);	337	scrollbar_ev.stop (display);
321	#endif	338	#endif
322	#if TRANSPARENT	339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
323	rootwin_ev.stop (display);	340	rootwin_ev.stop (display);
324	#endif	341	#endif
325	incr_ev.stop ();	342	incr_ev.stop ();
326	termwin_ev.stop (display);	343	termwin_ev.stop (display);
327	vt_ev.stop (display);	344	vt_ev.stop (display);
…		…
368	{	385	{
369	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	386	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370	(*t)->emergency_cleanup ();	387	(*t)->emergency_cleanup ();
371	}	388	}
372		389
373	#if ENABLE_FRILLS	390	#if !ENABLE_MINIMAL
374	static void	391	static void
375	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
376	{	393	{
377	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
378	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
…		…
426	GET_R->allowedxerror = event->error_code;	443	GET_R->allowedxerror = event->error_code;
427	else	444	else
428	{	445	{
429	// GET_R is most likely not the terminal which caused the error,	446	// GET_R is most likely not the terminal which caused the error,
430	// so just output the error and continue	447	// so just output the error and continue
431	#if ENABLE_FRILLS	448	#if ENABLE_MINIMAL
		449	old_xerror_handler (display, event);
		450	#else
432	print_x_error (display, event);	451	print_x_error (display, event);
433	#else
434	old_xerror_handler (display, event);
435	#endif	452	#endif
436	}	453	}
437		454
438	return 0;	455	return 0;
439	}	456	}
…		…
447	_exit (EXIT_FAILURE);	464	_exit (EXIT_FAILURE);
448	}	465	}
449		466
450	/----------------------------------------------------------------------/	467	/----------------------------------------------------------------------/
451	bool	468	bool
452	rxvt_term::init (int argc, const char const argv)	469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
453	{	470	{
		471	this->envv = envv;
		472
454	SET_R (this);	473	SET_R (this);
455	set_locale ("");	474	set_locale ("");
456	set_environ (envv); // few things in X do not call setlocale :(	475	set_environ (envv); // few things in X do not call setlocale :(
457		476
458	if (!init_vars ())	477	if (!init_vars ())
…		…
464		483
465	#ifdef KEYSYM_RESOURCE	484	#ifdef KEYSYM_RESOURCE
466	keyboard->register_done ();	485	keyboard->register_done ();
467	#endif	486	#endif
468		487
		488	#ifdef HAVE_SCROLLBARS
		489	if (option (Opt_scrollBar))
		490	scrollBar.setIdle (); /* set existence for size calculations */
		491	#endif
		492
		493	pty = ptytty::create ();
		494
		495	create_windows (argc, argv);
		496
		497	init_xlocale ();
		498
		499	scr_reset (); // initialize screen
		500
		501	#if 0
		502	XSynchronize (dpy, True);
		503	#endif
		504
		505	#ifdef HAVE_SCROLLBARS
		506	if (option (Opt_scrollBar))
		507	resize_scrollbar (); /* create and map scrollbar */
		508	#endif
		509	#ifdef HAVE_BG_PIXMAP
		510	{
		511	bgPixmap.set_target (this);
		512
		513	#ifdef ENABLE_TRANSPARENCY
		514	if (option (Opt_transparent))
		515	{
		516	bgPixmap.set_transparent ();
		517	#ifdef HAVE_AFTERIMAGE
		518	if (rs [Rs_blurradius])
		519	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
		520	#endif
		521	if (ISSET_PIXCOLOR (Color_tint))
		522	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		523	if (rs [Rs_shade])
		524	bgPixmap.set_shade (rs [Rs_shade]);
		525
		526	bgPixmap.set_root_pixmap ();
		527	XSelectInput (dpy, display->root, PropertyChangeMask);
		528	rootwin_ev.start (display, display->root);
		529	}
		530	#endif
		531
		532	#ifdef XPM_BACKGROUND
		533	if (rs[Rs_backgroundPixmap] != NULL)
		534	{
		535	const char *p = rs[Rs_backgroundPixmap];
		536
		537	if ((p = strchr (p, ';')) != NULL)
		538	{
		539	p++;
		540	bgPixmap.set_geometry (p);
		541	}
		542	else
		543	bgPixmap.set_defaultGeometry ();
		544
		545	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		546	if (!option (Opt_transparent))
		547	update_background ();
		548	}
		549	#endif
		550	}
		551	#endif
		552
469	#if ENABLE_PERL	553	#if ENABLE_PERL
470	if (!rs[Rs_perl_ext_1])
471	rs[Rs_perl_ext_1] = "default";
472
473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476	{
477	rxvt_perl.init (this);
478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479	}
480	#endif
481
482	#ifdef HAVE_SCROLLBARS
483	if (OPTION (Opt_scrollBar))
484	scrollBar.setIdle (); /* set existence for size calculations */
485	#endif
486
487	pty = rxvt_new_ptytty ();
488
489	create_windows (argc, argv);
490
491	dDisp;
492
493	init_xlocale ();
494
495	scr_reset (); // initialize screen
496
497	#if 0
498	XSynchronize (disp, True);
499	#endif
500
501	#ifdef HAVE_SCROLLBARS
502	if (OPTION (Opt_scrollBar))
503	resize_scrollbar (); /* create and map scrollbar */
504	#endif
505	#ifdef TRANSPARENT
506	if (OPTION (Opt_transparent))
507	{
508	XSelectInput (disp, display->root, PropertyChangeMask);
509	check_our_parents ();
510	rootwin_ev.start (display, display->root);	554	rootwin_ev.start (display, display->root);
511	}
512	#endif	555	#endif
513		556
514	set_colorfgbg ();	557	set_colorfgbg ();
515		558
516	init_command (cmd_argv);	559	init_command (cmd_argv);
…		…
522		565
523	check_ev.start ();	566	check_ev.start ();
524		567
525	HOOK_INVOKE ((this, HOOK_START, DT_END));	568	HOOK_INVOKE ((this, HOOK_START, DT_END));
526		569
		570	#if ENABLE_XEMBED
		571	if (rs[Rs_embed])
		572	{
		573	long info[2] = { 0, XEMBED_MAPPED };
		574
		575	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		576	32, PropModeReplace, (unsigned char *)&info, 2);
		577	}
		578	#endif
		579
527	XMapWindow (disp, vt);	580	XMapWindow (dpy, vt);
528	XMapWindow (disp, parent[0]);	581	XMapWindow (dpy, parent[0]);
529		582
530	return true;	583	return true;
531	}	584	}
532		585
533	static struct sig_handlers	586	static struct sig_handlers
…		…
538	* Catch a fatal signal and tidy up before quitting	591	* Catch a fatal signal and tidy up before quitting
539	*/	592	*/
540	void	593	void
541	sig_term (sig_watcher &w)	594	sig_term (sig_watcher &w)
542	{	595	{
543	#ifdef DEBUG_CMD
544	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545	#endif
546	rxvt_emergency_cleanup ();	596	rxvt_emergency_cleanup ();
547	signal (w.signum, SIG_DFL);	597	signal (w.signum, SIG_DFL);
548	kill (getpid (), w.signum);	598	kill (getpid (), w.signum);
549	}	599	}
550		600
…		…
558	char **rxvt_environ; // startup environment	608	char **rxvt_environ; // startup environment
559		609
560	void	610	void
561	rxvt_init ()	611	rxvt_init ()
562	{	612	{
563	uid_t uid = getuid ();	613	ptytty::init ();
564	gid_t gid = getgid ();
565
566	// before doing anything else, check for setuid/setgid operation,
567	// start the helper process and drop privileges
568	if (uid != geteuid ()
569	\|\| gid != getegid ())
570	{
571	#if PTYTTY_HELPER
572	rxvt_ptytty_server ();
573	#else
574	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575	#endif
576
577	// drop privileges
578	#if HAVE_SETRESUID
579	setresgid (gid, gid, gid);
580	setresuid (uid, uid, uid);
581	#elif HAVE_SETREUID
582	setregid (gid, gid);
583	setreuid (uid, uid);
584	#elif HAVE_SETUID
585	setgid (gid);
586	setuid (uid);
587	#endif
588
589	if (uid != geteuid ()
590	\|\| gid != getegid ())
591	rxvt_fatal ("unable to drop privileges, aborting.\n");
592	}
593		614
594	rxvt_environ = environ;	615	rxvt_environ = environ;
595		616
596	signal (SIGHUP, SIG_IGN);	617	signal (SIGHUP, SIG_IGN);
597	signal (SIGPIPE, SIG_IGN);	618	signal (SIGPIPE, SIG_IGN);
…		…
645	return p;	666	return p;
646	}	667	}
647		668
648	/----------------------------------------------------------------------/	669	/----------------------------------------------------------------------/
649	/*	670	/*
650	* window size/position calculcations for XSizeHint and other storage.	671	* window size/position calculations for XSizeHint and other storage.
651	* if width/height are non-zero then override calculated width/height	672	* if width/height are non-zero then override calculated width/height
652	*/	673	*/
653	void	674	void
654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	675	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
655	{	676	{
656	short recalc_x, recalc_y;	677	short recalc_x, recalc_y;
657	int x, y, sb_w, flags;	678	int x, y, sb_w, flags;
658	unsigned int w, h;	679	unsigned int w, h;
659	unsigned int max_width, max_height;	680	unsigned int max_width, max_height;
660	dDisp;
661
662	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663	ncol, nrow, szHint.width, szHint.height));
664		681
665	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	682	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
666	szHint.win_gravity = NorthWestGravity;	683	szHint.win_gravity = NorthWestGravity;
667	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	684	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668		685
…		…
730		747
731	if (scrollBar.state)	748	if (scrollBar.state)
732	{	749	{
733	sb_w = scrollbar_TotalWidth ();	750	sb_w = scrollbar_TotalWidth ();
734	szHint.base_width += sb_w;	751	szHint.base_width += sb_w;
		752
735	if (!OPTION (Opt_scrollBar_right))	753	if (!option (Opt_scrollBar_right))
736	window_vt_x += sb_w;	754	window_vt_x += sb_w;
737	}	755	}
738		756
739	szHint.width_inc = fwidth;	757	szHint.width_inc = fwidth;
740	szHint.height_inc = fheight;	758	szHint.height_inc = fheight;
741	szHint.min_width = szHint.base_width + szHint.width_inc;	759	szHint.min_width = szHint.base_width + szHint.width_inc;
742	szHint.min_height = szHint.base_height + szHint.height_inc;	760	szHint.min_height = szHint.base_height + szHint.height_inc;
743		761
744	if (newwidth && newwidth - szHint.base_width < max_width)	762	if (newwidth && newwidth - szHint.base_width < max_width)
745	{	763	{
746	szHint.width = newwidth;	764	szHint.width = newwidth;
…		…
761	{	779	{
762	min_it (height, max_height);	780	min_it (height, max_height);
763	szHint.height = szHint.base_height + height;	781	szHint.height = szHint.base_height + height;
764	}	782	}
765		783
766	if (scrollBar.state && OPTION (Opt_scrollBar_right))	784	if (scrollBar.state && option (Opt_scrollBar_right))
767	window_sb_x = szHint.width - sb_w;	785	window_sb_x = szHint.width - sb_w;
768		786
769	if (recalc_x)	787	if (recalc_x)
770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	788	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		789
771	if (recalc_y)	790	if (recalc_y)
772	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	791	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
773		792
774	ncol = width / fwidth;	793	ncol = width / fwidth;
775	nrow = height / fheight;	794	nrow = height / fheight;
776	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777	ncol, nrow, szHint.width,
778	szHint.height));
779	return;
780	}	795	}
781		796
782	/----------------------------------------------------------------------/	797	/----------------------------------------------------------------------/
783	/*	798	/*
784	* Tell the teletype handler what size the window is.	799	* Tell the teletype handler what size the window is.
…		…
836	delete fontset[0];	851	delete fontset[0];
837	fontset[0] = fs;	852	fontset[0] = fs;
838		853
839	prop = (*fs)[1]->properties ();	854	prop = (*fs)[1]->properties ();
840	prop.height += lineSpace;	855	prop.height += lineSpace;
		856
841	fs->set_prop (prop);	857	fs->set_prop (prop, false);
842		858
843	fwidth = prop.width;	859	fwidth = prop.width;
844	fheight = prop.height;	860	fheight = prop.height;
845	fbase = prop.ascent;	861	fbase = prop.ascent;
846		862
…		…
855	{	871	{
856	fontset[style] = fs = new rxvt_fontset (this);	872	fontset[style] = fs = new rxvt_fontset (this);
857	rxvt_fontprop prop2 = prop;	873	rxvt_fontprop prop2 = prop;
858		874
859	if (res)	875	if (res)
860	prop2.weight = prop2.slant = rxvt_fontprop::unset;	876	{
		877	fs->populate (res);
		878	fs->set_prop (prop2, false);
		879	}
861	else	880	else
862	{	881	{
863	res = fontset[0]->fontdesc;	882	fs->populate (fontset[0]->fontdesc);
864		883
865	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	884	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
866	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	885	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		886
		887	fs->set_prop (prop2, true);
867	}	888	}
868		889
869	fs->populate (res);
870	fs->set_prop (prop2);
871	}	890	}
872	#else	891	#else
873	fontset[style] = fontset[0];	892	fontset[style] = fontset[0];
874	#endif	893	#endif
875	}	894	}
…		…
884	return true;	903	return true;
885	}	904	}
886		905
887	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	906	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
888	{	907	{
889	XChangeProperty (display->display, parent[0],	908	XChangeProperty (dpy, parent[0],
890	prop, XA_STRING, 8, PropModeReplace,	909	prop, XA_STRING, 8, PropModeReplace,
891	(const unsigned char *)str, len >= 0 ? len : strlen (str));	910	(const unsigned char *)str, len >= 0 ? len : strlen (str));
892	}	911	}
893		912
894	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	913	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
895	{	914	{
896	wchar_t *ws = rxvt_mbstowcs (str, len);	915	wchar_t *ws = rxvt_mbstowcs (str, len);
897	char *s = rxvt_wcstoutf8 (ws);	916	char *s = rxvt_wcstoutf8 (ws);
898		917
899	XChangeProperty (display->display, parent[0],	918	XChangeProperty (dpy, parent[0],
900	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	919	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901	(const unsigned char *)s, strlen (s));	920	(const unsigned char *)s, strlen (s));
902		921
903	free (s);	922	free (s);
904	free (ws);	923	free (ws);
…		…
929	void	948	void
930	rxvt_term::set_window_color (int idx, const char *color)	949	rxvt_term::set_window_color (int idx, const char *color)
931	{	950	{
932	rxvt_color xcol;	951	rxvt_color xcol;
933	int i;	952	int i;
934		953
935	if (color == NULL \|\| *color == '\0')	954	if (color == NULL \|\| *color == '\0')
936	return;	955	return;
		956
		957	color = strdup (color);
		958	allocated.push_back ((void *)color);
		959	rs[Rs_color + idx] = color;
937		960
938	/* handle color aliases */	961	/* handle color aliases */
939	if (isdigit (*color))	962	if (isdigit (*color))
940	{	963	{
941	i = atoi (color);	964	i = atoi (color);
942		965
943	if (i >= 8 && i <= 15)	966	if (i >= 8 && i <= 15)
944	{ /* bright colors */	967	{ /* bright colors */
945	i -= 8;	968	i -= 8;
946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	969	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
947	SET_PIXCOLOR (idx);
948	goto done;	970	goto done;
949	}	971	}
950		972
951	if (i >= 0 && i <= 7)	973	if (i >= 0 && i <= 7)
952	{ /* normal colors */	974	{ /* normal colors */
953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	975	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954	SET_PIXCOLOR (idx);
955	goto done;	976	goto done;
956	}	977	}
957	}	978	}
958		979
959	if (!rXParseAllocColor (&xcol, color))	980	set_color (xcol, color);
960	return;
961
962	/* XStoreColor (display->display, display->cmap, XColor); /
963		981
964	/*	982	/*
965	* FIXME: should free colors here, but no idea how to do it so instead,	983	* FIXME: should free colors here, but no idea how to do it so instead,
966	* so just keep gobbling up the colormap	984	* so just keep gobbling up the colormap
967	*/	985	*/
968	# if 0
969	for (i = Color_Black; i <= Color_White; i++)
970	if (pix_colors[idx] == pix_colors[i])
971	break;
972	if (i > Color_White)
973	{
974	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976	DisplayPlanes (display->display, display->screen));
977	}
978	# endif
979		986
980	pix_colors_focused[idx] = xcol;	987	pix_colors_focused[idx] = xcol;
981	SET_PIXCOLOR (idx);
982		988
983	/* XSetWindowAttributes attr; */	989	/* XSetWindowAttributes attr; */
984	/* Cursor cursor; */	990	/* Cursor cursor; */
985	done:	991	done:
986
987	#if OFF_FOCUS_FADING
988	if (rs[Rs_fade])
989	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
990	#endif
991
992	/TODO: handle Color_BD, scrollbar background, etc. /	992	/TODO: handle Color_BD, scrollbar background, etc. /
993		993
		994	update_fade_color (idx);
994	recolour_cursor ();	995	recolour_cursor ();
995	scr_recolour ();	996	scr_recolour ();
996	}	997	}
997		998
998	#else	999	#else
…		…
1000	#endif /* XTERM_COLOR_CHANGE */	1001	#endif /* XTERM_COLOR_CHANGE */
1001		1002
1002	void	1003	void
1003	rxvt_term::recolour_cursor ()	1004	rxvt_term::recolour_cursor ()
1004	{	1005	{
1005	XColor xcol[2];	1006	XColor fg, bg;
1006		1007
1007	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	1008	(ISSET_PIXCOLOR (Color_pointer_fg)
1008	? pix_colors_focused[Color_pointer_fg]	1009	? pix_colors_focused[Color_pointer_fg]
1009	: pix_colors_focused[Color_fg];	1010	: pix_colors_focused[Color_fg]).get (fg);
		1011
1010	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	1012	(ISSET_PIXCOLOR (Color_pointer_bg)
1011	? pix_colors_focused[Color_pointer_bg]	1013	? pix_colors_focused[Color_pointer_bg]
1012	: pix_colors_focused[Color_bg];	1014	: pix_colors_focused[Color_bg]).get (bg);
1013		1015
1014	XQueryColors (display->display, display->cmap, xcol, 2);	1016	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1015	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016	}	1017	}
1017		1018
1018	/----------------------------------------------------------------------/	1019	/----------------------------------------------------------------------/
1019	/*	1020	/*
1020	* find if fg/bg matches any of the normal (low-intensity) colors	1021	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1024	{	1025	{
1025	unsigned int i;	1026	unsigned int i;
1026	const char *xpmb = "\0";	1027	const char *xpmb = "\0";
1027	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1028	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028		1029
1029	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030	strcpy (fstr, "default");	1030	strcpy (fstr, "default");
1031	strcpy (bstr, "default");	1031	strcpy (bstr, "default");
1032	for (i = Color_Black; i <= Color_White; i++)	1032	for (i = Color_Black; i <= Color_White; i++)
1033	if (pix_colors[Color_fg] == pix_colors[i])	1033	if (pix_colors[Color_fg] == pix_colors[i])
1034	{	1034	{
…		…
1049	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1049	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050	}	1050	}
1051		1051
1052	/----------------------------------------------------------------------/	1052	/----------------------------------------------------------------------/
1053		1053
1054	int	1054	bool
1055	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1055	rxvt_term::set_color (rxvt_color &color, const char *name)
1056	{	1056	{
1057	if (!screen_in_out->set (display, colour))	1057	if (color.set (this, name))
1058	{
1059	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060	return false;
1061	}
1062
1063	return true;	1058	return true;
		1059
		1060	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1061	return false;
		1062	}
		1063
		1064	void
		1065	rxvt_term::alias_color (int dst, int src)
		1066	{
		1067	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1064	}	1068	}
1065		1069
1066	/* -------------------------------------------------------------------- *	1070	/* -------------------------------------------------------------------- *
1067	* - WINDOW RESIZING - *	1071	* - WINDOW RESIZING - *
1068	* -------------------------------------------------------------------- */	1072	* -------------------------------------------------------------------- */
1069	void	1073	void
1070	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1074	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071	{	1075	{
1072	int fix_screen;	1076	int fix_screen;
1073	int old_width = szHint.width, old_height = szHint.height;	1077	int old_width = szHint.width;
1074	dDisp;	1078	int old_height = szHint.height;
1075		1079
1076	window_calc (newwidth, newheight);	1080	window_calc (newwidth, newheight);
		1081
		1082	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1077	XSetWMNormalHints (disp, parent[0], &szHint);	1083	XSetWMNormalHints (dpy, parent[0], &szHint);
1078		1084
1079	if (!ignoreparent)	1085	if (!ignoreparent)
1080	{	1086	{
1081	#ifdef SMART_RESIZE	1087	#ifdef SMART_RESIZE
1082	/*	1088	/*
…		…
1086	int x, y, x1, y1;	1092	int x, y, x1, y1;
1087	int dx, dy;	1093	int dx, dy;
1088	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1094	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089	Window unused_cr;	1095	Window unused_cr;
1090		1096
1091	XTranslateCoordinates (disp, parent[0], display->root,	1097	XTranslateCoordinates (dpy, parent[0], display->root,
1092	0, 0, &x, &y, &unused_cr);	1098	0, 0, &x, &y, &unused_cr);
1093	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1099	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1094	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1100	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095	/*	1101	/*
1096	* if display->root isn't the parent window, a WM will probably have offset	1102	* if display->root isn't the parent window, a WM will probably have offset
1097	* our position for handles and decorations. Counter it	1103	* our position for handles and decorations. Counter it
1098	*/	1104	*/
…		…
1100	{	1106	{
1101	x -= x1;	1107	x -= x1;
1102	y -= y1;	1108	y -= y1;
1103	}	1109	}
1104		1110
1105	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1111	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1106	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1112	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1107	dx = old_width - szHint.width;	1113	dx = old_width - szHint.width;
1108	dy = old_height - szHint.height;	1114	dy = old_height - szHint.height;
1109		1115
1110	/* Check position of the center of the window */	1116	/* Check position of the center of the window */
1111	if (x < x1) /* left half */	1117	if (x < x1) /* left half */
1112	dx = 0;	1118	dx = 0;
…		…
1115	if (y < y1) /* top half */	1121	if (y < y1) /* top half */
1116	dy = 0;	1122	dy = 0;
1117	else if (y == y1) /* exact center */	1123	else if (y == y1) /* exact center */
1118	dy /= 2;	1124	dy /= 2;
1119		1125
1120	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1126	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1121	szHint.width, szHint.height);	1127	szHint.width, szHint.height);
1122	#else	1128	#else
1123	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1129	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1124	#endif	1130	#endif
1125	}	1131	}
1126		1132
1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1133	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1128		1134
1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1135	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1130	{	1136	{
1131	if (scrollBar.state)	1137	if (scrollBar.state)
1132	{	1138	{
1133	XMoveResizeWindow (disp, scrollBar.win,	1139	XMoveResizeWindow (dpy, scrollBar.win,
1134	window_sb_x, 0,	1140	window_sb_x, 0,
1135	scrollbar_TotalWidth (), szHint.height);	1141	scrollbar_TotalWidth (), szHint.height);
1136	resize_scrollbar ();	1142	resize_scrollbar ();
1137	}	1143	}
1138		1144
1139	XMoveResizeWindow (disp, vt,	1145	XMoveResizeWindow (dpy, vt,
1140	window_vt_x, window_vt_y,	1146	window_vt_x, window_vt_y,
1141	width, height);	1147	width, height);
1142		1148
		1149	#ifdef HAVE_BG_PIXMAP
		1150	if (bgPixmap.window_size_sensitive ())
		1151	update_background ();
		1152	#endif
		1153
1143	scr_clear ();	1154	scr_clear ();
1144	#ifdef XPM_BACKGROUND
1145	resize_pixmap ();
1146	#endif
1147	}	1155	}
1148		1156
1149	if (fix_screen \|\| old_height == 0)	1157	if (fix_screen \|\| old_height == 0)
1150	{
1151	int curr_screen = -1;
1152	int old_ncol = prev_ncol;
1153
1154	/* scr_reset only works on the primary screen */
1155	if (old_height) /* this is not the first time through */
1156	{
1157	unsigned int ocol = ncol;
1158	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159	curr_screen = scr_change_screen (PRIMARY);
1160	ncol = ocol;
1161	}
1162
1163	scr_reset ();	1158	scr_reset ();
1164		1159
1165	if (curr_screen >= 0) /* this is not the first time through */	1160	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166	{	1161	//scr_touch (false);
1167	scr_change_screen (curr_screen);
1168	selection_check (old_ncol != ncol ? 4 : 0);
1169	}
1170	}
1171		1162
1172	old_width = szHint.width;	1163	#ifdef HAVE_BG_PIXMAP
1173	old_height = szHint.height;	1164	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174		1165	// if (bgPixmap.pixmap)
1175	#ifdef XPM_BACKGROUND
1176	if (pixmap)
1177	scr_touch (false);	1166	// scr_touch (false);
1178	#endif	1167	#endif
1179		1168
1180	#ifdef USE_XIM	1169	#ifdef USE_XIM
1181	IMSetStatusPosition ();	1170	IMSetPosition ();
1182	#endif	1171	#endif
1183	}	1172	}
1184		1173
1185	/*	1174	/*
1186	* Set the width/height of the vt window in characters. Units are pixels.	1175	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1191	{	1180	{
1192	XWindowAttributes wattr;	1181	XWindowAttributes wattr;
1193		1182
1194	if (newwidth == 0 \|\| newheight == 0)	1183	if (newwidth == 0 \|\| newheight == 0)
1195	{	1184	{
1196	XGetWindowAttributes (display->display, display->root, &wattr);	1185	XGetWindowAttributes (dpy, display->root, &wattr);
1197		1186
1198	if (newwidth == 0)	1187	if (newwidth == 0)
1199	newwidth = wattr.width - szHint.base_width;	1188	newwidth = wattr.width - szHint.base_width;
1200	if (newheight == 0)	1189	if (newheight == 0)
1201	newheight = wattr.height - szHint.base_height;	1190	newheight = wattr.height - szHint.base_height;
…		…
1215	#ifdef USE_XIM	1204	#ifdef USE_XIM
1216		1205
1217	void	1206	void
1218	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1207	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219	{	1208	{
1220	fg = pix_colors[Color_fg];	1209	fg = pix_colors [Color_fg];
1221	bg = pix_colors[Color_bg];	1210	bg = pix_colors [Color_bg];
1222	}	1211	}
1223		1212
1224	void	1213	void
1225	rxvt_term::im_set_size (XRectangle &size)	1214	rxvt_term::im_set_size (XRectangle &size)
1226	{	1215	{
…		…
1263	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1252	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264		1253
1265	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1254	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266	*p = '\0';	1255	*p = '\0';
1267		1256
1268	atom = XInternAtom (display->display, server, False);	1257	atom = XInternAtom (dpy, server, False);
1269	win = XGetSelectionOwner (display->display, atom);	1258	win = XGetSelectionOwner (dpy, atom);
1270		1259
1271	if (win != None)	1260	if (win != None)
1272	return True;	1261	return True;
1273	}	1262	}
1274		1263
…		…
1281	XPoint nspot;	1270	XPoint nspot;
1282	XVaNestedList preedit_attr;	1271	XVaNestedList preedit_attr;
1283		1272
1284	if (!Input_Context	1273	if (!Input_Context
1285	\|\| !focus	1274	\|\| !focus
1286	\|\| !(input_style & XIMPreeditPosition))	1275	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1287	return;	1276	return;
1288		1277
1289	im_set_position (nspot);	1278	im_set_position (nspot);
1290		1279
1291	if (nspot.x == spot.x && nspot.y == spot.y)	1280	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1310	input_method = 0;	1299	input_method = 0;
1311	}	1300	}
1312		1301
1313	Input_Context = 0;	1302	Input_Context = 0;
1314	}	1303	}
		1304
		1305	#ifdef ENABLE_XIM_ONTHESPOT
		1306
		1307	static void
		1308	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1309	{
		1310	((rxvt_term *)client_data)->make_current ();
		1311	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1312	}
		1313
		1314	static void
		1315	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1316	{
		1317	((rxvt_term *)client_data)->make_current ();
		1318	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1319	}
		1320
		1321	static void
		1322	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1323	{
		1324	rxvt_term term = (rxvt_term )client_data;
		1325	XIMText *text = call_data->text;
		1326
		1327	term->make_current ();
		1328
		1329	if (text)
		1330	{
		1331	void *str;
		1332
		1333	if (!text->encoding_is_wchar && text->string.multi_byte)
		1334	{
		1335	// of course, X makes it ugly again
		1336	if (term->rs[Rs_imLocale])
		1337	SET_LOCALE (term->rs[Rs_imLocale]);
		1338
		1339	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1340	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1341
		1342	if (term->rs[Rs_imLocale])
		1343	SET_LOCALE (term->locale);
		1344	}
		1345	else
		1346	str = (void *)text->string.wide_char;
		1347
		1348	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1349	DT_INT, call_data->caret,
		1350	DT_INT, call_data->chg_first,
		1351	DT_INT, call_data->chg_length,
		1352	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1353	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1354	DT_END));
		1355	}
		1356	else
		1357	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1358	DT_INT, call_data->caret,
		1359	DT_INT, call_data->chg_first,
		1360	DT_INT, call_data->chg_length,
		1361	DT_END));
		1362	}
		1363
		1364	#if 0
		1365	static void
		1366	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1367	{
		1368	((rxvt_term *)client_data)->make_current ();
		1369	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1370	DT_INT, call_data->position,
		1371	DT_INT, call_data->direction,
		1372	DT_INT, call_data->style,
		1373	DT_END));
		1374	}
		1375	#endif
		1376
		1377	#endif
1315		1378
1316	/*	1379	/*
1317	* Try to open a XIM with the current modifiers, then see if we can	1380	* Try to open a XIM with the current modifiers, then see if we can
1318	* open a suitable preedit type	1381	* open a suitable preedit type
1319	*/	1382	*/
…		…
1326	XRectangle rect, status_rect, needed_rect;	1389	XRectangle rect, status_rect, needed_rect;
1327	unsigned long fg, bg;	1390	unsigned long fg, bg;
1328	const char *p;	1391	const char *p;
1329	char **s;	1392	char **s;
1330	XIMStyles *xim_styles;	1393	XIMStyles *xim_styles;
		1394	#ifdef ENABLE_XIM_ONTHESPOT
		1395	XIMCallback xcb[4];
		1396	#endif
1331		1397
1332	set_environ (envv);	1398	set_environ (envv);
1333		1399
1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1400	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335	return false;	1401	return false;
1336		1402
1337	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338	input_method = display->get_xim (locale, modifiers);	1403	input_method = display->get_xim (locale, modifiers);
1339	if (input_method == NULL)	1404	if (input_method == NULL)
1340	return false;	1405	return false;
1341		1406
1342	xim = input_method->xim;	1407	xim = input_method->xim;
…		…
1362	s = rxvt_splitcommastring (p);	1427	s = rxvt_splitcommastring (p);
1363		1428
1364	for (i = found = 0; !found && s[i]; i++)	1429	for (i = found = 0; !found && s[i]; i++)
1365	{	1430	{
1366	if (!strcmp (s[i], "OverTheSpot"))	1431	if (!strcmp (s[i], "OverTheSpot"))
1367	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1432	input_style = XIMPreeditPosition \| XIMStatusNothing;
1368	else if (!strcmp (s[i], "OffTheSpot"))	1433	else if (!strcmp (s[i], "OffTheSpot"))
1369	input_style = (XIMPreeditArea \| XIMStatusArea);	1434	input_style = XIMPreeditArea \| XIMStatusArea;
1370	else if (!strcmp (s[i], "Root"))	1435	else if (!strcmp (s[i], "Root"))
1371	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1436	input_style = XIMPreeditNothing \| XIMStatusNothing;
1372	else if (!strcmp (s[i], "None"))	1437	else if (!strcmp (s[i], "None"))
1373	input_style = (XIMPreeditNone \| XIMStatusNone);	1438	input_style = XIMPreeditNone \| XIMStatusNone;
		1439	#ifdef ENABLE_XIM_ONTHESPOT
		1440	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1441	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1442	#endif
		1443	else
		1444	input_style = XIMPreeditNothing \| XIMStatusNothing;
1374		1445
1375	for (j = 0; j < xim_styles->count_styles; j++)	1446	for (j = 0; j < xim_styles->count_styles; j++)
1376	if (input_style == xim_styles->supported_styles[j])	1447	if (input_style == xim_styles->supported_styles[j])
1377	{	1448	{
1378	rxvt_freecommastring (s);	1449	rxvt_freecommastring (s);
…		…
1416	"*",	1487	"*",
1417	fheight,	1488	fheight,
1418	fheight + 1, fheight - 1,	1489	fheight + 1, fheight - 1,
1419	fheight - 2, fheight + 2);	1490	fheight - 2, fheight + 2);
1420		1491
1421	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1492	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422	&missing_charset_list, &missing_charset_count, &def_string);	1493	&missing_charset_list, &missing_charset_count, &def_string);
1423		1494
1424	if (missing_charset_list)	1495	if (missing_charset_list)
1425	XFreeStringList (missing_charset_list);	1496	XFreeStringList (missing_charset_list);
1426		1497
…		…
1467	XNBackground, bg,	1538	XNBackground, bg,
1468	XNArea, &status_rect,	1539	XNArea, &status_rect,
1469	XNFontSet, fs,	1540	XNFontSet, fs,
1470	NULL);	1541	NULL);
1471	}	1542	}
		1543	#if ENABLE_XIM_ONTHESPOT
		1544	else if (input_style & XIMPreeditCallbacks)
		1545	{
		1546	im_set_position (spot);
		1547
		1548	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1549	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1550	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1551	# if 0
		1552	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1553	# endif
		1554
		1555	preedit_attr = XVaCreateNestedList (0,
		1556	XNSpotLocation, &spot,
		1557	XNPreeditStartCallback, &xcb[0],
		1558	XNPreeditDoneCallback , &xcb[1],
		1559	XNPreeditDrawCallback , &xcb[2],
		1560	# if 0
		1561	XNPreeditCaretCallback, &xcb[3],
		1562	# endif
		1563	NULL);
		1564	}
		1565	#endif
1472		1566
1473	Input_Context = XCreateIC (xim,	1567	Input_Context = XCreateIC (xim,
1474	XNInputStyle, input_style,	1568	XNInputStyle, input_style,
1475	XNClientWindow, vt,	1569	XNClientWindow, vt,
1476	XNFocusWindow, parent[0],	1570	XNFocusWindow, parent[0],
…		…
1478	preedit_attr,	1572	preedit_attr,
1479	status_attr ? XNStatusAttributes : NULL,	1573	status_attr ? XNStatusAttributes : NULL,
1480	status_attr, NULL);	1574	status_attr, NULL);
1481		1575
1482	if (preedit_attr) XFree (preedit_attr);	1576	if (preedit_attr) XFree (preedit_attr);
1483	if (status_attr) XFree (status_attr);	1577	if (status_attr) XFree (status_attr);
1484	if (fs) XFreeFontSet (display->display, fs);	1578	if (fs) XFreeFontSet (dpy, fs);
1485		1579
1486	if (Input_Context == NULL)	1580	if (Input_Context == NULL)
1487	{	1581	{
1488	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1582	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489	im_destroy ();	1583	im_destroy ();
1490	return false;	1584	return false;
1491	}	1585	}
1492		1586
1493	if (input_style & XIMPreeditArea)	1587	#if 0
		1588	// unfortunately, only the focus window is used by XIM, hard to fix
		1589	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1590	vt_select_input ();
		1591	#endif
		1592
1494	IMSetStatusPosition ();	1593	IMSetPosition ();
1495		1594
1496	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497	return true;	1595	return true;
1498	}	1596	}
1499		1597
1500	void	1598	void
1501	rxvt_term::im_cb ()	1599	rxvt_term::im_cb ()
…		…
1507		1605
1508	make_current ();	1606	make_current ();
1509		1607
1510	im_destroy ();	1608	im_destroy ();
1511		1609
1512	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513	if (Input_Context)	1610	if (Input_Context)
1514	return;	1611	return;
1515		1612
1516	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1613	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1517	if (rs[Rs_imLocale])	1614	if (rs[Rs_imLocale])
…		…
1559	SET_LOCALE (locale);	1656	SET_LOCALE (locale);
1560	#endif	1657	#endif
1561	}	1658	}
1562		1659
1563	void	1660	void
1564	rxvt_term::IMSetStatusPosition ()	1661	rxvt_term::IMSetPosition ()
1565	{	1662	{
1566	XRectangle preedit_rect, status_rect, *needed_rect;	1663	XRectangle preedit_rect, status_rect, *needed_rect;
1567	XVaNestedList preedit_attr, status_attr;	1664	XVaNestedList preedit_attr, status_attr;
1568		1665
1569	if (!Input_Context	1666	if (!Input_Context
1570	\|\| !focus	1667	\|\| !focus
1571	\|\| !(input_style & XIMPreeditArea)	1668	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1572	\|\| !IMisRunning ())	1669	\|\| !IMisRunning ())
1573	return;	1670	return;
1574		1671
		1672	if (input_style & XIMPreeditPosition)
		1673	{
		1674	im_set_size (preedit_rect);
		1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1676
		1677	XSetICValues (Input_Context,
		1678	XNPreeditAttributes, preedit_attr, NULL);
		1679	}
		1680	else
		1681	{
1575	/* Getting the necessary width of preedit area */	1682	/* Getting the necessary width of preedit area */
1576	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1683	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1577	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1684	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1578	XFree (status_attr);	1685	XFree (status_attr);
1579		1686
1580	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1687	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1581	XFree (needed_rect);	1688	XFree (needed_rect);
1582		1689
1583	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1690	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1584	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1691	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1585		1692
1586	XSetICValues (Input_Context,	1693	XSetICValues (Input_Context,
1587	XNPreeditAttributes, preedit_attr,	1694	XNPreeditAttributes, preedit_attr,
1588	XNStatusAttributes, status_attr, NULL);	1695	XNStatusAttributes, status_attr,
		1696	NULL);
1589		1697
		1698	XFree (status_attr);
		1699	}
		1700
1590	XFree (preedit_attr);	1701	XFree (preedit_attr);
1591	XFree (status_attr);
1592	}	1702	}
1593	#endif /* USE_XIM */	1703	#endif /* USE_XIM */
1594		1704
1595	/----------------------- end-of-file (C source) -----------------------/	1705	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC vs. Revision 1.247 by ayin, Tue Aug 28 16:56:40 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.247 by ayin, Tue Aug 28 16:56:40 2007 UTC