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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 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) = @_;
…		…
144		158
145	$_->update	159	$_->update
146	for @widgets;	160	for @widgets;
147	}	161	}
148		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
149	# call when resolution changes etc.	171	# call when resolution changes etc.
150	sub rescale_widgets {	172	sub rescale_widgets {
151	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
152		174
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	175	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
158	$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};
159	$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};
160	$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};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$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};
163	$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};
164	$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};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166	}	183	}
167
168	$widget->reconfigure;
169	}	184	}
		185
		186	reconfigure_widgets;
170	}	187	}
171		188
172	#############################################################################	189	#############################################################################
173		190
174	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
187	can_events => 1,	204	can_events => 1,
188	@_	205	@_
189	}, $class;	206	}, $class;
190		207
191	for (keys %$self) {	208	for (keys %$self) {
192	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
194	}	211	}
195	}	212	}
196		213
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198		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
199	$self	223	$self
200	}	224	}
201		225
202	sub destroy {	226	sub destroy {
203	my ($self) = @_;	227	my ($self) = @_;
…		…
206	%$self = ();	230	%$self = ();
207	}	231	}
208		232
209	sub show {	233	sub show {
210	my ($self) = @_;	234	my ($self) = @_;
		235
211	return if $self->{parent};	236	return if $self->{parent};
212		237
213	$CFClient::UI::ROOT->add ($self);	238	$CFClient::UI::ROOT->add ($self);
214	}	239	}
215		240
216	sub hide {	241	sub center {
217	my ($self) = @_;	242	my ($self) = @_;
		243
		244	$CFClient::UI::ROOT->on_post_alloc (
		245	"center_$self" => sub {
		246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		247	},
		248	);
		249
		250	$self->update;
		251	}
		252
		253	sub set_visible {
		254	my ($self) = @_;
		255
		256	return if $self->{visible};
		257
		258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
		260
		261	$self->emit (visibility_change => 1);
		262	}
		263
		264	sub set_invisible {
		265	my ($self) = @_;
		266
		267	return unless $self->{visible};
		268
		269	# broken show/hide model
		270
		271	delete $self->{root};
		272	delete $self->{visible};
218		273
219	undef $GRAB if $GRAB == $self;	274	undef $GRAB if $GRAB == $self;
220	undef $HOVER if $HOVER == $self;	275	undef $HOVER if $HOVER == $self;
		276
		277	CFClient::UI::check_tooltip
		278	if $CFClient::UI::TOOLTIP->{owner} == $self;
		279
		280	$self->focus_out;
		281
		282	$self->emit (visibility_change => 0);
		283	}
		284
		285	sub set_visibility {
		286	my ($self, $visible) = @_;
		287
		288	return if $self->{visible} == $visible;
		289
		290	$visible ? $self->hide
		291	: $self->show;
		292	}
		293
		294	sub toggle_visibility {
		295	my ($self) = @_;
		296
		297	$self->{visible}
		298	? $self->hide
		299	: $self->show;
		300	}
		301
		302	sub hide {
		303	my ($self) = @_;
		304
		305	$self->set_invisible;
221		306
222	$self->{parent}->remove ($self)	307	$self->{parent}->remove ($self)
223	if $self->{parent};	308	if $self->{parent};
224	}	309	}
225		310
…		…
234	}	319	}
235		320
236	sub set_size {	321	sub set_size {
237	my ($self, $w, $h) = @_;	322	my ($self, $w, $h) = @_;
238		323
239	$self->{user_w} = $w;	324	$self->{def_w} = $w;
240	$self->{user_h} = $h;	325	$self->{def_h} = $h;
241		326
242	$self->check_size;	327	$self->check_size;
243	}	328	}
244		329
245	sub size_request {	330	sub size_request {
…		…
267	$self->{y} = $y;	352	$self->{y} = $y;
268	$self->update;	353	$self->update;
269	}	354	}
270		355
271	if ($self->{w} != $w || $self->{h} != $h) {	356	if ($self->{w} != $w || $self->{h} != $h) {
272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
273	}	358	}
274	}	359	}
275		360
276	sub size_allocate {	361	sub size_allocate {
277	# nothing to be done	362	# nothing to be done
…		…
294	delete $self->{max_h}; $self->{max_h} = $h if $h;	379	delete $self->{max_h}; $self->{max_h} = $h if $h;
295	}	380	}
296		381
297	sub set_tooltip {	382	sub set_tooltip {
298	my ($self, $tooltip) = @_;	383	my ($self, $tooltip) = @_;
		384
		385	$tooltip =~ s/^\s+//;
		386	$tooltip =~ s/\s+$//;
		387
		388	return if $self->{tooltip} eq $tooltip;
299		389
300	$self->{tooltip} = $tooltip;	390	$self->{tooltip} = $tooltip;
301		391
302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	392	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303	delete $CFClient::UI::TOOLTIP->{owner};	393	delete $CFClient::UI::TOOLTIP->{owner};
…		…
325	return if $FOCUS == $self;	415	return if $FOCUS == $self;
326	return unless $self->{can_focus};	416	return unless $self->{can_focus};
327		417
328	my $focus = $FOCUS; $FOCUS = $self;	418	my $focus = $FOCUS; $FOCUS = $self;
329		419
330	$self->emit (focus_in => $focus);	420	$self->_emit (focus_in => $focus);
331		421
332	$focus->update if $focus;	422	$focus->update if $focus;
333	$FOCUS->update;	423	$FOCUS->update;
334	}	424	}
335		425
…		…
338		428
339	return unless $FOCUS == $self;	429	return unless $FOCUS == $self;
340		430
341	my $focus = $FOCUS; undef $FOCUS;	431	my $focus = $FOCUS; undef $FOCUS;
342		432
343	$self->emit (focus_out => $focus);	433	$self->_emit (focus_out => $focus);
344		434
345	$focus->update if $focus; #?	435	$focus->update if $focus; #?
		436
		437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		438	unless $FOCUS;
346	}	439	}
347		440
348	sub mouse_motion { }	441	sub mouse_motion { }
349	sub button_up { }	442	sub button_up { }
350	sub key_down { }	443	sub key_down { }
351	sub key_up { }	444	sub key_up { }
352		445
353	sub button_down {	446	sub button_down {
354	my ($self, $ev, $x, $y) = @_;	447	my ($self, $ev, $x, $y) = @_;
355		448
356	$self->focus_in;	449	$self->focus_in;
…		…
390	if ($ENV{PCLIENT_DEBUG}) {	483	if ($ENV{PCLIENT_DEBUG}) {
391	glPushMatrix;	484	glPushMatrix;
392	glColor 1, 1, 0, 1;	485	glColor 1, 1, 0, 1;
393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394	glBegin GL_LINE_LOOP;	487	glBegin GL_LINE_LOOP;
395	glVertex 0 , 0;	488	glVertex 0 , 0;
396	glVertex $self->{w}, 0;	489	glVertex $self->{w} - 1, 0;
397	glVertex $self->{w}, $self->{h};	490	glVertex $self->{w} - 1, $self->{h} - 1;
398	glVertex 0 , $self->{h};	491	glVertex 0 , $self->{h} - 1;
399	glEnd;	492	glEnd;
400	glPopMatrix;	493	glPopMatrix;
401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	494	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402	}	495	}
403	}	496	}
…		…
423	sub set_parent {	516	sub set_parent {
424	my ($self, $parent) = @_;	517	my ($self, $parent) = @_;
425		518
426	Scalar::Util::weaken ($self->{parent} = $parent);	519	Scalar::Util::weaken ($self->{parent} = $parent);
427		520
428	# TODO: req_w _does_change after ->reconfigure	521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		522
429	$self->check_size	523	$self->check_size;
430	unless exists $self->{req_w};
431
432	$self->show;
433	}	524	}
434		525
435	sub check_size {	526	sub check_size {
436	my ($self, $forced) = @_;	527	my ($self, $forced) = @_;
437		528
…		…
450	my ($self, $signal, $cb) = @_;	541	my ($self, $signal, $cb) = @_;
451		542
452	push @{ $self->{signal_cb}{$signal} }, $cb;	543	push @{ $self->{signal_cb}{$signal} }, $cb;
453	}	544	}
454		545
		546	sub _emit {
		547	my ($self, $signal, @args) = @_;
		548
		549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		550	}
		551
455	sub emit {	552	sub emit {
456	my ($self, $signal, @args) = @_;	553	my ($self, $signal, @args) = @_;
457		554
458	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	555	$self->_emit ($signal, @args)
		556	|| $self->$signal (@args);
		557	}
		558
		559	sub visibility_change {
		560	#my ($self, $visible) = @_;
459	}	561	}
460		562
461	sub DESTROY {	563	sub DESTROY {
462	my ($self) = @_;	564	my ($self) = @_;
463		565
…		…
576	delete $child->{parent};	678	delete $child->{parent};
577	$child->hide;	679	$child->hide;
578		680
579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580		682
581	$self->check_size;	683	$self->check_size (1);
582	$self->update;	684	$self->update;
583	}	685	}
584		686
585	sub clear {	687	sub clear {
586	my ($self) = @_;	688	my ($self) = @_;
…		…
726		828
727	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
728		830
729	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
730		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
731	sub size_request {	843	sub size_request {
732	my ($self) = @_;	844	my ($self) = @_;
733		845
734	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
736		847
737	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
738	}	852	}
739		853
740	sub size_allocate {	854	sub size_allocate {
741	my ($self, $w, $h) = @_;	855	my ($self, $w, $h) = @_;
742		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
743	$self->update;	861	$self->update;
744	}	862	}
745		863
746	sub set_offset {	864	sub set_offset {
747	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
798	my $class = shift;	916	my $class = shift;
799		917
800	my $self;	918	my $self;
801		919
802	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
803	vertical => 1,	921	vertical => 1,
804	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
805	connect_changed => sub {	923	on_changed => sub {
806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
807	},	925	},
808	;	926	;
809		927
810	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
811	vp => (new CFClient::UI::ViewPort expand => 1),	929	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
816	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
817	$self->add ($self->{vp});	935	$self->add ($self->{vp});
818	$self->add ($self->{slider});	936	$self->add ($self->{slider});
819		937
820	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821	}	958	}
822		959
823	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
824	# update viewport offset on scroll	961	# update viewport offset on scroll
825		962
…		…
876	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877		1014
878	sub new {	1015	sub new {
879	my $class = shift;	1016	my $class = shift;
880		1017
881	# TODO: user_x, user_y, overwrite moveto?
882
883	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
884	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
885	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
886	border => 0.6,	1021	border => 0.6,
887	toplevel => 1,	1022	is_toplevel => 1,
888	can_events => 1,	1023	can_events => 1,
889	@_	1024	@_
890	);	1025	);
891		1026
892	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
893	align => 0,	1028	align => 0,
…		…
946	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
947		1082
948	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
949	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
950		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
954	$self->check_size;	1091	$self->check_size;
955	};	1092	};
956		1093
957	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
958	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
961	$self->{motion} = sub {	1098	$self->{motion} = sub {
962	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
963		1100
964	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
965		1102
966	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
967	$self->update;	1107	$self->update;
968	};	1108	};
969	}	1109	}
970	}	1110	}
971		1111
…		…
1033	sub new {	1173	sub new {
1034	my $class = shift;	1174	my $class = shift;
1035		1175
1036	$class->SUPER::new (	1176	$class->SUPER::new (
1037	col_expand => [],	1177	col_expand => [],
1038	@_	1178	@_,
1039	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1184	}
1041		1185
1042	sub add {	1186	sub add {
1043	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1044		1188
1045	$child->set_parent ($self);	1189	$child->set_parent ($self);
1046	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1047		1191
1048	$child->check_size;	1192	$self->check_size (1);
1049	}	1193	}
1050		1194
1051	sub children {
1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}
1054
1055	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
1056	sub clear {	1196	sub clear {
1057	my ($self) = @_;	1197	my ($self) = @_;
1058		1198
1059	my @children = $self->children;	1199	my @children = $self->children;
1060	delete $self->{children};	1200	delete $self->{children};
…		…
1062	for (@children) {	1202	for (@children) {
1063	delete $_->{parent};	1203	delete $_->{parent};
1064	$_->hide;	1204	$_->hide;
1065	}	1205	}
1066		1206
		1207	$self->check_size (1);
1067	$self->update;	1208	$self->update;
1068	}	1209	}
1069		1210
1070	sub get_wh {	1211	sub get_wh {
1071	my ($self) = @_;	1212	my ($self) = @_;
…		…
1103	sub size_allocate {	1244	sub size_allocate {
1104	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h) = @_;
1105		1246
1106	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1107		1248
1108	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1109	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1110		1251
1111	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1112	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1113	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1114	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1168	}	1309	}
1169	}	1310	}
1170		1311
1171	#############################################################################	1312	#############################################################################
1172		1313
1173	package CFClient::UI::HBox;	1314	package CFClient::UI::Box;
1174
1175	# TODO: wrap into common Box base class
1176		1315
1177	our @ISA = CFClient::UI::Container::;	1316	our @ISA = CFClient::UI::Container::;
1178		1317
1179	sub size_request {	1318	sub size_request {
1180	my ($self) = @_;	1319	my ($self) = @_;
1181		1320
1182	my @alloc = map [$_->size_request], @{$self->{children}};	1321	$self->{vertical}
1183		1322	? (
1184	(	1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1185	(List::Util::sum map $_->[0], @alloc),	1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186	(List::Util::max map $_->[1], @alloc),	1325	)
1187	)	1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
1188	}	1330	}
1189		1331
1190	sub size_allocate {	1332	sub size_allocate {
1191	my ($self, $w, $h) = @_;	1333	my ($self, $w, $h) = @_;
1192		1334
1193	($h, $w) = ($w, $h);	1335	my $space = $self->{vertical} ? $h : $w;
1194
1195	my $children = $self->{children};	1336	my $children = $self->{children};
1196		1337
1197	my @h = map $_->{req_w}, @$children;	1338	my @req;
1198		1339
1199	my $req_h = List::Util::sum @h;	1340	if ($self->{homogeneous}) {
1200		1341	@req = ($space / (@$children || 1)) x @$children;
1201	if ($req_h > $h) {
1202	# ah well, not enough space
1203	$_ *= $h / $req_h for @h;
1204	} else {	1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
1205	my $exp = List::Util::sum map $_->{expand}, @$children;	1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206	$exp ||= 1;
1207		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
1208	for (0 .. $#$children) {	1355	for 0 .. $#$children;
1209	my $child = $children->[$_];
1210
1211	my $alloc_h = $h[$_];
1212	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213	$h[$_] = $alloc_h;
1214	}	1356	}
1215	}	1357	}
1216		1358
1217	CFClient::UI::harmonize \@h;	1359	CFClient::UI::harmonize \@req;
1218		1360
1219	my $y = 0;	1361	my $pos = 0;
1220	for (0 .. $#$children) {	1362	for (0 .. $#$children) {
1221	my $child = $children->[$_];
1222	my $h = $h[$_];	1363	my $alloc = $req[$_];
1223	$child->configure ($y, 0, $h, $w);	1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224		1365
1225	$y += $h;	1366	$pos += $alloc;
1226	}	1367	}
1227		1368
1228	1	1369	1
1229	}	1370	}
1230		1371
1231	#############################################################################	1372	#############################################################################
1232		1373
		1374	package CFClient::UI::HBox;
		1375
		1376	our @ISA = CFClient::UI::Box::;
		1377
		1378	sub new {
		1379	my $class = shift;
		1380
		1381	$class->SUPER::new (
		1382	vertical => 0,
		1383	@_,
		1384	)
		1385	}
		1386
		1387	#############################################################################
		1388
1233	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1234		1390
1235	# TODO: wrap into common Box base class
1236
1237	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1238		1392
1239	sub size_request {	1393	sub new {
1240	my ($self) = @_;	1394	my $class = shift;
1241		1395
1242	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1243		1397	vertical => 1,
1244	(	1398	@_,
1245	(List::Util::max map $_->[0], @alloc),
1246	(List::Util::sum map $_->[1], @alloc),
1247	)	1399	)
1248	}
1249
1250	sub size_allocate {
1251	my ($self, $w, $h) = @_;
1252
1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255	my $children = $self->{children};
1256
1257	my @h = map $_->{req_h}, @$children;
1258
1259	my $req_h = List::Util::sum @h;
1260
1261	if ($req_h > $h) {
1262	# ah well, not enough space
1263	$_ *= $h / $req_h for @h;
1264	} else {
1265	my $exp = List::Util::sum map $_->{expand}, @$children;
1266	$exp ||= 1;
1267
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270
1271	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272	}
1273	}
1274
1275	CFClient::UI::harmonize \@h;
1276
1277	my $y = 0;
1278	for (0 .. $#$children) {
1279	my $child = $children->[$_];
1280	my $h = $h[$_];
1281	$child->configure (0, $y, $w, $h);
1282
1283	$y += $h;
1284	}
1285
1286	1
1287	}	1400	}
1288		1401
1289	#############################################################################	1402	#############################################################################
1290		1403
1291	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1475	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1476	can_hover => 1,	1589	can_hover => 1,
1477	can_focus => 1,	1590	can_focus => 1,
1478	valign => 0,	1591	valign => 0,
1479	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1480	@_	1594	@_
1481	)	1595	)
1482	}	1596	}
1483		1597
1484	sub _set_text {	1598	sub _set_text {
…		…
1494	$self->{text} = $text;	1608	$self->{text} = $text;
1495		1609
1496	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1497	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1498		1612
1499	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1500	}	1614	}
1501		1615
1502	sub set_text {	1616	sub set_text {
1503	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1504		1618
…		…
1516	my ($self) = @_;	1630	my ($self) = @_;
1517		1631
1518	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1519		1633
1520	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1521	}
1522
1523	sub size_allocate {
1524	my ($self, $w, $h) = @_;
1525
1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527	}	1635	}
1528		1636
1529	sub key_down {	1637	sub key_down {
1530	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1531		1639
…		…
1546	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1547	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1548	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1549	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1550	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1551	$self->emit ('escape');	1659	$self->_emit ('escape');
1552	} elsif ($uni) {	1660	} elsif ($uni) {
1553	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1554	}	1662	}
1555		1663
1556	$self->_set_text ($text);	1664	$self->_set_text ($text);
…		…
1643	if ($sym == 13) {	1751	if ($sym == 13) {
1644	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1645	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1646	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1647	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1648	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1649	$self->update;	1757	$self->update;
1650		1758
1651	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1652	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1653	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1701	can_events => 1,	1809	can_events => 1,
1702	@_	1810	@_
1703	)	1811	)
1704	}	1812	}
1705		1813
		1814	sub activate { }
		1815
1706	sub button_up {	1816	sub button_up {
1707	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1708		1818
		1819	$self->emit ("activate")
1709	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1710	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1711	$self->emit ("activate");
1712	}
1713	}	1822	}
1714		1823
1715	sub _draw {	1824	sub _draw {
1716	my ($self) = @_;	1825	my ($self) = @_;
1717		1826
…		…
1769	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1770		1879
1771	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1772	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1773	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1774	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1775	}	1884	}
1776	}	1885	}
1777		1886
1778	sub _draw {	1887	sub _draw {
1779	my ($self) = @_;	1888	my ($self) = @_;
…		…
2054	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2055	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2056	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2057	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2058	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2059	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2060	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2061	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2062	vertical => 0,	2171	vertical => 0,
2063	can_hover => 1,	2172	can_hover => 1,
2064	inner_pad => 0.02,	2173	inner_pad => 0.02,
…		…
2069	$self->update;	2178	$self->update;
2070		2179
2071	$self	2180	$self
2072	}	2181	}
2073		2182
		2183	sub set_range {
		2184	my ($self, $range) = @_;
		2185
		2186	($range, $self->{range}) = ($self->{range}, $range);
		2187
		2188	$self->update
		2189	if "@$range" ne "@{$self->{range}}";
		2190	}
		2191
2074	sub set_value {	2192	sub set_value {
2075	my ($self, $value) = @_;	2193	my ($self, $value) = @_;
2076		2194
2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2195	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078		2196
2079	$hi = $lo + 1 if $hi <= $lo;	2197	$hi = $lo + 1 if $hi <= $lo;
2080		2198
		2199	$page = $hi - $lo if $page > $hi - $lo;
		2200
2081	$value = $lo if $value < $lo;	2201	$value = $lo if $value < $lo;
2082	$value = $hi if $value > $hi;	2202	$value = $hi - $page if $value > $hi - $page;
2083		2203
2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2204	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085	if $unit;	2205	if $unit;
2086		2206
2087	$page = $hi - $lo if $page > $hi - $lo;
2088
2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2207	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090		2208
2091	if ($value != $old_value) {	2209	if ($value != $old_value) {
2092	$self->emit (changed => $value);	2210	$self->_emit (changed => $value);
2093	$self->update;	2211	$self->update;
2094	}	2212	}
2095	}	2213	}
2096		2214
2097	sub size_request {	2215	sub size_request {
…		…
2105		2223
2106	sub button_down {	2224	sub button_down {
2107	my ($self, $ev, $x, $y) = @_;	2225	my ($self, $ev, $x, $y) = @_;
2108		2226
2109	$self->SUPER::button_down ($ev, $x, $y);	2227	$self->SUPER::button_down ($ev, $x, $y);
		2228
		2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2230
2110	$self->mouse_motion ($ev, $x, $y);	2231	$self->mouse_motion ($ev, $x, $y);
2111	}	2232	}
2112		2233
2113	sub mouse_motion {	2234	sub mouse_motion {
2114	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
…		…
2116	if ($GRAB == $self) {	2237	if ($GRAB == $self) {
2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2238	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118		2239
2119	my (undef, $lo, $hi, $page) = @{$self->{range}};	2240	my (undef, $lo, $hi, $page) = @{$self->{range}};
2120		2241
2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122		2243
2123	$self->set_value ($x * ($hi - $lo) + $lo);	2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2124	}	2245	}
2125	}	2246	}
2126		2247
2127	sub update {	2248	sub update {
2128	my ($self) = @_;	2249	my ($self) = @_;
2129		2250
2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131	$self->set_value ($self->{range}[0]);	2252	$self->set_value ($self->{range}[0]);
2132		2253
2133	my ($value, $lo, $hi, $page) = @{$self->{range}};	2254	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2255	my $range = ($hi - $page - $lo) || 1e-100;
2134		2256
2135	my $inner_w = 1 - 2 * $self->{inner_pad};	2257	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136		2258
2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2259	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2260	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138		2261
2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2262	$value = ($value - $lo) / $range;
2140	$value = $self->{scale} * ($value - $lo);	2263	$value = $value * $self->{scale} + $self->{offset};
2141		2264
2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144	$value = 0 if $value < 0;
2145	$page = 1 - $value if $value + $page > 1;
2146
2147	$self->{knob_x} = $value;	2265	$self->{knob_x} = $value - $knob_w * 0.5;
2148	$self->{knob_w} = $page;	2266	$self->{knob_w} = $knob_w;
2149	});	2267	});
2150		2268
2151	$self->SUPER::update;	2269	$self->SUPER::update;
2152	}	2270	}
2153		2271
…		…
2177	# draw handle	2295	# draw handle
2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2296	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179		2297
2180	glDisable GL_TEXTURE_2D;	2298	glDisable GL_TEXTURE_2D;
2181	}	2299	}
		2300
		2301	#############################################################################
		2302
		2303	package CFClient::UI::ValSlider;
		2304
		2305	our @ISA = CFClient::UI::HBox::;
		2306
		2307	sub new {
		2308	my ($class, %arg) = @_;
		2309
		2310	my $range = delete $arg{range};
		2311
		2312	my $self = $class->SUPER::new (
		2313	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2314	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2315	to_value => sub { shift },
		2316	from_value => sub { shift },
		2317	%arg,
		2318	);
		2319
		2320	$self->{slider}->connect (changed => sub {
		2321	my ($self, $value) = @_;
		2322	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2323	$self->{parent}->emit (changed => $value);
		2324	});
		2325
		2326	# $self->{entry}->connect (changed => sub {
		2327	# my ($self, $value) = @_;
		2328	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2329	# $self->{parent}->emit (changed => $value);
		2330	# });
		2331
		2332	$self->add ($self->{slider}, $self->{entry});
		2333
		2334	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2335
		2336	$self
		2337	}
		2338
		2339	sub set_range { shift->{slider}->set_range (@_) }
		2340	sub set_value { shift->{slider}->set_value (@_) }
2182		2341
2183	#############################################################################	2342	#############################################################################
2184		2343
2185	package CFClient::UI::TextView;	2344	package CFClient::UI::TextView;
2186		2345
…		…
2228	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2229		2388
2230	$self->reflow;	2389	$self->reflow;
2231	}	2390	}
2232		2391
2233	sub text_height {	2392	sub text_size {
2234	my ($self, $text, $indent) = @_;	2393	my ($self, $text, $indent) = @_;
2235		2394
2236	my $layout = $self->{layout};	2395	my $layout = $self->{layout};
2237		2396
2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239	$layout->set_width ($self->{children}[0]{w} - $indent);	2398	$layout->set_width ($self->{children}[0]{w} - $indent);
2240	$layout->set_markup ($text);	2399	$layout->set_markup ($text);
2241		2400
2242	($layout->size)[1]	2401	$layout->size
2243	}	2402	}
2244		2403
2245	sub reflow {	2404	sub reflow {
2246	my ($self) = @_;	2405	my ($self) = @_;
2247		2406
2248	$self->{need_reflow}++;	2407	$self->{need_reflow}++;
2249	$self->update;	2408	$self->update;
2250	}	2409	}
2251		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2252	sub add_paragraph {	2426	sub add_paragraph {
2253	my ($self, $color, $text, $indent) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2254		2428
2255	#TODO: intelligently "reformat" paragraph
2256
2257	for my $line (split /\n/, $text) {	2429	for my $line (split /\n/, $text) {
2258	my $height = $self->text_height ($line);	2430	my ($w, $h) = $self->text_size ($line);
2259	$self->{height} += $height;	2431	$self->{height} += $h;
2260	push @{$self->{par}}, [$height, $color, $indent, $line];	2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261	}	2433	}
2262		2434
2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264	$self->{children}[1]->update;
2265	}	2436	}
2266		2437
2267	sub update {	2438	sub update {
2268	my ($self) = @_;	2439	my ($self) = @_;
2269		2440
…		…
2272	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2273		2444
2274	delete $self->{texture};	2445	delete $self->{texture};
2275		2446
2276	$ROOT->on_post_alloc ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2277	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2278	my $height = 0;	2451	my $height = 0;
2279		2452
2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2281	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2282		2468
2283	$self->{height} = $height;	2469	$self->{height} = $height;
2284		2470
2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286	$self->{children}[1]->update;
2287		2472
2288	delete $self->{texture};	2473	delete $self->{texture};
2289	}	2474	}
2290		2475
2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292	glClearColor 0.5, 0.5, 0.5, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2293	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2294		2479
2295	my $top = int $self->{children}[1]{range}[0];	2480	my $top = int $self->{children}[1]{range}[0];
2296		2481
2297	my $y0 = $top;	2482	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2299		2484
2300	my $y = 0;	2485	my $y = 0;
2301		2486
2302	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2303		2488
2304	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2305		2490
2306	glEnable GL_BLEND;	2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308		2494
2309	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2310	my $h = $par->[0];	2496	my $h = $par->[1];
2311		2497
2312	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2313	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
2314	$layout->set_width ($self->{w} - $par->[2]);	2500	$layout->set_width ($W - $par->[3]);
2315	$layout->set_markup ($par->[3]);	2501	$layout->set_markup ($par->[4]);
2316		2502
2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318		2504
2319	glRasterPos $par->[2], $y - $y0;	2505	glRasterPos $par->[3], $y - $y0;
2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321	}	2507	}
2322		2508
2323	$y += $h;	2509	$y += $h;
2324	}	2510	}
…		…
2391		2577
2392	sub new {	2578	sub new {
2393	my $class = shift;	2579	my $class = shift;
2394		2580
2395	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2396	state => 0,	2582	state => 0,
2397	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2398	@_	2584	@_
2399	);	2585	);
2400		2586
2401	if ($self->{state}) {
2402	$self->{state} = 0;
2403	$self->toggle_flopper;
2404	}
2405
2406	$self	2587	$self
2407	}	2588	}
2408		2589
2409	sub toggle_flopper {	2590	sub toggle_flopper {
2410	my ($self) = @_;	2591	my ($self) = @_;
2411		2592
2412	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2413	if ($self->{state} = !$self->{state}) {
2414	$CFClient::UI::ROOT->add ($self->{other});
2415	$self->{other}->move ($self->coord2global (0, $self->{h}));
2416	$self->emit ("open");
2417	} else {
2418	$CFClient::UI::ROOT->remove ($self->{other});
2419	$self->emit ("close");
2420	}
2421
2422	$self->emit (changed => $self->{state});
2423	}	2594	}
2424		2595
2425	#############################################################################	2596	#############################################################################
2426		2597
2427	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2503		2674
2504	sub new {	2675	sub new {
2505	my $class = shift;	2676	my $class = shift;
2506		2677
2507	my $self = $class->SUPER::new (	2678	my $self = $class->SUPER::new (
2508	aspect => 1,	2679	aspect => 1,
		2680	can_events => 0,
2509	@_,	2681	@_,
2510	);	2682	);
2511		2683
2512	if ($self->{anim} && $self->{animspeed}) {	2684	if ($self->{anim} && $self->{animspeed}) {
2513	Scalar::Util::weaken (my $widget = $self);	2685	Scalar::Util::weaken (my $widget = $self);
…		…
2539	}	2711	}
2540		2712
2541	sub _draw {	2713	sub _draw {
2542	my ($self) = @_;	2714	my ($self) = @_;
2543		2715
2544	return unless $::CONN;#d# manage and cache textures differently	2716	return unless $::CONN;
2545		2717
2546	my $face;	2718	my $face;
2547		2719
2548	if ($self->{frame}) {	2720	if ($self->{frame}) {
2549	my $anim = $::CONN->{anim}[$self->{anim}];	2721	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2572	$self->SUPER::DESTROY;	2744	$self->SUPER::DESTROY;
2573	}	2745	}
2574		2746
2575	#############################################################################	2747	#############################################################################
2576		2748
2577	package CFClient::UI::InventoryItem;	2749	package CFClient::UI::Inventory;
2578		2750
2579	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFClient::UI::ScrolledWindow::;
2580
2581	sub _item_to_desc {
2582	my ($item) = @_;
2583
2584	my $desc =
2585	$item->{nrof} < 2
2586	? $item->{name}
2587	: "$item->{nrof} × $item->{name_pl}";
2588
2589	$item->{flags} & Crossfire::Protocol::F_OPEN
2590	and $desc .= " (open)";
2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
2592	and $desc .= " (applied)";
2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
2594	and $desc .= " (unpaid)";
2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
2596	and $desc .= " (magic)";
2597	$item->{flags} & Crossfire::Protocol::F_CURSED
2598	and $desc .= " (cursed)";
2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
2600	and $desc .= " (damned)";
2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
2602	and $desc .= " *";
2603
2604	$desc
2605	}
2606		2752
2607	sub new {	2753	sub new {
2608	my $class = shift;	2754	my $class = shift;
2609		2755
2610	my %args = @_;
2611
2612	my $item = delete $args{item};
2613
2614	my $desc = _item_to_desc ($item);
2615
2616	my $self = $class->SUPER::new (	2756	my $self = $class->SUPER::new (
2617	can_hover => 1,	2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2618	can_events => 1,
2619	tooltip => ((CFClient::UI::Label::escape $desc)
2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621	connect_button_down => sub {
2622	my ($self, $ev, $x, $y) = @_;
2623
2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2625	if ($ev->{button} == 1) {
2626	my $targ = $::CONN->{player}{tag};
2627
2628	if ($item->{container} == $::CONN->{player}{tag}) {
2629	$targ = $main::OPENCONT;
2630	}
2631
2632	$::CONN->send ("move $targ $item->{tag} 0");
2633	} elsif ($ev->{button} == 2) {
2634	$::CONN->send ("apply $item->{tag}");
2635	} elsif ($ev->{button} == 3) {
2636	my @menu_items = (
2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640	(
2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
2642	? (
2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644	)
2645	: (
2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648	)
2649	),
2650	);
2651
2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653	}
2654
2655	1
2656	},
2657	%args
2658	);
2659
2660
2661	$self->add (new CFClient::UI::Face
2662	can_events => 0,
2663	face => $item->{face},
2664	anim => $item->{anim},
2665	animspeed => $item->{animspeed},
2666	);
2667
2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670	$self->{item} = $item;
2671
2672	$self->update_item;
2673
2674	$self
2675	}
2676
2677	sub update_item {
2678	my ($self) = @_;
2679
2680	my $desc = _item_to_desc ($self->{item});
2681
2682	$self->{name_lbl}->set_text ($desc);
2683	}
2684
2685	#############################################################################
2686
2687	package CFClient::UI::Inventory;
2688
2689	our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691	sub new {
2692	my $class = shift;
2693
2694	my $self = $class->SUPER::new (
2695	scrolled => (new CFClient::UI::VBox),
2696	@_,	2758	@_,
2697	);	2759	);
2698		2760
2699	$self	2761	$self
2700	}	2762	}
…		…
2710	or ($a->{name} cmp $b->{name})	2772	or ($a->{name} cmp $b->{name})
2711	} @$items;	2773	} @$items;
2712		2774
2713	$self->{real_items} = \@items;	2775	$self->{real_items} = \@items;
2714		2776
		2777	my $row = 0;
2715	for my $item (@items) {	2778	for my $item (@items) {
2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2779	CFClient::Item::update_widgets $item;
2717	$item->update_item ();
2718	}
2719		2780
2720	$self->{scrolled}->add (@items);	2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2721		2784
2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2785	$row++;
2723	}	2786	}
2724
2725	sub size_request {
2726	my ($self) = @_;
2727	($self->{req_w}, $self->{req_h});
2728	}	2787	}
2729		2788
2730	#############################################################################	2789	#############################################################################
2731		2790
2732	package CFClient::UI::Menu;	2791	package CFClient::UI::Menu;
…		…
2767		2826
2768	# popup given the event (must be a mouse button down event currently)	2827	# popup given the event (must be a mouse button down event currently)
2769	sub popup {	2828	sub popup {
2770	my ($self, $ev) = @_;	2829	my ($self, $ev) = @_;
2771		2830
2772	$self->emit ("popdown");	2831	$self->_emit ("popdown");
2773		2832
2774	# maybe save $GRAB? must be careful about events...	2833	# maybe save $GRAB? must be careful about events...
2775	$GRAB = $self;	2834	$GRAB = $self;
2776	$self->{button} = $ev->{button};	2835	$self->{button} = $ev->{button};
2777		2836
…		…
2792		2851
2793	if ($ev->{button} == $self->{button}) {	2852	if ($ev->{button} == $self->{button}) {
2794	undef $GRAB;	2853	undef $GRAB;
2795	$self->hide;	2854	$self->hide;
2796		2855
2797	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2798	$self->{hover}[1]->() if $self->{hover};	2857	$self->{hover}[1]->() if $self->{hover};
2799	}	2858	}
2800	}	2859	}
2801		2860
2802	#############################################################################	2861	#############################################################################
…		…
2864	sub add {	2923	sub add {
2865	my ($self, $text, %arg) = @_;	2924	my ($self, $text, %arg) = @_;
2866		2925
2867	$text =~ s/^\s+//;	2926	$text =~ s/^\s+//;
2868	$text =~ s/\s+$//;	2927	$text =~ s/\s+$//;
		2928
		2929	return unless $text;
2869		2930
2870	my $timeout = time + ((delete $arg{timeout}) || 60);	2931	my $timeout = time + ((delete $arg{timeout}) || 60);
2871		2932
2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2933	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873		2934
…		…
2917		2978
2918	sub new {	2979	sub new {
2919	my $class = shift;	2980	my $class = shift;
2920		2981
2921	$class->SUPER::new (	2982	$class->SUPER::new (
		2983	visible => 1,
2922	@_,	2984	@_,
2923	)	2985	)
2924	}	2986	}
2925		2987
2926	sub configure {	2988	sub configure {
…		…
2944	}	3006	}
2945		3007
2946	sub size_allocate {	3008	sub size_allocate {
2947	my ($self, $w, $h) = @_;	3009	my ($self, $w, $h) = @_;
2948		3010
2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955	for my $child ($self->children) {	3011	for my $child ($self->children) {
2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957		3013
2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959	if exists $child->{req_x};	3015	if exists $child->{req_x};
2960		3016
2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962	if exists $child->{req_y};	3018	if exists $child->{req_y};
2963		3019
		3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3021
2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966		3024
2967	$child->configure ($X, $Y, $W, $H);	3025	$child->configure ($X, $Y, $W, $H);
2968	}	3026	}
…		…
2989		3047
2990	sub add {	3048	sub add {
2991	my ($self, @children) = @_;	3049	my ($self, @children) = @_;
2992		3050
2993	for my $child (@children) {	3051	for my $child (@children) {
2994	$child->{toplevel} = 1;	3052	$child->{is_toplevel} = 1;
2995		3053
2996	# integerise window positions	3054	# integerise window positions
2997	$child->{x} = int $child->{x};	3055	$child->{x} = int $child->{x};
2998	$child->{y} = int $child->{y};	3056	$child->{y} = int $child->{y};
2999	}	3057	}
3000		3058
3001	$self->SUPER::add (@children);	3059	$self->SUPER::add (@children);
3002		3060
		3061	for (my @widgets = @children; my $w = pop @widgets; ) {
		3062	push @widgets, $w->children;
		3063	$w->set_visible;
		3064	}
		3065
		3066	}
		3067
		3068	sub remove {
		3069	my ($self, @children) = @_;
		3070
		3071	$self->SUPER::remove (@children);
		3072
3003	while (@children) {	3073	while (@children) {
3004	my $w = pop @children;	3074	my $w = pop @children;
3005	push @children, $w->children;	3075	push @children, $w->children;
3006	$w->{visible} = 1;	3076	$w->set_invisible;
3007	}
3008	}
3009
3010	sub remove {
3011	my ($self, @children) = @_;
3012
3013	$self->SUPER::remove (@children);
3014
3015	while (@children) {
3016	my $w = pop @children;
3017	push @children, $w->children;
3018	delete $w->{visible};
3019	}	3077	}
3020	}	3078	}
3021		3079
3022	sub on_refresh {	3080	sub on_refresh {
3023	my ($self, $id, $cb) = @_;	3081	my ($self, $id, $cb) = @_;
…		…
3038	$_->()	3096	$_->()
3039	for values %{delete $self->{refresh_hook}};	3097	for values %{delete $self->{refresh_hook}};
3040	}	3098	}
3041		3099
3042	if ($self->{check_size}) {	3100	if ($self->{check_size}) {
3043	my @queue = ([], []);	3101	my @queue;
3044		3102
3045	for (;;) {	3103	while () {
3046	if ($self->{check_size}) {	3104	if ($self->{check_size}) {
3047	# heuristic: check containers last	3105	#TODO use array-of-depth approach
3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3106
		3107	@queue = sort { $a->{visible} <=> $b->{visible} }
3049	for values %{delete $self->{check_size}}	3108	@queue, values %{delete $self->{check_size}};
3050	}	3109	}
3051		3110
3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3111	my $widget = pop @queue || last;
3053		3112
		3113	defined $widget->{visible} or last; # do not resize invisible widgets
		3114
3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3055	? @$widget{qw(user_w user_h)}	3116	? @$widget{qw(def_w def_h)}
3056	: $widget->size_request;	3117	: $widget->size_request;
3057		3118
3058	if (delete $widget->{force_alloc}	3119	if (delete $widget->{force_alloc}
3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
3068	if $widget->{parent};	3129	if $widget->{parent};
3069	}	3130	}
3070	}	3131	}
3071	}	3132	}
3072		3133
3073	while ($self->{size_alloc}) {	3134	while (my $size_alloc = delete $self->{size_alloc}) {
3074	for (values %{delete $self->{size_alloc}}) {	3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3075	my ($widget, $w, $h) = @$_;	3136	values %$size_alloc;
		3137
		3138	while () {
		3139	my ($widget, $w, $h) = @{ pop @queue or last };
3076		3140
3077	$w = 0 if $w < 0;	3141	$w = 0 if $w < 0;
3078	$h = 0 if $h < 0;	3142	$h = 0 if $h < 0;
3079		3143
3080	$widget->{w} = $w;	3144	$widget->{w} = $w;
3081	$widget->{h} = $h;	3145	$widget->{h} = $h;
3082	$widget->size_allocate ($w, $h);
3083	$widget->emit (size_allocate => $w, $h);	3146	$widget->emit (size_allocate => $w, $h);
3084	}	3147	}
3085	}	3148	}
3086		3149
3087	while ($self->{post_alloc_hook}) {	3150	while ($self->{post_alloc_hook}) {

Diff Legend

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