ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.234 by root, Thu May 25 16:24:44 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
40	$TOOLTIP->update;	41	$TOOLTIP->update;
41	}	42	}
…		…
49	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
50	}	51	}
51		52
52	# class methods for events	53	# class methods for events
53	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	56	if $FOCUS;
56	}	57	}
57		58
58	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	61	if $FOCUS;
61	}	62	}
62		63
63	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	65	my ($ev) = @_;
…		…
73	check_tooltip;	74	check_tooltip;
74	}	75	}
75		76
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		78
78	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	81	}
83		82
84	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	84	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
87		86
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		88
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		90
92	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		93
97	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	96	$grab->update if $grab;
100	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		114
118	check_tooltip;	115	check_tooltip;
119	}	116	}
120		117
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	119	if $HOVER;
125	}	120	}
126		121
127	# convert position array to integers	122	# convert position array to integers
128	sub harmonize {	123	sub harmonize {
129	my ($vals) = @_;	124	my ($vals) = @_;
…		…
133	for (@$vals) {	128	for (@$vals) {
134	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
135	$rem += $_ - $i;	130	$rem += $_ - $i;
136	$_ = $i;	131	$_ = $i;
137	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
138	}	169	}
139		170
140	#############################################################################	171	#############################################################################
141		172
142	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
160	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
162	}	193	}
163	}	194	}
164		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
165	$self	198	$self
166	}	199	}
167		200
168	sub destroy {	201	sub destroy {
169	my ($self) = @_;	202	my ($self) = @_;
…		…
172	%$self = ();	205	%$self = ();
173	}	206	}
174		207
175	sub show {	208	sub show {
176	my ($self) = @_;	209	my ($self) = @_;
177
178	return if $self->{parent};	210	return if $self->{parent};
179		211
180	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
181	}	213	}
182		214
183	sub hide {	215	sub show_centered {
184	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
185		234
186	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
188		248
189	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
190	if $self->{parent};	250	if $self->{parent};
191	}	251	}
192		252
…		…
242		302
243	sub size_allocate {	303	sub size_allocate {
244	# nothing to be done	304	# nothing to be done
245	}	305	}
246		306
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	307	sub reconfigure {
252	my ($self) = @_;	308	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		309
257	$self->check_size (1);	310	$self->check_size (1);
258	$self->update;	311	$self->update;
259	}	312	}
260		313
		314	sub children {
		315	}
		316
261	sub set_max_size {	317	sub set_max_size {
262	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
263		319
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
266	}	338	}
267		339
268	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
269	sub coord2local {	341	sub coord2local {
270	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	357	return if $FOCUS == $self;
286	return unless $self->{can_focus};	358	return unless $self->{can_focus};
287		359
288	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
289		361
290	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
291		363
292	$focus->update if $focus;	364	$focus->update if $focus;
293	$FOCUS->update;	365	$FOCUS->update;
294	}	366	}
295		367
…		…
298		370
299	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
300		372
301	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
302		374
303	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
304		376
305	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
306	}	381	}
307		382
308	sub mouse_motion { }	383	sub mouse_motion { }
309	sub button_up { }	384	sub button_up { }
310	sub key_down { }	385	sub key_down { }
311	sub key_up { }	386	sub key_up { }
312		387
313	sub button_down {	388	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
315		390
316	$self->focus_in;	391	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	426	glPushMatrix;
352	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	430	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
359	glEnd;	434	glEnd;
360	glPopMatrix;	435	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	437	}
363	}	438	}
364		439
365	sub _draw {	440	sub _draw {
366	my ($self) = @_;	441	my ($self) = @_;
…		…
386	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
387		462
388	# TODO: req_w _does_change after ->reconfigure	463	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	464	$self->check_size
390	unless exists $self->{req_w};	465	unless exists $self->{req_w};
		466
		467	$self->show;
391	}	468	}
392		469
393	sub check_size {	470	sub check_size {
394	my ($self, $forced) = @_;	471	my ($self, $forced) = @_;
395		472
…		…
408	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
409		486
410	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	488	}
412		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
413	sub emit {	496	sub emit {
414	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
415		498
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
417	}	501	}
418		502
419	sub DESTROY {	503	sub DESTROY {
420	my ($self) = @_;	504	my ($self) = @_;
421		505
		506	delete $WIDGET{$self+0};
422	#$self->deactivate;	507	#$self->deactivate;
423	}	508	}
424		509
425	#############################################################################	510	#############################################################################
426		511
…		…
435	my $class = shift;	520	my $class = shift;
436		521
437	# range [value, low, high, page]	522	# range [value, low, high, page]
438		523
439	$class->SUPER::new (	524	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
442	@_	527	@_
443	)	528	)
444	}	529	}
445		530
446	sub _draw {	531	sub _draw {
447	my ($self) = @_;	532	my ($self) = @_;
448		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
450		540
451	glEnable GL_BLEND;	541	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
454		544
455	glBegin GL_QUADS;	545	glBegin GL_QUADS;
456	glVertex 0 , 0;	546	glVertex 0 , 0;
457	glVertex 0 , $h;	547	glVertex 0 , $h;
458	glVertex $w, $h;	548	glVertex $w, $h;
459	glVertex $w, 0;	549	glVertex $w, 0;
460	glEnd;	550	glEnd;
461		551
462	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
463	}	554	}
464		555
465	#############################################################################	556	#############################################################################
466		557
467	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
654		745
655	$self->_render;	746	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	747	};
664	}	748	}
665		749
666	sub _draw {	750	sub _draw {
667	my ($self) = @_;	751	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	755	my $tex = $self->{texture}
672	or return;	756	or return;
673		757
674	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
677		761
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		763
680	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
681	}	765	}
…		…
684		768
685	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
686		770
687	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
688		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
689	sub size_request {	783	sub size_request {
690	my ($self) = @_;	784	my ($self) = @_;
691		785
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		787
695	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
696	}	789	}
697		790
698	sub size_allocate {	791	sub size_allocate {
699	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
700		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
701	$self->update;	798	$self->update;
702	}	799	}
703		800
704	sub set_offset {	801	sub set_offset {
705	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
759		856
760	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
761	vertical => 1,	858	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	860	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
765	},	862	},
766	;	863	;
767		864
768	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	867	slider => $slider,
771	@_,	868	@_,
772	);	869	);
773		870
774	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
775	$self->add ($self->{vp});	872	$self->add ($self->{vp});
776	$self->add ($self->{slider});	873	$self->add ($self->{slider});
777		874
778	$self	875	$self
		876	}
		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779	}	885	}
780		886
781	#TODO# update range on size_allocate depending on child	887	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	888	# update viewport offset on scroll
783		889
…		…
837	my $class = shift;	943	my $class = shift;
838		944
839	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
840		946
841	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
842	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
843	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
844	border => 0.6,	950	border => 0.6,
		951	is_toplevel => 1,
845	can_events => 1,	952	can_events => 1,
846	@_	953	@_
847	);	954	);
848		955
849	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
850	align => 0,	957	align => 0,
…		…
874	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
875		982
876	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
877	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
878		985
879	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
880	if $self->{title};	987	if $self->{title};
881		988
882	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
883	}	990	}
884		991
…		…
990	sub new {	1097	sub new {
991	my $class = shift;	1098	my $class = shift;
992		1099
993	$class->SUPER::new (	1100	$class->SUPER::new (
994	col_expand => [],	1101	col_expand => [],
995	@_	1102	@_,
996	)	1103	)
997	}	1104	}
998		1105
999	sub add {	1106	sub add {
1000	my ($self, $x, $y, $child) = @_;	1107	my ($self, $x, $y, $child) = @_;
…		…
1245		1352
1246	#############################################################################	1353	#############################################################################
1247		1354
1248	package CFClient::UI::Label;	1355	package CFClient::UI::Label;
1249		1356
1250	our @ISA = CFClient::UI::Base::;	1357	our @ISA = CFClient::UI::DrawBG::;
1251		1358
1252	use CFClient::OpenGL;	1359	use CFClient::OpenGL;
1253		1360
1254	sub new {	1361	sub new {
1255	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1256		1363
1257	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1258	fg => [1, 1, 1],	1365	fg => [1, 1, 1],
		1366	#bg => none
		1367	#active_bg => none
1259	#font => default_font	1368	#font => default_font
1260	#text => initial text	1369	#text => initial text
1261	#markup => initial narkup	1370	#markup => initial narkup
		1371	#max_w => maximum pixel width
		1372	ellipsise => 3, # end
1262	layout => (new CFClient::Layout),	1373	layout => (new CFClient::Layout),
1263	fontsize => 1,	1374	fontsize => 1,
1264	align => -1,	1375	align => -1,
1265	valign => -1,	1376	valign => -1,
1266	padding => 2,	1377	padding => 2,
…		…
1281	}	1392	}
1282		1393
1283	$self	1394	$self
1284	}	1395	}
1285		1396
1286	sub escape {	1397	sub escape($) {
1287	local $_ = $_[1];	1398	local $_ = $_[0];
1288		1399
1289	s/&/&amp;/g;	1400	s/&/&amp;/g;
1290	s/>/&gt;/g;	1401	s/>/&gt;/g;
1291	s/</&lt;/g;	1402	s/</&lt;/g;
1292		1403
1293	$_[1]	1404	$_
1294	}	1405	}
1295		1406
1296	sub update {	1407	sub update {
1297	my ($self) = @_;	1408	my ($self) = @_;
1298		1409
…		…
1331	sub size_request {	1442	sub size_request {
1332	my ($self) = @_;	1443	my ($self) = @_;
1333		1444
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1445	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1446	$self->{layout}->set_width ($self->{max_w} || -1);
		1447	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1448	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1449	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1450
1338	my ($w, $h) = $self->{layout}->size;	1451	my ($w, $h) = $self->{layout}->size;
1339		1452
1340	if (exists $self->{template}) {	1453	if (exists $self->{template}) {
…		…
1370	}	1483	}
1371		1484
1372	sub _draw {	1485	sub _draw {
1373	my ($self) = @_;	1486	my ($self) = @_;
1374		1487
		1488	$self->SUPER::_draw; # draw background, if applicable
		1489
1375	my $tex = $self->{texture} ||= do {	1490	my $tex = $self->{texture} ||= do {
1376	$self->{layout}->set_foreground (@{$self->{fg}});	1491	$self->{layout}->set_foreground (@{$self->{fg}});
1377	$self->{layout}->set_font ($self->{font}) if $self->{font};	1492	$self->{layout}->set_font ($self->{font}) if $self->{font};
1378	$self->{layout}->set_width ($self->{w});	1493	$self->{layout}->set_width ($self->{w});
		1494	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380		1497
1381	my $tex = new_from_layout CFClient::Texture $self->{layout};	1498	my $tex = new_from_layout CFClient::Texture $self->{layout};
1382		1499
1383	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385	: ($self->{w} - $tex->{w}) * 0.5;	1502	: ($self->{w} - $tex->{w}) * 0.5);
1386		1503
1387	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389	: ($self->{h} - $tex->{h}) * 0.5;	1506	: ($self->{h} - $tex->{h}) * 0.5);
1390		1507
1391	$tex	1508	$tex
1392	};	1509	};
1393		1510
1394	glEnable GL_TEXTURE_2D;	1511	glEnable GL_TEXTURE_2D;
…		…
1422	active_fg => [0, 0, 0],	1539	active_fg => [0, 0, 0],
1423	can_hover => 1,	1540	can_hover => 1,
1424	can_focus => 1,	1541	can_focus => 1,
1425	valign => 0,	1542	valign => 0,
1426	can_events => 1,	1543	can_events => 1,
		1544	#text => ...
1427	@_	1545	@_
1428	)	1546	)
1429	}	1547	}
1430		1548
1431	sub _set_text {	1549	sub _set_text {
…		…
1441	$self->{text} = $text;	1559	$self->{text} = $text;
1442		1560
1443	$text =~ s/./*/g if $self->{hidden};	1561	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1562	$self->{layout}->set_text ("$text ");
1445		1563
1446	$self->emit (changed => $self->{text});	1564	$self->_emit (changed => $self->{text});
1447	}	1565	}
1448		1566
1449	sub set_text {	1567	sub set_text {
1450	my ($self, $text) = @_;	1568	my ($self, $text) = @_;
1451		1569
1452	$self->{cursor} = length $text;	1570	$self->{cursor} = length $text;
1453	$self->_set_text ($text);	1571	$self->_set_text ($text);
		1572	$self->update;
1454	$self->check_size;	1573	$self->check_size;
1455	$self->update;
1456	}	1574	}
1457		1575
1458	sub get_text {	1576	sub get_text {
1459	$_[0]{text}	1577	$_[0]{text}
1460	}	1578	}
…		…
1463	my ($self) = @_;	1581	my ($self) = @_;
1464		1582
1465	my ($w, $h) = $self->SUPER::size_request;	1583	my ($w, $h) = $self->SUPER::size_request;
1466		1584
1467	($w + 1, $h) # add 1 for cursor	1585	($w + 1, $h) # add 1 for cursor
1468	}
1469
1470	sub size_allocate {
1471	my ($self, $w, $h) = @_;
1472
1473	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474	}	1586	}
1475		1587
1476	sub key_down {	1588	sub key_down {
1477	my ($self, $ev) = @_;	1589	my ($self, $ev) = @_;
1478		1590
…		…
1480	my $sym = $ev->{sym};	1592	my $sym = $ev->{sym};
1481	my $uni = $ev->{unicode};	1593	my $uni = $ev->{unicode};
1482		1594
1483	my $text = $self->get_text;	1595	my $text = $self->get_text;
1484		1596
1485	if ($sym == 8) {	1597	if ($uni == 8) {
1486	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1598	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1487	} elsif ($sym == 127) {	1599	} elsif ($uni == 127) {
1488	substr $text, $self->{cursor}, 1, "";	1600	substr $text, $self->{cursor}, 1, "";
1489	} elsif ($sym == CFClient::SDLK_LEFT) {	1601	} elsif ($sym == CFClient::SDLK_LEFT) {
1490	--$self->{cursor} if $self->{cursor};	1602	--$self->{cursor} if $self->{cursor};
1491	} elsif ($sym == CFClient::SDLK_RIGHT) {	1603	} elsif ($sym == CFClient::SDLK_RIGHT) {
1492	++$self->{cursor} if $self->{cursor} < length $self->{text};	1604	++$self->{cursor} if $self->{cursor} < length $self->{text};
1493	} elsif ($sym == CFClient::SDLK_HOME) {	1605	} elsif ($sym == CFClient::SDLK_HOME) {
1494	$self->{cursor} = 0;	1606	$self->{cursor} = 0;
1495	} elsif ($sym == CFClient::SDLK_END) {	1607	} elsif ($sym == CFClient::SDLK_END) {
1496	$self->{cursor} = length $text;	1608	$self->{cursor} = length $text;
1497	} elsif ($sym == 27) {	1609	} elsif ($uni == 27) {
1498	$self->emit ('escape');	1610	$self->_emit ('escape');
1499	} elsif ($uni) {	1611	} elsif ($uni) {
1500	substr $text, $self->{cursor}++, 0, chr $uni;	1612	substr $text, $self->{cursor}++, 0, chr $uni;
1501	}	1613	}
1502		1614
1503	$self->_set_text ($text);	1615	$self->_set_text ($text);
1504	$self->update;	1616	$self->update;
		1617	$self->check_size;
1505	}	1618	}
1506		1619
1507	sub focus_in {	1620	sub focus_in {
1508	my ($self) = @_;	1621	my ($self) = @_;
1509		1622
…		…
1589	if ($sym == 13) {	1702	if ($sym == 13) {
1590	unshift @{$self->{history}},	1703	unshift @{$self->{history}},
1591	my $txt = $self->get_text;	1704	my $txt = $self->get_text;
1592	$self->{history_pointer} = -1;	1705	$self->{history_pointer} = -1;
1593	$self->{history_saveback} = '';	1706	$self->{history_saveback} = '';
1594	$self->emit (activate => $txt);	1707	$self->_emit (activate => $txt);
1595	$self->update;	1708	$self->update;
1596		1709
1597	} elsif ($sym == CFClient::SDLK_UP) {	1710	} elsif ($sym == CFClient::SDLK_UP) {
1598	if ($self->{history_pointer} < 0) {	1711	if ($self->{history_pointer} < 0) {
1599	$self->{history_saveback} = $self->get_text;	1712	$self->{history_saveback} = $self->get_text;
…		…
1638	my $class = shift;	1751	my $class = shift;
1639		1752
1640	$class->SUPER::new (	1753	$class->SUPER::new (
1641	padding => 4,	1754	padding => 4,
1642	fg => [1, 1, 1],	1755	fg => [1, 1, 1],
1643	bg => [1, 1, 1, 0.2],
1644	active_fg => [0, 0, 1],	1756	active_fg => [0, 0, 1],
1645	can_hover => 1,	1757	can_hover => 1,
1646	align => 0,	1758	align => 0,
1647	valign => 0,	1759	valign => 0,
1648	can_events => 1,	1760	can_events => 1,
1649	@_	1761	@_
1650	)	1762	)
1651	}	1763	}
1652		1764
		1765	sub activate { }
		1766
1653	sub button_up {	1767	sub button_up {
1654	my ($self, $ev, $x, $y) = @_;	1768	my ($self, $ev, $x, $y) = @_;
1655		1769
		1770	$self->emit ("activate")
1656	if ($x >= 0 && $x < $self->{w}	1771	if $x >= 0 && $x < $self->{w}
1657	&& $y >= 0 && $y < $self->{h}) {	1772	&& $y >= 0 && $y < $self->{h};
1658	$self->emit ("activate");
1659	}
1660	}	1773	}
1661		1774
1662	sub _draw {	1775	sub _draw {
1663	my ($self) = @_;	1776	my ($self) = @_;
1664		1777
…		…
1696		1809
1697	$class->SUPER::new (	1810	$class->SUPER::new (
1698	padding => 2,	1811	padding => 2,
1699	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1813	active_fg => [1, 1, 0],
		1814	bg => [0, 0, 0, 0.2],
		1815	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1816	state => 0,
1702	can_hover => 1,	1817	can_hover => 1,
1703	@_	1818	@_
1704	)	1819	)
1705	}	1820	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1829	my ($self, $ev, $x, $y) = @_;
1715		1830
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1833	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1834	$self->_emit (changed => $self->{state});
1720	}	1835	}
1721	}	1836	}
1722		1837
1723	sub _draw {	1838	sub _draw {
1724	my ($self) = @_;	1839	my ($self) = @_;
…		…
1989	qw(s1_slider.png s1_slider_bg.png);	2104	qw(s1_slider.png s1_slider_bg.png);
1990		2105
1991	sub new {	2106	sub new {
1992	my $class = shift;	2107	my $class = shift;
1993		2108
1994	# range [value, low, high, page]	2109	# range [value, low, high, page, unit]
1995		2110
1996	# TODO: 0-width page	2111	# TODO: 0-width page
1997	# TODO: req_w/h are wrong with vertical	2112	# TODO: req_w/h are wrong with vertical
1998	# TODO: calculations are off	2113	# TODO: calculations are off
1999	my $self = $class->SUPER::new (	2114	my $self = $class->SUPER::new (
2000	fg => [1, 1, 1],	2115	fg => [1, 1, 1],
2001	active_fg => [0, 0, 0],	2116	active_fg => [0, 0, 0],
		2117	bg => [0, 0, 0, 0.2],
		2118	active_bg => [1, 1, 1, 0.5],
2002	range => [0, 0, 100, 10],	2119	range => [0, 0, 100, 10, 0],
2003	req_w => $::WIDTH / 80,	2120	req_w => $::WIDTH / 80,
2004	req_h => $::WIDTH / 80,	2121	req_h => $::WIDTH / 80,
2005	vertical => 0,	2122	vertical => 0,
2006	can_hover => 1,	2123	can_hover => 1,
2007	inner_pad => 5,	2124	inner_pad => 0.02,
2008	@_	2125	@_
2009	);	2126	);
2010		2127
		2128	$self->set_value ($self->{range}[0]);
		2129	$self->update;
		2130
2011	$self	2131	$self
		2132	}
		2133
		2134	sub set_range {
		2135	my ($self, $range) = @_;
		2136
		2137	$self->{range} = $range;
		2138
		2139	$self->update;
		2140	}
		2141
		2142	sub set_value {
		2143	my ($self, $value) = @_;
		2144
		2145	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2146
		2147	$hi = $lo + 1 if $hi <= $lo;
		2148
		2149	$page = $hi - $lo if $page > $hi - $lo;
		2150
		2151	$value = $lo if $value < $lo;
		2152	$value = $hi - $page if $value > $hi - $page;
		2153
		2154	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2155	if $unit;
		2156
		2157	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2158
		2159	if ($value != $old_value) {
		2160	$self->_emit (changed => $value);
		2161	$self->update;
		2162	}
2012	}	2163	}
2013		2164
2014	sub size_request {	2165	sub size_request {
2015	my ($self) = @_;	2166	my ($self) = @_;
2016		2167
…		…
2022		2173
2023	sub button_down {	2174	sub button_down {
2024	my ($self, $ev, $x, $y) = @_;	2175	my ($self, $ev, $x, $y) = @_;
2025		2176
2026	$self->SUPER::button_down ($ev, $x, $y);	2177	$self->SUPER::button_down ($ev, $x, $y);
		2178
		2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2180
2027	$self->mouse_motion ($ev, $x, $y);	2181	$self->mouse_motion ($ev, $x, $y);
2028	}	2182	}
2029		2183
2030	sub mouse_motion {	2184	sub mouse_motion {
2031	my ($self, $ev, $x, $y) = @_;	2185	my ($self, $ev, $x, $y) = @_;
2032		2186
2033	if ($GRAB == $self) {	2187	if ($GRAB == $self) {
		2188	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2189
		2190	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2191
		2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2193
		2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2195	}
		2196	}
		2197
		2198	sub update {
		2199	my ($self) = @_;
		2200
		2201	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2202	$self->set_value ($self->{range}[0]);
		2203
2034	my ($value, $lo, $hi, $page) = @{$self->{range}};	2204	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2205	my $range = ($hi - $page - $lo) || 1e-100;
2035		2206
2036	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2207	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037		2208
2038	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2209	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2210	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040		2211
2041	$x -= $inner_pad_px; # substract the padding	2212	$value = ($value - $lo) / $range;
2042	$x = $x * ($hi - $lo) / $inner_w + $lo;	2213	$value = $value * $self->{scale} + $self->{offset};
2043	$x = $lo if $x < $lo;
2044	$x = $hi - $page if $x > $hi - $page;
2045	$self->{range}[0] = $x;
2046		2214
2047	$self->emit (changed => $x);	2215	$self->{knob_x} = $value - $knob_w * 0.5;
2048	$self->update;	2216	$self->{knob_w} = $knob_w;
2049	}	2217	});
2050	}
2051		2218
2052	# the inner_* stuff is for generating a padding for the slider handle,	2219	$self->SUPER::update;
2053	# so that the handle doesn't leave the texture. This calculation isn't 100%
2054	# correct propably, but it does the job for now
2055	sub _calc_inner_pad_px {
2056	my ($self, $w) = @_;
2057	($w / 100) * $self->{inner_pad} # % to pixels
2058	}	2220	}
2059		2221
2060	sub _draw {	2222	sub _draw {
2061	my ($self) = @_;	2223	my ($self) = @_;
2062		2224
2063	$self->SUPER::_draw ();	2225	$self->SUPER::_draw ();
2064		2226
2065	my ($w, $h) = @$self{qw(w h)};	2227	glScale $self->{w}, $self->{h};
2066		2228
2067	if ($self->{vertical}) {	2229	if ($self->{vertical}) {
2068	# draw a vertical slider like a rotated horizontal slider	2230	# draw a vertical slider like a rotated horizontal slider
2069		2231
		2232	glTranslate 1, 0, 0;
2070	glRotate 90, 0, 0, 1;	2233	glRotate 90, 0, 0, 1;
2071	glTranslate 0, -$self->{w}, 0;
2072
2073	($w, $h) = ($h, $w);
2074	}	2234	}
2075		2235
2076	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2236	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2237	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078		2238
2079	my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081	$hi = $value + 1 if $lo == $hi;
2082
2083	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086	$page = int $page * $inner_w / ($hi - $lo);
2087	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089	$w -= $page;
2090	$page &= ~1;
2091	glTranslate $page * 0.5, 0, 0;
2092	$page ||= 2;
2093
2094	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097	glEnable GL_TEXTURE_2D;	2239	glEnable GL_TEXTURE_2D;
2098	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099		2241
2100	# draw background	2242	# draw background
2101	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2243	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102		2244
2103	# draw handle	2245	# draw handle
2104	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2246	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105		2247
2106	glDisable GL_TEXTURE_2D;	2248	glDisable GL_TEXTURE_2D;
2107	}	2249	}
		2250
		2251	#############################################################################
		2252
		2253	package CFClient::UI::ValSlider;
		2254
		2255	our @ISA = CFClient::UI::HBox::;
		2256
		2257	sub new {
		2258	my ($class, %arg) = @_;
		2259
		2260	my $range = delete $arg{range};
		2261
		2262	my $self = $class->SUPER::new (
		2263	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2264	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2265	to_value => sub { shift },
		2266	from_value => sub { shift },
		2267	%arg,
		2268	);
		2269
		2270	$self->{slider}->connect (changed => sub {
		2271	my ($self, $value) = @_;
		2272	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2273	$self->{parent}->emit (changed => $value);
		2274	});
		2275
		2276	# $self->{entry}->connect (changed => sub {
		2277	# my ($self, $value) = @_;
		2278	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2279	# $self->{parent}->emit (changed => $value);
		2280	# });
		2281
		2282	$self->add ($self->{slider}, $self->{entry});
		2283
		2284	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2285
		2286	$self
		2287	}
		2288
		2289	sub set_range { shift->{slider}->set_range (@_) }
		2290	sub set_value { shift->{slider}->set_value (@_) }
2108		2291
2109	#############################################################################	2292	#############################################################################
2110		2293
2111	package CFClient::UI::TextView;	2294	package CFClient::UI::TextView;
2112		2295
…		…
2142		2325
2143	$self->{fontsize} = $fontsize;	2326	$self->{fontsize} = $fontsize;
2144	$self->reflow;	2327	$self->reflow;
2145	}	2328	}
2146		2329
2147	sub text_height {
2148	my ($self, $text) = @_;
2149
2150	my $layout = $self->{layout};
2151
2152	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153	$layout->set_width ($self->{children}[0]{w});
2154	$layout->set_markup ($text);
2155
2156	($layout->size)[1]
2157	}
2158
2159	sub reflow {
2160	my ($self) = @_;
2161
2162	$self->{need_reflow}++;
2163	$self->update;
2164	}
2165
2166	sub size_allocate {	2330	sub size_allocate {
2167	my ($self, $w, $h) = @_;	2331	my ($self, $w, $h) = @_;
2168		2332
2169	$self->SUPER::size_allocate ($w, $h);	2333	$self->SUPER::size_allocate ($w, $h);
2170		2334
…		…
2173	$self->{layout}->set_width ($self->{children}[0]{w});	2337	$self->{layout}->set_width ($self->{children}[0]{w});
2174		2338
2175	$self->reflow;	2339	$self->reflow;
2176	}	2340	}
2177		2341
		2342	sub text_size {
		2343	my ($self, $text, $indent) = @_;
		2344
		2345	my $layout = $self->{layout};
		2346
		2347	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2348	$layout->set_width ($self->{children}[0]{w} - $indent);
		2349	$layout->set_markup ($text);
		2350
		2351	$layout->size
		2352	}
		2353
		2354	sub reflow {
		2355	my ($self) = @_;
		2356
		2357	$self->{need_reflow}++;
		2358	$self->update;
		2359	}
		2360
		2361	sub set_offset {
		2362	my ($self, $offset) = @_;
		2363
		2364	# todo: base offset on lines or so, not on pixels
		2365	$self->{children}[1]->set_value ($offset);
		2366	}
		2367
		2368	sub clear {
		2369	my ($self) = @_;
		2370
		2371	$self->{par} = [];
		2372	$self->{height} = 0;
		2373	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2374	}
		2375
2178	sub add_paragraph {	2376	sub add_paragraph {
2179	my ($self, $color, $text) = @_;	2377	my ($self, $color, $text, $indent) = @_;
2180		2378
2181	#TODO: intelligently "reformat" paragraph	2379	for my $line (split /\n/, $text) {
2182		2380	my ($w, $h) = $self->text_size ($line);
2183	my $height = $self->text_height ($text);
2184
2185	$self->{height} += $height;	2381	$self->{height} += $h;
		2382	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2383	}
2186		2384
2187	push @{$self->{par}}, [$height, $color, $text];
2188
2189	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2385	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190	$self->{children}[1]->update;
2191	}	2386	}
2192		2387
2193	sub update {	2388	sub update {
2194	my ($self) = @_;	2389	my ($self) = @_;
2195		2390
…		…
2198	return unless $self->{h} > 0;	2393	return unless $self->{h} > 0;
2199		2394
2200	delete $self->{texture};	2395	delete $self->{texture};
2201		2396
2202	$ROOT->on_post_alloc ($self, sub {	2397	$ROOT->on_post_alloc ($self, sub {
		2398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2399
2203	if (delete $self->{need_reflow}) {	2400	if (delete $self->{need_reflow}) {
2204	my $height = 0;	2401	my $height = 0;
2205		2402
2206	$height += $_->[0] = $self->text_height ($_->[2])	2403	my $layout = $self->{layout};
		2404
		2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2406
2207	for @{$self->{par}};	2407	for (@{$self->{par}}) {
		2408	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2409	$layout->set_width ($W - $_->[3]);
		2410	$layout->set_markup ($_->[4]);
		2411	my ($w, $h) = $layout->size;
		2412	$_->[0] = $w + $_->[3];
		2413	$_->[1] = $h;
		2414	}
		2415
		2416	$height += $_->[1];
		2417	}
2208		2418
2209	$self->{height} = $height;	2419	$self->{height} = $height;
2210		2420
2211	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2421	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212		2422
2213	delete $self->{texture};	2423	delete $self->{texture};
2214	}	2424	}
2215		2425
2216	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2426	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217	glClearColor 0, 0, 0, 0;	2427	glClearColor 0.5, 0.5, 0.5, 0;
2218	glClear GL_COLOR_BUFFER_BIT;	2428	glClear GL_COLOR_BUFFER_BIT;
2219		2429
2220	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223	my $top = int $self->{children}[1]{range}[0];	2430	my $top = int $self->{children}[1]{range}[0];
2224		2431
2225	my $y0 = $top;	2432	my $y0 = $top;
2226	my $y1 = $top + $self->{h};	2433	my $y1 = $top + $H;
2227		2434
2228	my $y = 0;	2435	my $y = 0;
2229		2436
2230	my $layout = $self->{layout};	2437	my $layout = $self->{layout};
2231		2438
2232	$layout->set_font ($self->{font}) if $self->{font};	2439	$layout->set_font ($self->{font}) if $self->{font};
2233		2440
		2441	glEnable GL_BLEND;
		2442	#TODO# not correct in windows where rgba is forced off
		2443	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2444
2234	for my $par (@{$self->{par}}) {	2445	for my $par (@{$self->{par}}) {
2235	my $h = $par->[0];	2446	my $h = $par->[1];
2236		2447
2237	if ($y0 < $y + $h && $y < $y1) {	2448	if ($y0 < $y + $h && $y < $y1) {
2238	$layout->set_foreground (@{ $par->[1] });	2449	$layout->set_foreground (@{ $par->[2] });
		2450	$layout->set_width ($W - $par->[3]);
2239	$layout->set_markup ($par->[2]);	2451	$layout->set_markup ($par->[4]);
2240		2452
2241	my ($W, $H) = $layout->size;	2453	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2454
		2455	glRasterPos $par->[3], $y - $y0;
		2456	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243	}	2457	}
2244		2458
2245	$y += $h;	2459	$y += $h;
2246	}	2460	}
2247		2461
2248	glDisable GL_TEXTURE_2D;	2462	glDisable GL_BLEND;
2249	};	2463	};
2250	});	2464	});
2251	}	2465	}
2252		2466
2253	sub _draw {	2467	sub _draw {
2254	my ($self) = @_;	2468	my ($self) = @_;
2255		2469
2256	glEnable GL_TEXTURE_2D;	2470	glEnable GL_TEXTURE_2D;
2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258	glColor 1, 1, 1, 1;	2472	glColor 1, 1, 1, 1;
2259	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2473	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260	glDisable GL_TEXTURE_2D;	2474	glDisable GL_TEXTURE_2D;
2261		2475
2262	$self->{children}[1]->draw;	2476	$self->{children}[1]->draw;
2263		2477
2264	}	2478	}
…		…
2333		2547
2334	# TODO: use animation	2548	# TODO: use animation
2335	if ($self->{state} = !$self->{state}) {	2549	if ($self->{state} = !$self->{state}) {
2336	$CFClient::UI::ROOT->add ($self->{other});	2550	$CFClient::UI::ROOT->add ($self->{other});
2337	$self->{other}->move ($self->coord2global (0, $self->{h}));	2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2338	$self->emit ("open");	2552	$self->_emit ("open");
2339	} else {	2553	} else {
2340	$CFClient::UI::ROOT->remove ($self->{other});	2554	$CFClient::UI::ROOT->remove ($self->{other});
2341	$self->emit ("close");	2555	$self->_emit ("close");
2342	}	2556	}
2343		2557
2344	$self->emit (changed => $self->{state});	2558	$self->_emit (changed => $self->{state});
2345	}	2559	}
2346		2560
2347	#############################################################################	2561	#############################################################################
2348		2562
2349	package CFClient::UI::Tooltip;	2563	package CFClient::UI::Tooltip;
…		…
2363		2577
2364	sub set_tooltip_from {	2578	sub set_tooltip_from {
2365	my ($self, $widget) = @_;	2579	my ($self, $widget) = @_;
2366		2580
2367	$self->add (new CFClient::UI::Label	2581	$self->add (new CFClient::UI::Label
2368	markup => $widget->{tooltip},	2582	markup => $widget->{tooltip},
2369	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370	fontsize => 0.8,	2584	fontsize => 0.8,
2371	fg => [0, 0, 0, 1],	2585	fg => [0, 0, 0, 1],
		2586	ellipsise => 0,
2372	font => ($widget->{tooltip_font} || $::FONT_PROP),	2587	font => ($widget->{tooltip_font} || $::FONT_PROP),
2373	);	2588	);
2374	}	2589	}
2375		2590
2376	sub size_request {	2591	sub size_request {
2377	my ($self) = @_;	2592	my ($self) = @_;
…		…
2423	use CFClient::OpenGL;	2638	use CFClient::OpenGL;
2424		2639
2425	sub new {	2640	sub new {
2426	my $class = shift;	2641	my $class = shift;
2427		2642
2428	$class->SUPER::new (	2643	my $self = $class->SUPER::new (
2429	aspect => 1,	2644	aspect => 1,
		2645	can_events => 0,
2430	@_,	2646	@_,
2431	)	2647	);
		2648
		2649	if ($self->{anim} && $self->{animspeed}) {
		2650	Scalar::Util::weaken (my $widget = $self);
		2651
		2652	$self->{timer} = Event->timer (
		2653	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2654	hard => 1,
		2655	interval => $self->{animspeed},
		2656	cb => sub {
		2657	++$widget->{frame};
		2658	$widget->update;
		2659	},
		2660	);
		2661	}
		2662
		2663	$self
2432	}	2664	}
2433		2665
2434	sub size_request {	2666	sub size_request {
2435	(32, 8)	2667	(32, 8)
2436	}	2668	}
2437		2669
		2670	sub update {
		2671	my ($self) = @_;
		2672
		2673	return unless $self->{visible};
		2674
		2675	$self->SUPER::update;
		2676	}
		2677
2438	sub _draw {	2678	sub _draw {
2439	my ($self) = @_;	2679	my ($self) = @_;
2440		2680
2441	return unless $::CONN;#d# manage and cache textures differently	2681	return unless $::CONN;
		2682
		2683	my $face;
		2684
		2685	if ($self->{frame}) {
		2686	my $anim = $::CONN->{anim}[$self->{anim}];
		2687
		2688	$face = $anim->[ $self->{frame} % @$anim ]
		2689	if $anim && @$anim;
		2690	}
		2691
2442	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2692	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443		2693
2444	# TODO animation
2445	if ($tex) {	2694	if ($tex) {
2446	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448	glColor 1, 1, 1, 1;	2697	glColor 1, 1, 1, 1;
2449	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2698	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450	glDisable GL_TEXTURE_2D;	2699	glDisable GL_TEXTURE_2D;
2451	}	2700	}
2452	}	2701	}
2453		2702
		2703	sub DESTROY {
		2704	my ($self) = @_;
		2705
		2706	$self->{timer}->cancel
		2707	if $self->{timer};
		2708
		2709	$self->SUPER::DESTROY;
		2710	}
		2711
2454	#############################################################################	2712	#############################################################################
2455		2713
2456	package CFClient::UI::InventoryItem;	2714	package CFClient::UI::InventoryItem;
2457		2715
2458	our @ISA = CFClient::UI::HBox::;	2716	our @ISA = CFClient::UI::HBox::;
…		…
2462		2720
2463	my %args = @_;	2721	my %args = @_;
2464		2722
2465	my $item = delete $args{item};	2723	my $item = delete $args{item};
2466		2724
2467	my $desc = $item->{nrof} < 2	2725	my $desc = CFClient::Item::desc_string $item;
2468	? $item->{name}
2469	: "$item->{nrof} $item->{name_pl}";
2470
2471		2726
2472	my $self = $class->SUPER::new (	2727	my $self = $class->SUPER::new (
2473	can_hover => 1,	2728	can_hover => 1,
2474	can_events => 1,	2729	can_events => 1,
2475	tooltip => (CFClient::UI::Label->escape ($desc)	2730	tooltip => ((CFClient::UI::Label::escape $desc)
2476	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2731	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2477	connect_button_down => sub {	2732	connect_button_down => sub {
2478	my ($self, $ev, $x, $y) = @_;	2733	my ($self, $ev, $x, $y) = @_;
2479		2734
2480	# todo: maybe put examine on 1? but should just be a tooltip :(	2735	# todo: maybe put examine on 1? but should just be a tooltip :(
		2736	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2737	my $targ = $::CONN->{player}{tag};
		2738
		2739	if ($item->{container} == $::CONN->{player}{tag}) {
		2740	$targ = $main::OPENCONT;
		2741	}
		2742
		2743	$::CONN->send ("move $targ $item->{tag} 0");
2481	if ($ev->{button} == 1) {	2744	} elsif ($ev->{button} == 1) {
2482	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2745	$::CONN->send ("examine $item->{tag}");
2483	} elsif ($ev->{button} == 2) {	2746	} elsif ($ev->{button} == 2) {
2484	$::CONN->send ("apply $item->{tag}");	2747	$::CONN->send ("apply $item->{tag}");
2485	} elsif ($ev->{button} == 3) {	2748	} elsif ($ev->{button} == 3) {
2486	CFClient::UI::Menu->new (	2749	my @menu_items = (
2487	items => [
2488	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2750	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489	[
2490	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491	sub { $::CONN->send ("lock $item->{tag}") },
2492	],
2493	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2751	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2494	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2752	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2753	(
		2754	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2755	? (
		2756	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2757	)
		2758	: (
		2759	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2495	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2760	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2761	)
2496	],	2762	),
2497	)->popup ($ev);	2763	);
		2764
		2765	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2498	}	2766	}
2499		2767
2500	1	2768	1
2501	},	2769	},
2502	%args	2770	%args
2503	);	2771	);
		2772
2504		2773
2505	$self->add (new CFClient::UI::Face	2774	$self->add (new CFClient::UI::Face
2506	can_events => 0,	2775	can_events => 0,
2507	face => $item->{face},	2776	face => $item->{face},
2508	anim => $item->{anim},	2777	anim => $item->{anim},
2509	animspeed => $item->{animspeed},	2778	animspeed => $item->{animspeed},
2510	);	2779	);
2511		2780
2512	$self->add (new CFClient::UI::Label	2781	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2513	can_events => 0,	2782
2514	text => $desc,	2783	$self->{item} = $item;
2515	);	2784
		2785	$self->update_item;
2516		2786
2517	$self	2787	$self
		2788	}
		2789
		2790	sub update_item {
		2791	my ($self) = @_;
		2792
		2793	my $desc = CFClient::Item::desc_string ($self->{item});
		2794
		2795	$self->{name_lbl}->set_text ($desc);
2518	}	2796	}
2519		2797
2520	#############################################################################	2798	#############################################################################
2521		2799
2522	package CFClient::UI::Inventory;	2800	package CFClient::UI::Inventory;
…		…
2525		2803
2526	sub new {	2804	sub new {
2527	my $class = shift;	2805	my $class = shift;
2528		2806
2529	my $self = $class->SUPER::new (	2807	my $self = $class->SUPER::new (
2530	scrolled => (new CFClient::UI::VBox),	2808	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2531	@_,	2809	@_,
2532	);	2810	);
2533		2811
2534	$self	2812	$self
2535	}	2813	}
…		…
2538	my ($self, $items) = @_;	2816	my ($self, $items) = @_;
2539		2817
2540	$self->{scrolled}->clear;	2818	$self->{scrolled}->clear;
2541	return unless $items;	2819	return unless $items;
2542		2820
2543	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2821	my @items = sort {
		2822	($a->{type} <=> $b->{type})
		2823	or ($a->{name} cmp $b->{name})
		2824	} @$items;
2544		2825
2545	$self->{real_items} = \@items;	2826	$self->{real_items} = \@items;
2546		2827
		2828	my $row = 0;
2547	for my $item (@items) {	2829	for my $item (@items) {
2548	my $desc = $item->{nrof} < 2	2830	CFClient::Item::update_widgets $item;
2549	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";
2551		2831
2552	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2832	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2833	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2834	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2835
		2836	$row++;
2553	}	2837	}
2554		2838
2555	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2839	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556	}	2840	}
2557		2841
…		…
2600		2884
2601	# popup given the event (must be a mouse button down event currently)	2885	# popup given the event (must be a mouse button down event currently)
2602	sub popup {	2886	sub popup {
2603	my ($self, $ev) = @_;	2887	my ($self, $ev) = @_;
2604		2888
2605	$self->emit ("popdown");	2889	$self->_emit ("popdown");
2606		2890
2607	# maybe save $GRAB? must be careful about events...	2891	# maybe save $GRAB? must be careful about events...
2608	$GRAB = $self;	2892	$GRAB = $self;
2609	$self->{button} = $ev->{button};	2893	$self->{button} = $ev->{button};
2610		2894
…		…
2625		2909
2626	if ($ev->{button} == $self->{button}) {	2910	if ($ev->{button} == $self->{button}) {
2627	undef $GRAB;	2911	undef $GRAB;
2628	$self->hide;	2912	$self->hide;
2629		2913
2630	$self->emit ("popdown");	2914	$self->_emit ("popdown");
2631	$self->{hover}[1]->() if $self->{hover};	2915	$self->{hover}[1]->() if $self->{hover};
2632	}	2916	}
2633	}	2917	}
2634		2918
2635	#############################################################################	2919	#############################################################################
2636		2920
2637	package CFClient::UI::Statusbox;	2921	package CFClient::UI::Statusbox;
2638		2922
2639	our @ISA = CFClient::UI::VBox::;	2923	our @ISA = CFClient::UI::VBox::;
		2924
		2925	sub new {
		2926	my $class = shift;
		2927
		2928	$class->SUPER::new (
		2929	fontsize => 0.8,
		2930	@_,
		2931	)
		2932	}
2640		2933
2641	sub reorder {	2934	sub reorder {
2642	my ($self) = @_;	2935	my ($self) = @_;
2643	my $NOW = time;	2936	my $NOW = time;
2644		2937
…		…
2663	? "<b>$item->{count} ×</b> $item->{text}"	2956	? "<b>$item->{count} ×</b> $item->{text}"
2664	: $item->{text};	2957	: $item->{text};
2665		2958
2666	for ($short) {	2959	for ($short) {
2667	s/^\s+//;	2960	s/^\s+//;
2668	s/\012.*/…/s;	2961	s/\s+/ /g;
2669	my $len = int 40 / $item->{fontsize};
2670	substr $_, $len, length, "…" if $len < length;
2671	}	2962	}
2672		2963
2673	new CFClient::UI::Label	2964	new CFClient::UI::Label
2674	markup => $short,	2965	markup => $short,
2675	tooltip => $item->{tooltip},	2966	tooltip => $item->{tooltip},
2676	tooltip_font => $::FONT_PROP,	2967	tooltip_font => $::FONT_PROP,
2677	tooltip_width => 0.67,	2968	tooltip_width => 0.67,
2678	fontsize => $item->{fontsize},	2969	fontsize => $item->{fontsize} || $self->{fontsize},
		2970	max_w => $::WIDTH * 0.44,
2679	color => $item->{color},	2971	fg => $item->{fg},
2680	can_events => 1,	2972	can_events => 1,
2681	can_hover => 1	2973	can_hover => 1
2682	};	2974	};
2683	}	2975	}
2684		2976
…		…
2689	sub add {	2981	sub add {
2690	my ($self, $text, %arg) = @_;	2982	my ($self, $text, %arg) = @_;
2691		2983
2692	$text =~ s/^\s+//;	2984	$text =~ s/^\s+//;
2693	$text =~ s/\s+$//;	2985	$text =~ s/\s+$//;
		2986
		2987	return unless $text;
2694		2988
2695	my $timeout = time + ((delete $arg{timeout}) || 60);	2989	my $timeout = time + ((delete $arg{timeout}) || 60);
2696		2990
2697	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2991	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698		2992
…		…
2710	$self->{item}{$group} = {	3004	$self->{item}{$group} = {
2711	id => ++$self->{id},	3005	id => ++$self->{id},
2712	text => $text,	3006	text => $text,
2713	timeout => $timeout,	3007	timeout => $timeout,
2714	tooltip => $text,	3008	tooltip => $text,
2715	fontsize => 0.8,
2716	color => [0.8, 0.8, 0.8, 0.8],	3009	fg => [0.8, 0.8, 0.8, 0.8],
2717	pri => 0,	3010	pri => 0,
2718	count => 1,	3011	count => 1,
2719	%arg,	3012	%arg,
2720	};	3013	};
2721	}	3014	}
2722		3015
2723	$self->reorder;	3016	$self->reorder;
2724	}	3017	}
2725		3018
		3019	sub reconfigure {
		3020	my ($self) = @_;
		3021
		3022	delete $_->{label}
		3023	for values %{ $self->{item} || {} };
		3024
		3025	$self->reorder;
		3026	$self->SUPER::reconfigure;
		3027	}
		3028
2726	#############################################################################	3029	#############################################################################
2727		3030
2728	package CFClient::UI::Root;	3031	package CFClient::UI::Root;
2729		3032
2730	our @ISA = CFClient::UI::Container::;	3033	our @ISA = CFClient::UI::Container::;
…		…
2760	}	3063	}
2761		3064
2762	sub size_allocate {	3065	sub size_allocate {
2763	my ($self, $w, $h) = @_;	3066	my ($self, $w, $h) = @_;
2764		3067
2765	my $old_w = $self->{old_w};
2766	my $old_h = $self->{old_h};
2767
2768	if ($old_w && $old_h) {
2769	for my $child ($self->children) {
2770	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778	}
2779	}
2780
2781	for my $child ($self->children) {	3068	for my $child ($self->children) {
2782	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3069	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783		3070
		3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3072	if exists $child->{req_x};
		3073
		3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3075	if exists $child->{req_y};
		3076
2784	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3077	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2785	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3078	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3079
2786	$child->configure ($X, $Y, $W, $H);	3080	$child->configure ($X, $Y, $W, $H);
2787	}	3081	}
2788
2789	$self->{old_w} = $w;
2790	$self->{old_h} = $h;
2791	}	3082	}
2792		3083
2793	sub coord2local {	3084	sub coord2local {
2794	my ($self, $x, $y) = @_;	3085	my ($self, $x, $y) = @_;
2795		3086
…		…
2808	$self->check_size;	3099	$self->check_size;
2809	$::WANT_REFRESH++;	3100	$::WANT_REFRESH++;
2810	}	3101	}
2811		3102
2812	sub add {	3103	sub add {
2813	my ($self, $child) = @_;	3104	my ($self, @children) = @_;
2814		3105
		3106	for (my @widgets = @children; my $w = pop @widgets; ) {
		3107	push @widgets, $w->children;
		3108	$w->{root} = $self;
		3109	$w->{visible} = 1;
		3110	}
		3111
		3112	for my $child (@children) {
		3113	$child->{is_toplevel} = 1;
		3114
2815	# integerise window positions	3115	# integerise window positions
2816	$child->{x} = int $child->{x};	3116	$child->{x} = int $child->{x};
2817	$child->{y} = int $child->{y};	3117	$child->{y} = int $child->{y};
		3118	}
2818		3119
2819	$self->SUPER::add ($child);	3120	$self->SUPER::add (@children);
		3121	}
		3122
		3123	sub remove {
		3124	my ($self, @children) = @_;
		3125
		3126	$self->SUPER::remove (@children);
		3127
		3128	while (@children) {
		3129	my $w = pop @children;
		3130	push @children, $w->children;
		3131	$w->set_invisible;
		3132	}
2820	}	3133	}
2821		3134
2822	sub on_refresh {	3135	sub on_refresh {
2823	my ($self, $id, $cb) = @_;	3136	my ($self, $id, $cb) = @_;
2824		3137
…		…
2877	$w = 0 if $w < 0;	3190	$w = 0 if $w < 0;
2878	$h = 0 if $h < 0;	3191	$h = 0 if $h < 0;
2879		3192
2880	$widget->{w} = $w;	3193	$widget->{w} = $w;
2881	$widget->{h} = $h;	3194	$widget->{h} = $h;
2882	$widget->size_allocate ($w, $h);
2883	$widget->emit (size_allocate => $w, $h);	3195	$widget->emit (size_allocate => $w, $h);
2884	}	3196	}
2885	}	3197	}
2886		3198
2887	while ($self->{post_alloc_hook}) {	3199	while ($self->{post_alloc_hook}) {
…		…
2893	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3205	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894	glClear GL_COLOR_BUFFER_BIT;	3206	glClear GL_COLOR_BUFFER_BIT;
2895		3207
2896	glMatrixMode GL_PROJECTION;	3208	glMatrixMode GL_PROJECTION;
2897	glLoadIdentity;	3209	glLoadIdentity;
2898	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3210	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899	glMatrixMode GL_MODELVIEW;	3211	glMatrixMode GL_MODELVIEW;
2900	glLoadIdentity;	3212	glLoadIdentity;
2901		3213
2902	$self->_draw;	3214	$self->_draw;
2903	}	3215	}
…		…
2905	#############################################################################	3217	#############################################################################
2906		3218
2907	package CFClient::UI;	3219	package CFClient::UI;
2908		3220
2909	$ROOT = new CFClient::UI::Root;	3221	$ROOT = new CFClient::UI::Root;
2910	$TOOLTIP = new CFClient::UI::Tooltip;	3222	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911		3223
2912	1	3224	1
2913		3225

Diff Legend

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