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.211 by elmex, Wed May 17 10:33:03 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	183	}
156
157	$widget->reconfigure;
158	}	184	}
		185
		186	reconfigure_widgets;
159	}	187	}
160		188
161	#############################################################################	189	#############################################################################
162		190
163	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
176	can_events => 1,	204	can_events => 1,
177	@_	205	@_
178	}, $class;	206	}, $class;
179		207
180	for (keys %$self) {	208	for (keys %$self) {
181	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
183	}	211	}
184	}	212	}
185		213
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
188	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
189	}	234	}
190		235
191	sub destroy {	236	sub destroy {
192	my ($self) = @_;	237	my ($self) = @_;
193		238
…		…
201	return if $self->{parent};	246	return if $self->{parent};
202		247
203	$CFClient::UI::ROOT->add ($self);	248	$CFClient::UI::ROOT->add ($self);
204	}	249	}
205		250
206	sub hide {	251	sub center {
207	my ($self) = @_;	252	my ($self) = @_;
		253
		254	$CFClient::UI::ROOT->on_post_alloc (
		255	"center_$self" => sub {
		256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		257	},
		258	);
		259
		260	$self->update;
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1);
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
208		283
209	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
211		299
212	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
213	if $self->{parent};	301	if $self->{parent};
214	}	302	}
215		303
…		…
224	}	312	}
225		313
226	sub set_size {	314	sub set_size {
227	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
228		316
229	$self->{user_w} = $w;	317	$self->{def_w} = $w;
230	$self->{user_h} = $h;	318	$self->{def_h} = $h;
231		319
232	$self->check_size;	320	$self->check_size;
233	}	321	}
234		322
235	sub size_request {	323	sub size_request {
…		…
285	}	373	}
286		374
287	sub set_tooltip {	375	sub set_tooltip {
288	my ($self, $tooltip) = @_;	376	my ($self, $tooltip) = @_;
289		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
290	$self->{tooltip} = $tooltip;	383	$self->{tooltip} = $tooltip;
291		384
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	386	delete $CFClient::UI::TOOLTIP->{owner};
294	CFClient::UI::check_tooltip;	387	CFClient::UI::check_tooltip;
…		…
315	return if $FOCUS == $self;	408	return if $FOCUS == $self;
316	return unless $self->{can_focus};	409	return unless $self->{can_focus};
317		410
318	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
319		412
320	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
321		414
322	$focus->update if $focus;	415	$focus->update if $focus;
323	$FOCUS->update;	416	$FOCUS->update;
324	}	417	}
325		418
…		…
328		421
329	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
330		423
331	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
332		425
333	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
334		427
335	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
336	}	432	}
337		433
338	sub mouse_motion { }	434	sub mouse_motion { }
339	sub button_up { }	435	sub button_up { }
340	sub key_down { }	436	sub key_down { }
341	sub key_up { }	437	sub key_up { }
342		438
343	sub button_down {	439	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
345		441
346	$self->focus_in;	442	$self->focus_in;
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	477	glPushMatrix;
382	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	481	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
389	glEnd;	485	glEnd;
390	glPopMatrix;	486	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	488	}
393	}	489	}
…		…
413	sub set_parent {	509	sub set_parent {
414	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
415		511
416	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
417		513
418	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		515
419	$self->check_size	516	$self->check_size;
420	unless exists $self->{req_w};
421	}	517	}
422		518
423	sub check_size {	519	sub check_size {
424	my ($self, $forced) = @_;	520	my ($self, $forced) = @_;
425		521
…		…
438	my ($self, $signal, $cb) = @_;	534	my ($self, $signal, $cb) = @_;
439		535
440	push @{ $self->{signal_cb}{$signal} }, $cb;	536	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}	537	}
442		538
		539	sub _emit {
		540	my ($self, $signal, @args) = @_;
		541
		542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		543	}
		544
443	sub emit {	545	sub emit {
444	my ($self, $signal, @args) = @_;	546	my ($self, $signal, @args) = @_;
445		547
446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	548	$self->_emit ($signal, @args)
		549	|| $self->$signal (@args);
		550	}
		551
		552	sub visibility_change {
		553	#my ($self, $visible) = @_;
447	}	554	}
448		555
449	sub DESTROY {	556	sub DESTROY {
450	my ($self) = @_;	557	my ($self) = @_;
451		558
…		…
564	delete $child->{parent};	671	delete $child->{parent};
565	$child->hide;	672	$child->hide;
566		673
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		675
569	$self->check_size;	676	$self->check_size (1);
570	$self->update;	677	$self->update;
571	}	678	}
572		679
573	sub clear {	680	sub clear {
574	my ($self) = @_;	681	my ($self) = @_;
…		…
688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	795	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689	glClearColor 0, 0, 0, 0;	796	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	797	glClear GL_COLOR_BUFFER_BIT;
691		798
692	$self->_render;	799	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	800	};
701	}	801	}
702		802
703	sub _draw {	803	sub _draw {
704	my ($self) = @_;	804	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	808	my $tex = $self->{texture}
709	or return;	809	or return;
710		810
711	glEnable GL_TEXTURE_2D;	811	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	813	glColor 1, 1, 1, 1;
714		814
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	815	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		816
717	glDisable GL_TEXTURE_2D;	817	glDisable GL_TEXTURE_2D;
718	}	818	}
…		…
721		821
722	package CFClient::UI::ViewPort;	822	package CFClient::UI::ViewPort;
723		823
724	our @ISA = CFClient::UI::Window::;	824	our @ISA = CFClient::UI::Window::;
725		825
		826	sub new {
		827	my $class = shift;
		828
		829	$class->SUPER::new (
		830	scroll_x => 0,
		831	scroll_y => 1,
		832	@_,
		833	)
		834	}
		835
726	sub size_request {	836	sub size_request {
727	my ($self) = @_;	837	my ($self) = @_;
728		838
729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	839	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		840
732	@$self{qw(child_w child_h)}	841	$w = 10 if $self->{scroll_x};
		842	$h = 10 if $self->{scroll_y};
		843
		844	($w, $h)
733	}	845	}
734		846
735	sub size_allocate {	847	sub size_allocate {
736	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
737		849
		850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		852
		853	$self->child->configure (0, 0, $w, $h);
738	$self->update;	854	$self->update;
739	}	855	}
740		856
741	sub set_offset {	857	sub set_offset {
742	my ($self, $x, $y) = @_;	858	my ($self, $x, $y) = @_;
…		…
793	my $class = shift;	909	my $class = shift;
794		910
795	my $self;	911	my $self;
796		912
797	my $slider = new CFClient::UI::Slider	913	my $slider = new CFClient::UI::Slider
798	vertical => 1,	914	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	915	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	916	on_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	917	$self->{vp}->set_offset (0, $_[1]);
802	},	918	},
803	;	919	;
804		920
805	$self = $class->SUPER::new (	921	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	922	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	923	slider => $slider,
808	@_,	924	@_,
809	);	925	);
810		926
811	$self->{vp}->add ($self->{scrolled});	927	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	928	$self->add ($self->{vp});
813	$self->add ($self->{slider});	929	$self->add ($self->{slider});
814		930
815	$self	931	$self
		932	}
		933
		934	sub update {
		935	my ($self) = @_;
		936
		937	$self->SUPER::update;
		938
		939	# todo: overwrite size_allocate of child
		940	my $child = $self->{vp}->child;
		941	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		942	}
		943
		944	sub size_allocate {
		945	my ($self, $w, $h) = @_;
		946
		947	$self->SUPER::size_allocate ($w, $h);
		948
		949	my $child = $self->{vp}->child;
		950	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816	}	951	}
817		952
818	#TODO# update range on size_allocate depending on child	953	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	954	# update viewport offset on scroll
820		955
…		…
871	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1006	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872		1007
873	sub new {	1008	sub new {
874	my $class = shift;	1009	my $class = shift;
875		1010
876	# TODO: user_x, user_y, overwrite moveto?
877
878	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
881	border => 0.6,	1014	border => 0.6,
882	toplevel => 1,	1015	is_toplevel => 1,
883	can_events => 1,	1016	can_events => 1,
884	@_	1017	@_
885	);	1018	);
886		1019
887	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	1021	align => 0,
…		…
941	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
942		1075
943	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
944	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
945		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
949	$self->check_size;	1084	$self->check_size;
950	};	1085	};
951		1086
952	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
953	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
956	$self->{motion} = sub {	1091	$self->{motion} = sub {
957	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
958		1093
959	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
960		1095
961	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098
		1099	$self->move ($self->{user_x}, $self->{user_y});
962	$self->update;	1100	$self->update;
963	};	1101	};
964	}	1102	}
965	}	1103	}
966		1104
…		…
1028	sub new {	1166	sub new {
1029	my $class = shift;	1167	my $class = shift;
1030		1168
1031	$class->SUPER::new (	1169	$class->SUPER::new (
1032	col_expand => [],	1170	col_expand => [],
1033	@_	1171	@_,
1034	)	1172	)
		1173	}
		1174
		1175	sub children {
		1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1177	}
1036		1178
1037	sub add {	1179	sub add {
1038	my ($self, $x, $y, $child) = @_;	1180	my ($self, $x, $y, $child) = @_;
1039		1181
1040	$child->set_parent ($self);	1182	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1183	$self->{children}[$y][$x] = $child;
1042		1184
1043	$child->check_size;	1185	$self->check_size (1);
1044	}	1186	}
1045		1187
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1188	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1189	sub clear {
1052	my ($self) = @_;	1190	my ($self) = @_;
1053		1191
1054	my @children = $self->children;	1192	my @children = $self->children;
1055	delete $self->{children};	1193	delete $self->{children};
…		…
1057	for (@children) {	1195	for (@children) {
1058	delete $_->{parent};	1196	delete $_->{parent};
1059	$_->hide;	1197	$_->hide;
1060	}	1198	}
1061		1199
		1200	$self->check_size (1);
1062	$self->update;	1201	$self->update;
1063	}	1202	}
1064		1203
1065	sub get_wh {	1204	sub get_wh {
1066	my ($self) = @_;	1205	my ($self) = @_;
…		…
1098	sub size_allocate {	1237	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
1100		1239
1101	my ($ws, $hs) = $self->get_wh;	1240	my ($ws, $hs) = $self->get_wh;
1102		1241
1103	my $req_w = sum @$ws;	1242	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1243	my $req_h = (sum @$hs) || 1;
1105		1244
1106	# TODO: nicer code && do row_expand	1245	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1246	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1247	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1248	my $col_expand = (sum @col_expand) || 1;
…		…
1163	}	1302	}
1164	}	1303	}
1165		1304
1166	#############################################################################	1305	#############################################################################
1167		1306
1168	package CFClient::UI::HBox;	1307	package CFClient::UI::Box;
1169
1170	# TODO: wrap into common Box base class
1171		1308
1172	our @ISA = CFClient::UI::Container::;	1309	our @ISA = CFClient::UI::Container::;
1173		1310
1174	sub size_request {	1311	sub size_request {
1175	my ($self) = @_;	1312	my ($self) = @_;
1176		1313
1177	my @alloc = map [$_->size_request], @{$self->{children}};	1314	$self->{vertical}
1178		1315	? (
1179	(	1316	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1180	(List::Util::sum map $_->[0], @alloc),	1317	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181	(List::Util::max map $_->[1], @alloc),	1318	)
1182	)	1319	: (
		1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1322	)
1183	}	1323	}
1184		1324
1185	sub size_allocate {	1325	sub size_allocate {
1186	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1187		1327
1188	($h, $w) = ($w, $h);	1328	my $space = $self->{vertical} ? $h : $w;
1189
1190	my $children = $self->{children};	1329	my $children = $self->{children};
1191		1330
1192	my @h = map $_->{req_w}, @$children;	1331	my @req;
1193		1332
1194	my $req_h = List::Util::sum @h;	1333	if ($self->{homogeneous}) {
1195		1334	@req = ($space / (@$children || 1)) x @$children;
1196	if ($req_h > $h) {
1197	# ah well, not enough space
1198	$_ *= $h / $req_h for @h;
1199	} else {	1335	} else {
		1336	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1337	my $req = List::Util::sum @req;
		1338
		1339	if ($req > $space) {
		1340	# ah well, not enough space
		1341	$_ *= $space / $req for @req;
		1342	} else {
1200	my $exp = List::Util::sum map $_->{expand}, @$children;	1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201	$exp ||= 1;
1202		1344
		1345	$space = ($space - $req) / $expand; # remaining space to give away
		1346
		1347	$req[$_] += $space * $children->[$_]{expand}
1203	for (0 .. $#$children) {	1348	for 0 .. $#$children;
1204	my $child = $children->[$_];
1205
1206	my $alloc_h = $h[$_];
1207	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208	$h[$_] = $alloc_h;
1209	}	1349	}
1210	}	1350	}
1211		1351
1212	CFClient::UI::harmonize \@h;	1352	CFClient::UI::harmonize \@req;
1213		1353
1214	my $y = 0;	1354	my $pos = 0;
1215	for (0 .. $#$children) {	1355	for (0 .. $#$children) {
1216	my $child = $children->[$_];
1217	my $h = $h[$_];	1356	my $alloc = $req[$_];
1218	$child->configure ($y, 0, $h, $w);	1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219		1358
1220	$y += $h;	1359	$pos += $alloc;
1221	}	1360	}
1222		1361
1223	1	1362	1
1224	}	1363	}
1225		1364
1226	#############################################################################	1365	#############################################################################
1227		1366
		1367	package CFClient::UI::HBox;
		1368
		1369	our @ISA = CFClient::UI::Box::;
		1370
		1371	sub new {
		1372	my $class = shift;
		1373
		1374	$class->SUPER::new (
		1375	vertical => 0,
		1376	@_,
		1377	)
		1378	}
		1379
		1380	#############################################################################
		1381
1228	package CFClient::UI::VBox;	1382	package CFClient::UI::VBox;
1229		1383
1230	# TODO: wrap into common Box base class
1231
1232	our @ISA = CFClient::UI::Container::;	1384	our @ISA = CFClient::UI::Box::;
1233		1385
1234	sub size_request {	1386	sub new {
1235	my ($self) = @_;	1387	my $class = shift;
1236		1388
1237	my @alloc = map [$_->size_request], @{$self->{children}};	1389	$class->SUPER::new (
1238		1390	vertical => 1,
1239	(	1391	@_,
1240	(List::Util::max map $_->[0], @alloc),
1241	(List::Util::sum map $_->[1], @alloc),
1242	)	1392	)
1243	}
1244
1245	sub size_allocate {
1246	my ($self, $w, $h) = @_;
1247
1248	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250	my $children = $self->{children};
1251
1252	my @h = map $_->{req_h}, @$children;
1253
1254	my $req_h = List::Util::sum @h;
1255
1256	if ($req_h > $h) {
1257	# ah well, not enough space
1258	$_ *= $h / $req_h for @h;
1259	} else {
1260	my $exp = List::Util::sum map $_->{expand}, @$children;
1261	$exp ||= 1;
1262
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265
1266	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267	}
1268	}
1269
1270	CFClient::UI::harmonize \@h;
1271
1272	my $y = 0;
1273	for (0 .. $#$children) {
1274	my $child = $children->[$_];
1275	my $h = $h[$_];
1276	$child->configure (0, $y, $w, $h);
1277
1278	$y += $h;
1279	}
1280
1281	1
1282	}	1393	}
1283		1394
1284	#############################################################################	1395	#############################################################################
1285		1396
1286	package CFClient::UI::Label;	1397	package CFClient::UI::Label;
…		…
1297	#bg => none	1408	#bg => none
1298	#active_bg => none	1409	#active_bg => none
1299	#font => default_font	1410	#font => default_font
1300	#text => initial text	1411	#text => initial text
1301	#markup => initial narkup	1412	#markup => initial narkup
		1413	#max_w => maximum pixel width
		1414	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1415	layout => (new CFClient::Layout),
1303	fontsize => 1,	1416	fontsize => 1,
1304	align => -1,	1417	align => -1,
1305	valign => -1,	1418	valign => -1,
1306	padding => 2,	1419	padding => 2,
…		…
1371	sub size_request {	1484	sub size_request {
1372	my ($self) = @_;	1485	my ($self) = @_;
1373		1486
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1487	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1488	$self->{layout}->set_width ($self->{max_w} || -1);
		1489	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1490	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1491	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1492
1378	my ($w, $h) = $self->{layout}->size;	1493	my ($w, $h) = $self->{layout}->size;
1379		1494
1380	if (exists $self->{template}) {	1495	if (exists $self->{template}) {
…		…
1416		1531
1417	my $tex = $self->{texture} ||= do {	1532	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1533	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1534	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1535	$self->{layout}->set_width ($self->{w});
		1536	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1539
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1540	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1541
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1465	can_hover => 1,	1582	can_hover => 1,
1466	can_focus => 1,	1583	can_focus => 1,
1467	valign => 0,	1584	valign => 0,
1468	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1469	@_	1587	@_
1470	)	1588	)
1471	}	1589	}
1472		1590
1473	sub _set_text {	1591	sub _set_text {
…		…
1483	$self->{text} = $text;	1601	$self->{text} = $text;
1484		1602
1485	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1487		1605
1488	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1489	}	1607	}
1490		1608
1491	sub set_text {	1609	sub set_text {
1492	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1493		1611
…		…
1505	my ($self) = @_;	1623	my ($self) = @_;
1506		1624
1507	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1508		1626
1509	($w + 1, $h) # add 1 for cursor	1627	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1628	}
1517		1629
1518	sub key_down {	1630	sub key_down {
1519	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1520		1632
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1652	$self->_emit ('escape');
1541	} elsif ($uni) {	1653	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1655	}
1544		1656
1545	$self->_set_text ($text);	1657	$self->_set_text ($text);
…		…
1632	if ($sym == 13) {	1744	if ($sym == 13) {
1633	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1638	$self->update;	1750	$self->update;
1639		1751
1640	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1802	can_events => 1,
1691	@_	1803	@_
1692	)	1804	)
1693	}	1805	}
1694		1806
		1807	sub activate { }
		1808
1695	sub button_up {	1809	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1697		1811
		1812	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1815	}
1703		1816
1704	sub _draw {	1817	sub _draw {
1705	my ($self) = @_;	1818	my ($self) = @_;
1706		1819
…		…
1758	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1759		1872
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1764	}	1877	}
1765	}	1878	}
1766		1879
1767	sub _draw {	1880	sub _draw {
1768	my ($self) = @_;	1881	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2158	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2159	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2160	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2051	vertical => 0,	2164	vertical => 0,
2052	can_hover => 1,	2165	can_hover => 1,
2053	inner_pad => .05,	2166	inner_pad => 0.02,
2054	@_	2167	@_
2055	);	2168	);
2056		2169
2057	$self->set_value ($self->{range}[0]);	2170	$self->set_value ($self->{range}[0]);
2058	$self->update;	2171	$self->update;
2059		2172
2060	$self	2173	$self
2061	}	2174	}
2062		2175
		2176	sub set_range {
		2177	my ($self, $range) = @_;
		2178
		2179	($range, $self->{range}) = ($self->{range}, $range);
		2180
		2181	$self->update
		2182	if "@$range" ne "@{$self->{range}}";
		2183	}
		2184
2063	sub set_value {	2185	sub set_value {
2064	my ($self, $value) = @_;	2186	my ($self, $value) = @_;
2065		2187
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2188	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2189
2068	$hi = $lo + 1 if $hi <= $lo;	2190	$hi = $lo + 1 if $hi <= $lo;
2069		2191
		2192	$page = $hi - $lo if $page > $hi - $lo;
		2193
2070	$value = $lo if $value < $lo;	2194	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2195	$value = $hi - $page if $value > $hi - $page;
2072		2196
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2197	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2198	if $unit;
2075		2199
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2201
2080	if ($value != $old_value) {	2202	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2203	$self->_emit (changed => $value);
2082	$self->update;	2204	$self->update;
2083	}	2205	}
2084	}	2206	}
2085		2207
2086	sub size_request {	2208	sub size_request {
…		…
2094		2216
2095	sub button_down {	2217	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2097		2219
2098	$self->SUPER::button_down ($ev, $x, $y);	2220	$self->SUPER::button_down ($ev, $x, $y);
		2221
		2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2223
2099	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2100	}	2225	}
2101		2226
2102	sub mouse_motion {	2227	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2230	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2232
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2233	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2234
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2236
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2238	}
2114	}	2239	}
2115		2240
2116	sub update {	2241	sub update {
2117	my ($self) = @_;	2242	my ($self) = @_;
2118		2243
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2245	$self->set_value ($self->{range}[0]);
2121		2246
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2123		2249
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2251
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2254
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2255	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2256	$value = $value * $self->{scale} + $self->{offset};
2130		2257
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2259	$self->{knob_w} = $knob_w;
2138	});	2260	});
2139		2261
2140	$self->SUPER::update;	2262	$self->SUPER::update;
2141	}	2263	}
2142		2264
…		…
2148	glScale $self->{w}, $self->{h};	2270	glScale $self->{w}, $self->{h};
2149		2271
2150	if ($self->{vertical}) {	2272	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2273	# draw a vertical slider like a rotated horizontal slider
2152		2274
		2275	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2276	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2277	}
2156		2278
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2279	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2280	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2281
…		…
2166	# draw handle	2288	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2289	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2290
2169	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2170	}	2292	}
		2293
		2294	#############################################################################
		2295
		2296	package CFClient::UI::ValSlider;
		2297
		2298	our @ISA = CFClient::UI::HBox::;
		2299
		2300	sub new {
		2301	my ($class, %arg) = @_;
		2302
		2303	my $range = delete $arg{range};
		2304
		2305	my $self = $class->SUPER::new (
		2306	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2307	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2308	to_value => sub { shift },
		2309	from_value => sub { shift },
		2310	%arg,
		2311	);
		2312
		2313	$self->{slider}->connect (changed => sub {
		2314	my ($self, $value) = @_;
		2315	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2316	$self->{parent}->emit (changed => $value);
		2317	});
		2318
		2319	# $self->{entry}->connect (changed => sub {
		2320	# my ($self, $value) = @_;
		2321	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2322	# $self->{parent}->emit (changed => $value);
		2323	# });
		2324
		2325	$self->add ($self->{slider}, $self->{entry});
		2326
		2327	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2328
		2329	$self
		2330	}
		2331
		2332	sub set_range { shift->{slider}->set_range (@_) }
		2333	sub set_value { shift->{slider}->set_value (@_) }
2171		2334
2172	#############################################################################	2335	#############################################################################
2173		2336
2174	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2175		2338
…		…
2205		2368
2206	$self->{fontsize} = $fontsize;	2369	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2370	$self->reflow;
2208	}	2371	}
2209		2372
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2373	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2374	my ($self, $w, $h) = @_;
2231		2375
2232	$self->SUPER::size_allocate ($w, $h);	2376	$self->SUPER::size_allocate ($w, $h);
2233		2377
…		…
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2381
2238	$self->reflow;	2382	$self->reflow;
2239	}	2383	}
2240		2384
		2385	sub text_size {
		2386	my ($self, $text, $indent) = @_;
		2387
		2388	my $layout = $self->{layout};
		2389
		2390	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2391	$layout->set_width ($self->{children}[0]{w} - $indent);
		2392	$layout->set_markup ($text);
		2393
		2394	$layout->size
		2395	}
		2396
		2397	sub reflow {
		2398	my ($self) = @_;
		2399
		2400	$self->{need_reflow}++;
		2401	$self->update;
		2402	}
		2403
		2404	sub set_offset {
		2405	my ($self, $offset) = @_;
		2406
		2407	# todo: base offset on lines or so, not on pixels
		2408	$self->{children}[1]->set_value ($offset);
		2409	}
		2410
		2411	sub clear {
		2412	my ($self) = @_;
		2413
		2414	$self->{par} = [];
		2415	$self->{height} = 0;
		2416	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2417	}
		2418
2241	sub add_paragraph {	2419	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2243		2421
2244	#TODO: intelligently "reformat" paragraph	2422	for my $line (split /\n/, $text) {
2245		2423	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2424	$self->{height} += $h;
		2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2426	}
2249		2427
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2428	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2429	}
2255		2430
2256	sub update {	2431	sub update {
2257	my ($self) = @_;	2432	my ($self) = @_;
2258		2433
…		…
2261	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2262		2437
2263	delete $self->{texture};	2438	delete $self->{texture};
2264		2439
2265	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2266	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2444	my $height = 0;
2268		2445
2269	$height += $_->[0] = $self->text_height ($_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2270	for @{$self->{par}};	2450	for (@{$self->{par}}) {
		2451	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2452	$layout->set_width ($W - $_->[3]);
		2453	$layout->set_markup ($_->[4]);
		2454	my ($w, $h) = $layout->size;
		2455	$_->[0] = $w + $_->[3];
		2456	$_->[1] = $h;
		2457	}
		2458
		2459	$height += $_->[1];
		2460	}
2271		2461
2272	$self->{height} = $height;	2462	$self->{height} = $height;
2273		2463
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2465
2276	delete $self->{texture};	2466	delete $self->{texture};
2277	}	2467	}
2278		2468
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2469	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2282		2472
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2473	my $top = int $self->{children}[1]{range}[0];
2287		2474
2288	my $y0 = $top;	2475	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2290		2477
2291	my $y = 0;	2478	my $y = 0;
2292		2479
2293	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2294		2481
2295	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2296		2483
		2484	glEnable GL_BLEND;
		2485	#TODO# not correct in windows where rgba is forced off
		2486	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2487
2297	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2489	my $h = $par->[1];
2299		2490
2300	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
		2493	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2494	$layout->set_markup ($par->[4]);
2303		2495
2304	my ($W, $H) = $layout->size;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2497
		2498	glRasterPos $par->[3], $y - $y0;
		2499	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2500	}
2307		2501
2308	$y += $h;	2502	$y += $h;
2309	}	2503	}
2310		2504
2311	glDisable GL_TEXTURE_2D;	2505	glDisable GL_BLEND;
2312	};	2506	};
2313	});	2507	});
2314	}	2508	}
2315		2509
2316	sub _draw {	2510	sub _draw {
2317	my ($self) = @_;	2511	my ($self) = @_;
2318		2512
2319	glEnable GL_TEXTURE_2D;	2513	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2515	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2516	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2517	glDisable GL_TEXTURE_2D;
2324		2518
2325	$self->{children}[1]->draw;	2519	$self->{children}[1]->draw;
2326		2520
2327	}	2521	}
…		…
2376		2570
2377	sub new {	2571	sub new {
2378	my $class = shift;	2572	my $class = shift;
2379		2573
2380	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2381	state => 0,	2575	state => 0,
2382	connect_activate => \&toggle_flopper,	2576	on_activate => \&toggle_flopper,
2383	@_	2577	@_
2384	);	2578	);
2385		2579
2386	if ($self->{state}) {
2387	$self->{state} = 0;
2388	$self->toggle_flopper;
2389	}
2390
2391	$self	2580	$self
2392	}	2581	}
2393		2582
2394	sub toggle_flopper {	2583	sub toggle_flopper {
2395	my ($self) = @_;	2584	my ($self) = @_;
2396		2585
2397	# TODO: use animation	2586	$self->{other}->toggle_visibility;
2398	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");
2402	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");
2405	}
2406
2407	$self->emit (changed => $self->{state});
2408	}	2587	}
2409		2588
2410	#############################################################################	2589	#############################################################################
2411		2590
2412	package CFClient::UI::Tooltip;	2591	package CFClient::UI::Tooltip;
…		…
2426		2605
2427	sub set_tooltip_from {	2606	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2607	my ($self, $widget) = @_;
2429		2608
2430	$self->add (new CFClient::UI::Label	2609	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2610	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2612	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2613	fg => [0, 0, 0, 1],
		2614	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2615	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2616	);
2437	}	2617	}
2438		2618
2439	sub size_request {	2619	sub size_request {
2440	my ($self) = @_;	2620	my ($self) = @_;
…		…
2486	use CFClient::OpenGL;	2666	use CFClient::OpenGL;
2487		2667
2488	sub new {	2668	sub new {
2489	my $class = shift;	2669	my $class = shift;
2490		2670
2491	$class->SUPER::new (	2671	my $self = $class->SUPER::new (
2492	aspect => 1,	2672	aspect => 1,
		2673	can_events => 0,
2493	@_,	2674	@_,
2494	)	2675	);
		2676
		2677	if ($self->{anim} && $self->{animspeed}) {
		2678	Scalar::Util::weaken (my $widget = $self);
		2679
		2680	$self->{timer} = Event->timer (
		2681	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2682	hard => 1,
		2683	interval => $self->{animspeed},
		2684	cb => sub {
		2685	++$widget->{frame};
		2686	$widget->update;
		2687	},
		2688	);
		2689	}
		2690
		2691	$self
2495	}	2692	}
2496		2693
2497	sub size_request {	2694	sub size_request {
2498	(32, 8)	2695	(32, 8)
2499	}	2696	}
2500		2697
		2698	sub update {
		2699	my ($self) = @_;
		2700
		2701	return unless $self->{visible};
		2702
		2703	$self->SUPER::update;
		2704	}
		2705
2501	sub _draw {	2706	sub _draw {
2502	my ($self) = @_;	2707	my ($self) = @_;
2503		2708
2504	return unless $::CONN;#d# manage and cache textures differently	2709	return unless $::CONN;
		2710
		2711	my $face;
		2712
		2713	if ($self->{frame}) {
		2714	my $anim = $::CONN->{anim}[$self->{anim}];
		2715
		2716	$face = $anim->[ $self->{frame} % @$anim ]
		2717	if $anim && @$anim;
		2718	}
		2719
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2720	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2721
2507	# TODO animation
2508	if ($tex) {	2722	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2723	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2725	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2726	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2514	}	2728	}
2515	}	2729	}
2516		2730
2517	#############################################################################	2731	sub DESTROY {
		2732	my ($self) = @_;
2518		2733
		2734	$self->{timer}->cancel
		2735	if $self->{timer};
		2736
		2737	$self->SUPER::DESTROY;
		2738	}
		2739
		2740	#############################################################################
		2741
2519	package CFClient::UI::InventoryItem;	2742	package CFClient::UI::Inventory;
2520		2743
2521	our @ISA = CFClient::UI::HBox::;	2744	our @ISA = CFClient::UI::ScrolledWindow::;
2522		2745
2523	sub new {	2746	sub new {
2524	my $class = shift;	2747	my $class = shift;
2525		2748
2526	my %args = @_;
2527
2528	my $item = delete $args{item};
2529
2530	my $desc = $item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	my $self = $class->SUPER::new (	2749	my $self = $class->SUPER::new (
2550	can_hover => 1,	2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2551	can_events => 1,
2552	tooltip => ((CFClient::UI::Label::escape $desc)
2553	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554	connect_button_down => sub {
2555	my ($self, $ev, $x, $y) = @_;
2556
2557	# todo: maybe put examine on 1? but should just be a tooltip :(
2558	if ($ev->{button} == 1) {
2559	my $targ = $::CONN->{player}{tag};
2560
2561	if ($item->{container} == $::CONN->{player}{tag}) {
2562	$targ = $main::OPENCONT;
2563	}
2564
2565	$::CONN->send ("move $targ $item->{tag} 0");
2566	} elsif ($ev->{button} == 2) {
2567	$::CONN->send ("apply $item->{tag}");
2568	} elsif ($ev->{button} == 3) {
2569	my @menu_items = (
2570	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2572	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2573	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2574	[
2575	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2576	sub { $::CONN->send ("lock $item->{tag}") },
2577	],
2578	);
2579
2580	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2581	}
2582
2583	1
2584	},
2585	%args
2586	);
2587
2588	$self->add (new CFClient::UI::Face
2589	can_events => 0,
2590	face => $item->{face},
2591	anim => $item->{anim},
2592	animspeed => $item->{animspeed},
2593	);
2594
2595	$self->add (new CFClient::UI::Label
2596	can_events => 0,
2597	text => $desc,
2598	);
2599
2600	$self
2601	}
2602
2603	#############################################################################
2604
2605	package CFClient::UI::Inventory;
2606
2607	our @ISA = CFClient::UI::ScrolledWindow::;
2608
2609	sub new {
2610	my $class = shift;
2611
2612	my $self = $class->SUPER::new (
2613	scrolled => (new CFClient::UI::VBox),
2614	@_,	2751	@_,
2615	);	2752	);
2616		2753
2617	$self	2754	$self
2618	}	2755	}
…		…
2628	or ($a->{name} cmp $b->{name})	2765	or ($a->{name} cmp $b->{name})
2629	} @$items;	2766	} @$items;
2630		2767
2631	$self->{real_items} = \@items;	2768	$self->{real_items} = \@items;
2632		2769
		2770	my $row = 0;
2633	for my $item (@items) {	2771	for my $item (@items) {
2634	my $desc = $item->{nrof} < 2	2772	CFClient::Item::update_widgets $item;
2635	? $item->{name}
2636	: "$item->{nrof} $item->{name_pl}";
2637		2773
2638	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2639	}	2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2640		2777
2641	$self->{scrolled}->add (@items);	2778	$row++;
2642		2779	}
2643	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2644	}
2645
2646	sub size_request {
2647	my ($self) = @_;
2648	($self->{req_w}, $self->{req_h});
2649	}	2780	}
2650		2781
2651	#############################################################################	2782	#############################################################################
2652		2783
2653	package CFClient::UI::Menu;	2784	package CFClient::UI::Menu;
…		…
2688		2819
2689	# popup given the event (must be a mouse button down event currently)	2820	# popup given the event (must be a mouse button down event currently)
2690	sub popup {	2821	sub popup {
2691	my ($self, $ev) = @_;	2822	my ($self, $ev) = @_;
2692		2823
2693	$self->emit ("popdown");	2824	$self->_emit ("popdown");
2694		2825
2695	# maybe save $GRAB? must be careful about events...	2826	# maybe save $GRAB? must be careful about events...
2696	$GRAB = $self;	2827	$GRAB = $self;
2697	$self->{button} = $ev->{button};	2828	$self->{button} = $ev->{button};
2698		2829
…		…
2713		2844
2714	if ($ev->{button} == $self->{button}) {	2845	if ($ev->{button} == $self->{button}) {
2715	undef $GRAB;	2846	undef $GRAB;
2716	$self->hide;	2847	$self->hide;
2717		2848
2718	$self->emit ("popdown");	2849	$self->_emit ("popdown");
2719	$self->{hover}[1]->() if $self->{hover};	2850	$self->{hover}[1]->() if $self->{hover};
2720	}	2851	}
2721	}	2852	}
2722		2853
2723	#############################################################################	2854	#############################################################################
…		…
2758	# TODO: doesn't handle markup well (read as: at all)	2889	# TODO: doesn't handle markup well (read as: at all)
2759	my $short = $item->{count} > 1	2890	my $short = $item->{count} > 1
2760	? "<b>$item->{count} ×</b> $item->{text}"	2891	? "<b>$item->{count} ×</b> $item->{text}"
2761	: $item->{text};	2892	: $item->{text};
2762		2893
2763	my $fontsize = $item->{fontsize} || $self->{fontsize};
2764
2765	for ($short) {	2894	for ($short) {
2766	s/^\s+//;	2895	s/^\s+//;
2767	s/\s+/ /g;	2896	s/\s+/ /g;
2768	my $len = int 40 / $fontsize;
2769	substr $_, $len, length, "…" if $len < length;
2770	}	2897	}
2771		2898
2772	new CFClient::UI::Label	2899	new CFClient::UI::Label
2773	markup => $short,	2900	markup => $short,
2774	tooltip => $item->{tooltip},	2901	tooltip => $item->{tooltip},
2775	tooltip_font => $::FONT_PROP,	2902	tooltip_font => $::FONT_PROP,
2776	tooltip_width => 0.67,	2903	tooltip_width => 0.67,
2777	fontsize => $fontsize,	2904	fontsize => $item->{fontsize} || $self->{fontsize},
		2905	max_w => $::WIDTH * 0.44,
2778	fg => $item->{fg},	2906	fg => $item->{fg},
2779	can_events => 1,	2907	can_events => 1,
2780	can_hover => 1	2908	can_hover => 1
2781	};	2909	};
2782	}	2910	}
…		…
2788	sub add {	2916	sub add {
2789	my ($self, $text, %arg) = @_;	2917	my ($self, $text, %arg) = @_;
2790		2918
2791	$text =~ s/^\s+//;	2919	$text =~ s/^\s+//;
2792	$text =~ s/\s+$//;	2920	$text =~ s/\s+$//;
		2921
		2922	return unless $text;
2793		2923
2794	my $timeout = time + ((delete $arg{timeout}) || 60);	2924	my $timeout = time + ((delete $arg{timeout}) || 60);
2795		2925
2796	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2797		2927
…		…
2819	}	2949	}
2820		2950
2821	$self->reorder;	2951	$self->reorder;
2822	}	2952	}
2823		2953
		2954	sub reconfigure {
		2955	my ($self) = @_;
		2956
		2957	delete $_->{label}
		2958	for values %{ $self->{item} || {} };
		2959
		2960	$self->reorder;
		2961	$self->SUPER::reconfigure;
		2962	}
		2963
2824	#############################################################################	2964	#############################################################################
2825		2965
2826	package CFClient::UI::Root;	2966	package CFClient::UI::Root;
2827		2967
2828	our @ISA = CFClient::UI::Container::;	2968	our @ISA = CFClient::UI::Container::;
…		…
2831		2971
2832	sub new {	2972	sub new {
2833	my $class = shift;	2973	my $class = shift;
2834		2974
2835	$class->SUPER::new (	2975	$class->SUPER::new (
		2976	visible => 1,
2836	@_,	2977	@_,
2837	)	2978	)
2838	}	2979	}
2839		2980
2840	sub configure {	2981	sub configure {
…		…
2858	}	2999	}
2859		3000
2860	sub size_allocate {	3001	sub size_allocate {
2861	my ($self, $w, $h) = @_;	3002	my ($self, $w, $h) = @_;
2862		3003
2863	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2864	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2865
2866	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2867	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2868
2869	for my $child ($self->children) {	3004	for my $child ($self->children) {
2870	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2871		3006
2872	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2873	if exists $child->{req_x};	3008	if exists $child->{req_x};
2874		3009
2875	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2876	if exists $child->{req_y};	3011	if exists $child->{req_y};
2877		3012
		3013	delete @$child{qw(req_x req_y)};
		3014
2878	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3015	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2879	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2880		3017
2881	$child->configure ($X, $Y, $W, $H);	3018	$child->configure ($X, $Y, $W, $H);
2882	}	3019	}
…		…
2903		3040
2904	sub add {	3041	sub add {
2905	my ($self, @children) = @_;	3042	my ($self, @children) = @_;
2906		3043
2907	for my $child (@children) {	3044	for my $child (@children) {
2908	$child->{toplevel} = 1;	3045	$child->{is_toplevel} = 1;
2909		3046
2910	# integerise window positions	3047	# integerise window positions
2911	$child->{x} = int $child->{x};	3048	$child->{x} = int $child->{x};
2912	$child->{y} = int $child->{y};	3049	$child->{y} = int $child->{y};
2913	}	3050	}
2914		3051
2915	$self->SUPER::add (@children);	3052	$self->SUPER::add (@children);
		3053
		3054	for (my @widgets = @children; my $w = pop @widgets; ) {
		3055	push @widgets, $w->children;
		3056	$w->set_visible;
		3057	}
		3058
		3059	}
		3060
		3061	sub remove {
		3062	my ($self, @children) = @_;
		3063
		3064	$self->SUPER::remove (@children);
		3065
		3066	while (@children) {
		3067	my $w = pop @children;
		3068	push @children, $w->children;
		3069	$w->set_invisible;
		3070	}
2916	}	3071	}
2917		3072
2918	sub on_refresh {	3073	sub on_refresh {
2919	my ($self, $id, $cb) = @_;	3074	my ($self, $id, $cb) = @_;
2920		3075
…		…
2934	$_->()	3089	$_->()
2935	for values %{delete $self->{refresh_hook}};	3090	for values %{delete $self->{refresh_hook}};
2936	}	3091	}
2937		3092
2938	if ($self->{check_size}) {	3093	if ($self->{check_size}) {
2939	my @queue = ([], []);	3094	my @queue;
2940		3095
2941	for (;;) {	3096	for (;;) {
2942	if ($self->{check_size}) {	3097	if ($self->{check_size}) {
2943	# heuristic: check containers last	3098	#TODO use array-of-depth approach
2944	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3099
		3100	@queue = sort { $a->{visible} <=> $b->{visible} }
2945	for values %{delete $self->{check_size}}	3101	@queue, values %{delete $self->{check_size}};
2946	}	3102	}
2947		3103
2948	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3104	my $widget = pop @queue || last;
2949		3105
		3106	defined $widget->{visible} or last; # do not resize invisible widgets
		3107
2950	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2951	? @$widget{qw(user_w user_h)}	3109	? @$widget{qw(def_w def_h)}
2952	: $widget->size_request;	3110	: $widget->size_request;
2953		3111
2954	if (delete $widget->{force_alloc}	3112	if (delete $widget->{force_alloc}
2955	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2956	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2965	}	3123	}
2966	}	3124	}
2967	}	3125	}
2968		3126
2969	while ($self->{size_alloc}) {	3127	while ($self->{size_alloc}) {
		3128	for (
		3129	sort { $a->[0]{visible} <=> $b->[0]{visible} }
2970	for (values %{delete $self->{size_alloc}}) {	3130	values %{delete $self->{size_alloc}}
		3131	) {
2971	my ($widget, $w, $h) = @$_;	3132	my ($widget, $w, $h) = @$_;
2972		3133
2973	$w = 0 if $w < 0;	3134	$w = 0 if $w < 0;
2974	$h = 0 if $h < 0;	3135	$h = 0 if $h < 0;
2975		3136
2976	$widget->{w} = $w;	3137	$widget->{w} = $w;
2977	$widget->{h} = $h;	3138	$widget->{h} = $h;
2978	$widget->size_allocate ($w, $h);
2979	$widget->emit (size_allocate => $w, $h);	3139	$widget->emit (size_allocate => $w, $h);
2980	}	3140	}
2981	}	3141	}
2982		3142
2983	while ($self->{post_alloc_hook}) {	3143	while ($self->{post_alloc_hook}) {
…		…
2989	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3149	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2990	glClear GL_COLOR_BUFFER_BIT;	3150	glClear GL_COLOR_BUFFER_BIT;
2991		3151
2992	glMatrixMode GL_PROJECTION;	3152	glMatrixMode GL_PROJECTION;
2993	glLoadIdentity;	3153	glLoadIdentity;
2994	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3154	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2995	glMatrixMode GL_MODELVIEW;	3155	glMatrixMode GL_MODELVIEW;
2996	glLoadIdentity;	3156	glLoadIdentity;
2997		3157
2998	$self->_draw;	3158	$self->_draw;
2999	}	3159	}
…		…
3001	#############################################################################	3161	#############################################################################
3002		3162
3003	package CFClient::UI;	3163	package CFClient::UI;
3004		3164
3005	$ROOT = new CFClient::UI::Root;	3165	$ROOT = new CFClient::UI::Root;
3006	$TOOLTIP = new CFClient::UI::Tooltip;	3166	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3007		3167
3008	1	3168	1
3009		3169

Diff Legend

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