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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 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}) {
…		…
27	my $tip = $widget->{tooltip};	47	my $tip = $widget->{tooltip};
28		48
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	49	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		50
31	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;
33		52
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	53	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		54
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)	55	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;	56	if $x + $TOOLTIP->{w} > $::WIDTH;
38		57
39	$TOOLTIP->move ($x, $y);	58	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;	59	$TOOLTIP->show;
42	}	60	}
43		61
44	return;	62	return;
45	}	63	}
46	}	64	}
…		…
50	delete $TOOLTIP->{owner};	68	delete $TOOLTIP->{owner};
51	}	69	}
52		70
53	# class methods for events	71	# class methods for events
54	sub feed_sdl_key_down_event {	72	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	73	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	74	if $FOCUS;
57	}	75	}
58		76
59	sub feed_sdl_key_up_event {	77	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	78	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	79	if $FOCUS;
62	}	80	}
63		81
64	sub feed_sdl_button_down_event {	82	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	83	my ($ev) = @_;
…		…
74	check_tooltip;	92	check_tooltip;
75	}	93	}
76		94
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		96
79	if ($GRAB) {	97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	98	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	99	}
84		100
85	sub feed_sdl_button_up_event {	101	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	102	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	103	my ($x, $y) = ($ev->{x}, $ev->{y});
88		104
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		106
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		108
93	if ($GRAB) {	109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	110	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		111
98	if (!$BUTTON_STATE) {	112	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	113	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	114	$grab->update if $grab;
101	$GRAB->update if $GRAB;	115	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	131	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		132
119	check_tooltip;	133	check_tooltip;
120	}	134	}
121		135
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	137	if $HOVER;
126	}	138	}
127		139
128	# convert position array to integers	140	# convert position array to integers
129	sub harmonize {	141	sub harmonize {
130	my ($vals) = @_;	142	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	148	$rem += $_ - $i;
137	$_ = $i;	149	$_ = $i;
138	}	150	}
139	}	151	}
140		152
		153	sub full_refresh {
		154	# make a copy, otherwise for complains about freed values.
		155	my @widgets = values %WIDGET;
		156
		157	$_->update
		158	for @widgets;
		159	}
		160
		161	sub reconfigure_widgets {
		162	# make a copy, otherwise C<for> complains about freed values.
		163	my @widgets = values %WIDGET;
		164
		165	$_->reconfigure
		166	for @widgets;
		167	}
		168
141	# call when resolution changes etc.	169	# call when resolution changes etc.
142	sub rescale_widgets {	170	sub rescale_widgets {
143	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
144		172
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	173	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	174	if ($widget->{is_toplevel}) {
150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	175	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	177	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	178	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	180	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158	}	181	}
159
160	$widget->reconfigure;
161	}	182	}
		183
		184	reconfigure_widgets;
162	}	185	}
163		186
164	#############################################################################	187	#############################################################################
165		188
166	package CFClient::UI::Base;	189	package CFClient::UI::Base;
…		…
179	can_events => 1,	202	can_events => 1,
180	@_	203	@_
181	}, $class;	204	}, $class;
182		205
183	for (keys %$self) {	206	for (keys %$self) {
184	if (/^connect_(.*)$/) {	207	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	208	$self->connect ($1 => delete $self->{$_});
186	}	209	}
187	}	210	}
188		211
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	212	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190		213
		214	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		215	$self->{req_x} = $layout->{x} * $::WIDTH;
		216	$self->{req_y} = $layout->{y} * $::HEIGHT;
		217	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		218	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		219	}
		220
191	$self	221	$self
192	}	222	}
193		223
194	sub destroy {	224	sub destroy {
195	my ($self) = @_;	225	my ($self) = @_;
…		…
204	return if $self->{parent};	234	return if $self->{parent};
205		235
206	$CFClient::UI::ROOT->add ($self);	236	$CFClient::UI::ROOT->add ($self);
207	}	237	}
208		238
209	sub hide {	239	sub center {
210	my ($self) = @_;	240	my ($self) = @_;
		241
		242	$CFClient::UI::ROOT->on_post_alloc (
		243	"center_$self" => sub {
		244	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		245	},
		246	);
		247
		248	$self->update;
		249	}
		250
		251	sub set_visible {
		252	my ($self) = @_;
		253
		254	return if $self->{visible};
		255
		256	$self->{root} = $self->{parent}{root};
		257	$self->{visible} = $self->{parent}{visible} + 1;
		258
		259	$self->emit (visibility_change => 1);
		260
		261	$self->realloc if !exists $self->{req_w};
		262
		263	$_->set_visible for $self->children;
		264	}
		265
		266	sub set_invisible {
		267	my ($self) = @_;
		268
		269	return unless $self->{visible};
		270
		271	$_->set_invisible for $self->children;
		272
		273	delete $self->{root};
		274	delete $self->{visible};
211		275
212	undef $GRAB if $GRAB == $self;	276	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	277	undef $HOVER if $HOVER == $self;
		278
		279	CFClient::UI::check_tooltip
		280	if $TOOLTIP->{owner} == $self;
		281
		282	$self->focus_out;
		283
		284	$self->emit (visibility_change => 0);
		285	}
		286
		287	sub set_visibility {
		288	my ($self, $visible) = @_;
		289
		290	return if $self->{visible} == $visible;
		291
		292	$visible ? $self->hide
		293	: $self->show;
		294	}
		295
		296	sub toggle_visibility {
		297	my ($self) = @_;
		298
		299	$self->{visible}
		300	? $self->hide
		301	: $self->show;
		302	}
		303
		304	sub hide {
		305	my ($self) = @_;
		306
		307	$self->set_invisible;
214		308
215	$self->{parent}->remove ($self)	309	$self->{parent}->remove ($self)
216	if $self->{parent};	310	if $self->{parent};
217	}	311	}
218		312
…		…
227	}	321	}
228		322
229	sub set_size {	323	sub set_size {
230	my ($self, $w, $h) = @_;	324	my ($self, $w, $h) = @_;
231		325
232	$self->{user_w} = $w;	326	$self->{def_w} = $w;
233	$self->{user_h} = $h;	327	$self->{def_h} = $h;
234		328
235	$self->check_size;	329	$self->realloc;
236	}	330	}
237		331
238	sub size_request {	332	sub size_request {
239	require Carp;	333	require Carp;
240	Carp::confess "size_request is abstract";	334	Carp::confess "size_request is abstract";
…		…
260	$self->{y} = $y;	354	$self->{y} = $y;
261	$self->update;	355	$self->update;
262	}	356	}
263		357
264	if ($self->{w} != $w || $self->{h} != $h) {	358	if ($self->{w} != $w || $self->{h} != $h) {
		359	return unless $self->{visible};
		360
265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	361	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
266	}	362	}
267	}	363	}
268		364
269	sub size_allocate {	365	sub size_allocate {
270	# nothing to be done	366	# nothing to be done
271	}	367	}
272		368
273	sub reconfigure {
274	my ($self) = @_;
275
276	$self->check_size (1);
277	$self->update;
278	}
279
280	sub children {	369	sub children {
281	}	370	}
282		371
283	sub set_max_size {	372	sub set_max_size {
284	my ($self, $w, $h) = @_;	373	my ($self, $w, $h) = @_;
…		…
287	delete $self->{max_h}; $self->{max_h} = $h if $h;	376	delete $self->{max_h}; $self->{max_h} = $h if $h;
288	}	377	}
289		378
290	sub set_tooltip {	379	sub set_tooltip {
291	my ($self, $tooltip) = @_;	380	my ($self, $tooltip) = @_;
		381
		382	$tooltip =~ s/^\s+//;
		383	$tooltip =~ s/\s+$//;
		384
		385	return if $self->{tooltip} eq $tooltip;
292		386
293	$self->{tooltip} = $tooltip;	387	$self->{tooltip} = $tooltip;
294		388
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	389	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	390	delete $CFClient::UI::TOOLTIP->{owner};
…		…
318	return if $FOCUS == $self;	412	return if $FOCUS == $self;
319	return unless $self->{can_focus};	413	return unless $self->{can_focus};
320		414
321	my $focus = $FOCUS; $FOCUS = $self;	415	my $focus = $FOCUS; $FOCUS = $self;
322		416
323	$self->emit (focus_in => $focus);	417	$self->_emit (focus_in => $focus);
324		418
325	$focus->update if $focus;	419	$focus->update if $focus;
326	$FOCUS->update;	420	$FOCUS->update;
327	}	421	}
328		422
…		…
331		425
332	return unless $FOCUS == $self;	426	return unless $FOCUS == $self;
333		427
334	my $focus = $FOCUS; undef $FOCUS;	428	my $focus = $FOCUS; undef $FOCUS;
335		429
336	$self->emit (focus_out => $focus);	430	$self->_emit (focus_out => $focus);
337		431
338	$focus->update if $focus; #?	432	$focus->update if $focus; #?
		433
		434	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		435	unless $FOCUS;
339	}	436	}
340		437
341	sub mouse_motion { }	438	sub mouse_motion { }
342	sub button_up { }	439	sub button_up { }
343	sub key_down { }	440	sub key_down { }
344	sub key_up { }	441	sub key_up { }
345		442
346	sub button_down {	443	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	444	my ($self, $ev, $x, $y) = @_;
348		445
349	$self->focus_in;	446	$self->focus_in;
…		…
352	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	449	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	450	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	451	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	452	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	453	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		454
		455	sub find_widget {
		456	my ($self, $x, $y) = @_;
		457
		458	return () unless $self->{can_events};
		459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471
		472	$self->set_visible if $parent->{visible};
		473	}
		474
		475	sub connect {
		476	my ($self, $signal, $cb) = @_;
		477
		478	push @{ $self->{signal_cb}{$signal} }, $cb;
		479	}
		480
		481	sub _emit {
		482	my ($self, $signal, @args) = @_;
		483
		484	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		485	}
		486
		487	sub emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	$self->_emit ($signal, @args)
		491	|| $self->$signal (@args);
		492	}
		493
		494	sub visibility_change {
		495	#my ($self, $visible) = @_;
		496	}
		497
		498	sub realloc {
		499	my ($self) = @_;
		500
		501	if ($self->{visible}) {
		502	return if $self->{root}{realloc}{$self};
		503
		504	$self->{root}{realloc}{$self} = $self;
		505	$self->{root}->update;
		506	} else {
		507	delete $self->{req_w};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
357		517
358	sub draw {	518	sub draw {
359	my ($self) = @_;	519	my ($self) = @_;
360		520
361	return unless $self->{h} && $self->{w};	521	return unless $self->{h} && $self->{w};
…		…
383	if ($ENV{PCLIENT_DEBUG}) {	543	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;	544	glPushMatrix;
385	glColor 1, 1, 0, 1;	545	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	546	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	547	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	548	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	549	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	550	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	551	glVertex 0 , $self->{h} - 1;
392	glEnd;	552	glEnd;
393	glPopMatrix;	553	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	554	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	555	}
396	}	556	}
397		557
398	sub _draw {	558	sub _draw {
399	my ($self) = @_;	559	my ($self) = @_;
400		560
401	warn "no draw defined for $self\n";	561	warn "no draw defined for $self\n";
402	}
403
404	sub find_widget {
405	my ($self, $x, $y) = @_;
406
407	return () unless $self->{can_events};
408
409	return $self
410	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413	()
414	}
415
416	sub set_parent {
417	my ($self, $parent) = @_;
418
419	Scalar::Util::weaken ($self->{parent} = $parent);
420
421	# TODO: req_w _does_change after ->reconfigure
422	$self->check_size
423	unless exists $self->{req_w};
424	}
425
426	sub check_size {
427	my ($self, $forced) = @_;
428
429	$self->{force_alloc} = 1 if $forced;
430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
431	}
432
433	sub update {
434	my ($self) = @_;
435
436	$self->{parent}->update
437	if $self->{parent};
438	}
439
440	sub connect {
441	my ($self, $signal, $cb) = @_;
442
443	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}
445
446	sub emit {
447	my ($self, $signal, @args) = @_;
448
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450	}	562	}
451		563
452	sub DESTROY {	564	sub DESTROY {
453	my ($self) = @_;	565	my ($self) = @_;
454		566
…		…
551	$self->{children} = [	663	$self->{children} = [
552	sort { $a->{z} <=> $b->{z} }	664	sort { $a->{z} <=> $b->{z} }
553	@{$self->{children}}, @widgets	665	@{$self->{children}}, @widgets
554	];	666	];
555		667
556	$self->check_size (1);	668	$self->realloc;
557	$self->update;
558	}	669	}
559		670
560	sub children {	671	sub children {
561	@{ $_[0]{children} }	672	@{ $_[0]{children} }
562	}	673	}
…		…
567	delete $child->{parent};	678	delete $child->{parent};
568	$child->hide;	679	$child->hide;
569		680
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		682
572	$self->check_size;	683	$self->realloc;
573	$self->update;
574	}	684	}
575		685
576	sub clear {	686	sub clear {
577	my ($self) = @_;	687	my ($self) = @_;
578		688
…		…
582	for (@$children) {	692	for (@$children) {
583	delete $_->{parent};	693	delete $_->{parent};
584	$_->hide;	694	$_->hide;
585	}	695	}
586		696
587	$self->check_size;	697	$self->realloc;
588	$self->update;
589	}	698	}
590		699
591	sub find_widget {	700	sub find_widget {
592	my ($self, $x, $y) = @_;	701	my ($self, $x, $y) = @_;
593		702
…		…
646	sub size_request {	755	sub size_request {
647	$_[0]{children}[0]->size_request	756	$_[0]{children}[0]->size_request
648	}	757	}
649		758
650	sub size_allocate {	759	sub size_allocate {
651	my ($self, $w, $h) = @_;	760	my ($self, $w, $h, $changed) = @_;
652		761
653	$self->{children}[0]->configure (0, 0, $w, $h);	762	$self->{children}[0]->configure (0, 0, $w, $h);
654	}	763	}
655		764
656	#############################################################################	765	#############################################################################
…		…
673	$ROOT->on_post_alloc ($self => sub { $self->render_child });	782	$ROOT->on_post_alloc ($self => sub { $self->render_child });
674	$self->SUPER::update;	783	$self->SUPER::update;
675	}	784	}
676		785
677	sub size_allocate {	786	sub size_allocate {
678	my ($self, $w, $h) = @_;	787	my ($self, $w, $h, $changed) = @_;
679		788
680	$self->SUPER::size_allocate ($w, $h);	789	$self->SUPER::size_allocate ($w, $h, $changed);
681	$self->update;	790	$self->update
		791	if $changed;
682	}	792	}
683		793
684	sub _render {	794	sub _render {
685	$_[0]{children}[0]->draw;	795	$_[0]{children}[0]->draw;
686	}	796	}
…		…
717		827
718	package CFClient::UI::ViewPort;	828	package CFClient::UI::ViewPort;
719		829
720	our @ISA = CFClient::UI::Window::;	830	our @ISA = CFClient::UI::Window::;
721		831
		832	sub new {
		833	my $class = shift;
		834
		835	$class->SUPER::new (
		836	scroll_x => 0,
		837	scroll_y => 1,
		838	@_,
		839	)
		840	}
		841
722	sub size_request {	842	sub size_request {
723	my ($self) = @_;	843	my ($self) = @_;
724		844
725	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	845	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
727		846
728	@$self{qw(child_w child_h)}	847	$w = 10 if $self->{scroll_x};
		848	$h = 10 if $self->{scroll_y};
		849
		850	($w, $h)
729	}	851	}
730		852
731	sub size_allocate {	853	sub size_allocate {
732	my ($self, $w, $h) = @_;	854	my ($self, $w, $h, $changed) = @_;
733		855
		856	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		857	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		858
		859	$self->child->configure (0, 0, $w, $h);
734	$self->update;	860	$self->update;
735	}	861	}
736		862
737	sub set_offset {	863	sub set_offset {
738	my ($self, $x, $y) = @_;	864	my ($self, $x, $y) = @_;
…		…
789	my $class = shift;	915	my $class = shift;
790		916
791	my $self;	917	my $self;
792		918
793	my $slider = new CFClient::UI::Slider	919	my $slider = new CFClient::UI::Slider
794	vertical => 1,	920	vertical => 1,
795	range => [0, 0, 1, 0.01], # HACK fix	921	range => [0, 0, 1, 0.01], # HACK fix
796	connect_changed => sub {	922	on_changed => sub {
797	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	923	$self->{vp}->set_offset (0, $_[1]);
798	},	924	},
799	;	925	;
800		926
801	$self = $class->SUPER::new (	927	$self = $class->SUPER::new (
802	vp => (new CFClient::UI::ViewPort),	928	vp => (new CFClient::UI::ViewPort expand => 1),
803	slider => $slider,	929	slider => $slider,
804	@_,	930	@_,
805	);	931	);
806		932
807	$self->{vp}->add ($self->{scrolled});	933	$self->{vp}->add ($self->{scrolled});
808	$self->add ($self->{vp});	934	$self->add ($self->{vp});
809	$self->add ($self->{slider});	935	$self->add ($self->{slider});
810		936
811	$self	937	$self
		938	}
		939
		940	sub update {
		941	my ($self) = @_;
		942
		943	$self->SUPER::update;
		944
		945	# todo: overwrite size_allocate of child
		946	my $child = $self->{vp}->child;
		947	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		948	}
		949
		950	sub size_allocate {
		951	my ($self, $w, $h, $changed) = @_;
		952
		953	$self->SUPER::size_allocate ($w, $h, $changed);
		954
		955	my $child = $self->{vp}->child;
		956	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812	}	957	}
813		958
814	#TODO# update range on size_allocate depending on child	959	#TODO# update range on size_allocate depending on child
815	# update viewport offset on scroll	960	# update viewport offset on scroll
816		961
…		…
867	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1012	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868		1013
869	sub new {	1014	sub new {
870	my $class = shift;	1015	my $class = shift;
871		1016
872	# TODO: user_x, user_y, overwrite moveto?
873
874	my $self = $class->SUPER::new (	1017	my $self = $class->SUPER::new (
875	bg => [1, 1, 1, 1],	1018	bg => [1, 1, 1, 1],
876	border_bg => [1, 1, 1, 1],	1019	border_bg => [1, 1, 1, 1],
877	border => 0.6,	1020	border => 0.6,
878	toplevel => 1,	1021	is_toplevel => 1,
879	can_events => 1,	1022	can_events => 1,
880	@_	1023	@_
881	);	1024	);
882		1025
883	$self->{title} &&= new CFClient::UI::Label	1026	$self->{title} &&= new CFClient::UI::Label
884	align => 0,	1027	align => 0,
…		…
903	$h + $self->border * 2,	1046	$h + $self->border * 2,
904	)	1047	)
905	}	1048	}
906		1049
907	sub size_allocate {	1050	sub size_allocate {
908	my ($self, $w, $h) = @_;	1051	my ($self, $w, $h, $changed) = @_;
		1052
		1053	return unless $changed;
909		1054
910	$h -= List::Util::max 0, $self->border * 2;	1055	$h -= List::Util::max 0, $self->border * 2;
911	$w -= List::Util::max 0, $self->border * 2;	1056	$w -= List::Util::max 0, $self->border * 2;
912		1057
913	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1058	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
937	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
938		1083
939	my $dx = $ev->{x} - $ox;	1084	my $dx = $ev->{x} - $ox;
940	my $dy = $ev->{y} - $oy;	1085	my $dy = $ev->{y} - $oy;
941		1086
		1087	$self->{user_x} = $wx + $dx * $mx;
		1088	$self->{user_y} = $wy + $dy * $my;
942	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1089	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
943	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1090	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
944	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1091	$self->move ($self->{user_x}, $self->{user_y});
945	$self->check_size;	1092	$self->realloc;
946	};	1093	};
947		1094
948	} elsif ($lr ^ $td) {	1095	} elsif ($lr ^ $td) {
949	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1096	my ($ox, $oy) = ($ev->{x}, $ev->{y});
950	my ($bx, $by) = ($self->{x}, $self->{y});	1097	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
952	$self->{motion} = sub {	1099	$self->{motion} = sub {
953	my ($ev, $x, $y) = @_;	1100	my ($ev, $x, $y) = @_;
954		1101
955	($x, $y) = ($ev->{x}, $ev->{y});	1102	($x, $y) = ($ev->{x}, $ev->{y});
956		1103
957	$self->move ($bx + $x - $ox, $by + $y - $oy);	1104	$self->{user_x} = $bx + $x - $ox;
		1105	$self->{user_y} = $by + $y - $oy;
		1106
		1107	$self->move ($self->{user_x}, $self->{user_y});
958	$self->update;	1108	$self->realloc;
959	};	1109	};
960	}	1110	}
961	}	1111	}
962		1112
963	sub button_up {	1113	sub button_up {
…		…
1024	sub new {	1174	sub new {
1025	my $class = shift;	1175	my $class = shift;
1026		1176
1027	$class->SUPER::new (	1177	$class->SUPER::new (
1028	col_expand => [],	1178	col_expand => [],
1029	@_	1179	@_,
1030	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}	1185	}
1032		1186
1033	sub add {	1187	sub add {
1034	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1035		1189
1036	$child->set_parent ($self);	1190	$child->set_parent ($self);
1037	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1038		1192
1039	$child->check_size;	1193	$self->realloc;
1040	}	1194	}
1041		1195
1042	sub children {
1043	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044	}
1045
1046	# TODO: move to container class maybe? send childs a signal on removal?	1196	# TODO: move to container class maybe? send children a signal on removal?
1047	sub clear {	1197	sub clear {
1048	my ($self) = @_;	1198	my ($self) = @_;
1049		1199
1050	my @children = $self->children;	1200	my @children = $self->children;
1051	delete $self->{children};	1201	delete $self->{children};
…		…
1053	for (@children) {	1203	for (@children) {
1054	delete $_->{parent};	1204	delete $_->{parent};
1055	$_->hide;	1205	$_->hide;
1056	}	1206	}
1057		1207
1058	$self->update;	1208	$self->realloc;
1059	}	1209	}
1060		1210
1061	sub get_wh {	1211	sub get_wh {
1062	my ($self) = @_;	1212	my ($self) = @_;
1063		1213
…		…
1090	(sum @$hs),	1240	(sum @$hs),
1091	)	1241	)
1092	}	1242	}
1093		1243
1094	sub size_allocate {	1244	sub size_allocate {
1095	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1096		1246
1097	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1098		1248
1099	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1100	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1101		1251
1102	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1103	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1104	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1105	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1159	}	1309	}
1160	}	1310	}
1161		1311
1162	#############################################################################	1312	#############################################################################
1163		1313
		1314	package CFClient::UI::Box;
		1315
		1316	our @ISA = CFClient::UI::Container::;
		1317
		1318	sub size_request {
		1319	my ($self) = @_;
		1320
		1321	$self->{vertical}
		1322	? (
		1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1325	)
		1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
		1330	}
		1331
		1332	sub size_allocate {
		1333	my ($self, $w, $h, $changed) = @_;
		1334
		1335	my $space = $self->{vertical} ? $h : $w;
		1336	my $children = $self->{children};
		1337
		1338	my @req;
		1339
		1340	if ($self->{homogeneous}) {
		1341	@req = ($space / (@$children || 1)) x @$children;
		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 {
		1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
		1355	for 0 .. $#$children;
		1356	}
		1357	}
		1358
		1359	CFClient::UI::harmonize \@req;
		1360
		1361	my $pos = 0;
		1362	for (0 .. $#$children) {
		1363	my $alloc = $req[$_];
		1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1365
		1366	$pos += $alloc;
		1367	}
		1368
		1369	1
		1370	}
		1371
		1372	#############################################################################
		1373
1164	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1165		1375
1166	# TODO: wrap into common Box base class
1167
1168	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1169		1377
1170	sub size_request {	1378	sub new {
1171	my ($self) = @_;	1379	my $class = shift;
1172		1380
1173	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1174		1382	vertical => 0,
1175	(	1383	@_,
1176	(List::Util::sum map $_->[0], @alloc),
1177	(List::Util::max map $_->[1], @alloc),
1178	)	1384	)
1179	}	1385	}
1180		1386
1181	sub size_allocate {
1182	my ($self, $w, $h) = @_;
1183
1184	($h, $w) = ($w, $h);
1185
1186	my $children = $self->{children};
1187
1188	my @h = map $_->{req_w}, @$children;
1189
1190	my $req_h = List::Util::sum @h;
1191
1192	if ($req_h > $h) {
1193	# ah well, not enough space
1194	$_ *= $h / $req_h for @h;
1195	} else {
1196	my $exp = List::Util::sum map $_->{expand}, @$children;
1197	$exp ||= 1;
1198
1199	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201
1202	my $alloc_h = $h[$_];
1203	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204	$h[$_] = $alloc_h;
1205	}
1206	}
1207
1208	CFClient::UI::harmonize \@h;
1209
1210	my $y = 0;
1211	for (0 .. $#$children) {
1212	my $child = $children->[$_];
1213	my $h = $h[$_];
1214	$child->configure ($y, 0, $h, $w);
1215
1216	$y += $h;
1217	}
1218
1219	1
1220	}
1221
1222	#############################################################################	1387	#############################################################################
1223		1388
1224	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1225		1390
1226	# TODO: wrap into common Box base class
1227
1228	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1229		1392
1230	sub size_request {	1393	sub new {
1231	my ($self) = @_;	1394	my $class = shift;
1232		1395
1233	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1234		1397	vertical => 1,
1235	(	1398	@_,
1236	(List::Util::max map $_->[0], @alloc),
1237	(List::Util::sum map $_->[1], @alloc),
1238	)	1399	)
1239	}
1240
1241	sub size_allocate {
1242	my ($self, $w, $h) = @_;
1243
1244	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246	my $children = $self->{children};
1247
1248	my @h = map $_->{req_h}, @$children;
1249
1250	my $req_h = List::Util::sum @h;
1251
1252	if ($req_h > $h) {
1253	# ah well, not enough space
1254	$_ *= $h / $req_h for @h;
1255	} else {
1256	my $exp = List::Util::sum map $_->{expand}, @$children;
1257	$exp ||= 1;
1258
1259	for (0 .. $#$children) {
1260	my $child = $children->[$_];
1261
1262	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263	}
1264	}
1265
1266	CFClient::UI::harmonize \@h;
1267
1268	my $y = 0;
1269	for (0 .. $#$children) {
1270	my $child = $children->[$_];
1271	my $h = $h[$_];
1272	$child->configure (0, $y, $w, $h);
1273
1274	$y += $h;
1275	}
1276
1277	1
1278	}	1400	}
1279		1401
1280	#############################################################################	1402	#############################################################################
1281		1403
1282	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1345	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1346		1468
1347	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1349		1471
		1472	$self->realloc;
1350	$self->update;	1473	$self->update;
1351	$self->check_size;
1352	}	1474	}
1353		1475
1354	sub set_markup {	1476	sub set_markup {
1355	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1356		1478
…		…
1360	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361		1483
1362	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1364		1486
		1487	$self->realloc;
1365	$self->update;	1488	$self->update;
1366	$self->check_size;
1367	}	1489	}
1368		1490
1369	sub size_request {	1491	sub size_request {
1370	my ($self) = @_;	1492	my ($self) = @_;
1371		1493
…		…
1392	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1393	)	1515	)
1394	}	1516	}
1395		1517
1396	sub size_allocate {	1518	sub size_allocate {
1397	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1398		1520
1399	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1400	}	1523	}
1401		1524
1402	sub set_fontsize {	1525	sub set_fontsize {
1403	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1404		1527
1405	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1406	delete $self->{texture};	1529	delete $self->{texture};
1407		1530
1408	$self->update;	1531	$self->realloc;
1409	$self->check_size;
1410	}	1532	}
1411		1533
1412	sub _draw {	1534	sub _draw {
1413	my ($self) = @_;	1535	my ($self) = @_;
1414		1536
…		…
1466	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1467	can_hover => 1,	1589	can_hover => 1,
1468	can_focus => 1,	1590	can_focus => 1,
1469	valign => 0,	1591	valign => 0,
1470	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1471	@_	1594	@_
1472	)	1595	)
1473	}	1596	}
1474		1597
1475	sub _set_text {	1598	sub _set_text {
…		…
1485	$self->{text} = $text;	1608	$self->{text} = $text;
1486		1609
1487	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1488	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1489		1612
1490	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1491	}	1614	}
1492		1615
1493	sub set_text {	1616	sub set_text {
1494	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1495		1618
1496	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1497	$self->_set_text ($text);	1620	$self->_set_text ($text);
1498	$self->update;	1621
1499	$self->check_size;	1622	$self->realloc;
1500	}	1623	}
1501		1624
1502	sub get_text {	1625	sub get_text {
1503	$_[0]{text}	1626	$_[0]{text}
1504	}	1627	}
…		…
1507	my ($self) = @_;	1630	my ($self) = @_;
1508		1631
1509	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1510		1633
1511	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1512	}
1513
1514	sub size_allocate {
1515	my ($self, $w, $h) = @_;
1516
1517	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518	}	1635	}
1519		1636
1520	sub key_down {	1637	sub key_down {
1521	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1522		1639
…		…
1537	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1538	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1539	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1540	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1541	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1542	$self->emit ('escape');	1659	$self->_emit ('escape');
1543	} elsif ($uni) {	1660	} elsif ($uni) {
1544	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1545	}	1662	}
1546		1663
1547	$self->_set_text ($text);	1664	$self->_set_text ($text);
1548	$self->update;	1665
1549	$self->check_size;	1666	$self->realloc;
1550	}	1667	}
1551		1668
1552	sub focus_in {	1669	sub focus_in {
1553	my ($self) = @_;	1670	my ($self) = @_;
1554		1671
…		…
1634	if ($sym == 13) {	1751	if ($sym == 13) {
1635	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1636	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1637	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1638	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1639	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1640	$self->update;	1757	$self->update;
1641		1758
1642	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1643	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1644	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1692	can_events => 1,	1809	can_events => 1,
1693	@_	1810	@_
1694	)	1811	)
1695	}	1812	}
1696		1813
		1814	sub activate { }
		1815
1697	sub button_up {	1816	sub button_up {
1698	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1699		1818
		1819	$self->emit ("activate")
1700	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1701	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1702	$self->emit ("activate");
1703	}
1704	}	1822	}
1705		1823
1706	sub _draw {	1824	sub _draw {
1707	my ($self) = @_;	1825	my ($self) = @_;
1708		1826
…		…
1760	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1761		1879
1762	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1765	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1766	}	1884	}
1767	}	1885	}
1768		1886
1769	sub _draw {	1887	sub _draw {
1770	my ($self) = @_;	1888	my ($self) = @_;
…		…
2045	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2046	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2047	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
2048	bg => [0, 0, 0, 0.2],	2166	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],	2167	active_bg => [1, 1, 1, 0.5],
2050	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2051	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2052	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2053	vertical => 0,	2171	vertical => 0,
2054	can_hover => 1,	2172	can_hover => 1,
2055	inner_pad => .05,	2173	inner_pad => 0.02,
2056	@_	2174	@_
2057	);	2175	);
2058		2176
2059	$self->set_value ($self->{range}[0]);	2177	$self->set_value ($self->{range}[0]);
2060	$self->update;	2178	$self->update;
2061		2179
2062	$self	2180	$self
2063	}	2181	}
2064		2182
		2183	sub changed { }
		2184
		2185	sub set_range {
		2186	my ($self, $range) = @_;
		2187
		2188	($range, $self->{range}) = ($self->{range}, $range);
		2189
		2190	$self->update
		2191	if "@$range" ne "@{$self->{range}}";
		2192	}
		2193
2065	sub set_value {	2194	sub set_value {
2066	my ($self, $value) = @_;	2195	my ($self, $value) = @_;
2067		2196
2068	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2197	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069		2198
2070	$hi = $lo + 1 if $hi <= $lo;	2199	$hi = $lo + 1 if $hi <= $lo;
2071		2200
		2201	$page = $hi - $lo if $page > $hi - $lo;
		2202
2072	$value = $lo if $value < $lo;	2203	$value = $lo if $value < $lo;
2073	$value = $hi if $value > $hi;	2204	$value = $hi - $page if $value > $hi - $page;
2074		2205
2075	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2206	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076	if $unit;	2207	if $unit;
2077		2208
2078	$page = $hi - $lo if $page > $hi - $lo;
2079
2080	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2209	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081		2210
2082	if ($value != $old_value) {	2211	if ($value != $old_value) {
2083	$self->emit (changed => $value);	2212	$self->_emit (changed => $value);
2084	$self->update;	2213	$self->update;
2085	}	2214	}
2086	}	2215	}
2087		2216
2088	sub size_request {	2217	sub size_request {
…		…
2096		2225
2097	sub button_down {	2226	sub button_down {
2098	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
2099		2228
2100	$self->SUPER::button_down ($ev, $x, $y);	2229	$self->SUPER::button_down ($ev, $x, $y);
		2230
		2231	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2232
2101	$self->mouse_motion ($ev, $x, $y);	2233	$self->mouse_motion ($ev, $x, $y);
2102	}	2234	}
2103		2235
2104	sub mouse_motion {	2236	sub mouse_motion {
2105	my ($self, $ev, $x, $y) = @_;	2237	my ($self, $ev, $x, $y) = @_;
…		…
2107	if ($GRAB == $self) {	2239	if ($GRAB == $self) {
2108	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109		2241
2110	my (undef, $lo, $hi, $page) = @{$self->{range}};	2242	my (undef, $lo, $hi, $page) = @{$self->{range}};
2111		2243
2112	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2244	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113		2245
2114	$self->set_value ($x * ($hi - $lo) + $lo);	2246	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115	}	2247	}
2116	}	2248	}
2117		2249
2118	sub update {	2250	sub update {
2119	my ($self) = @_;	2251	my ($self) = @_;
2120		2252
2121	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2253	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122	$self->set_value ($self->{range}[0]);	2254	$self->set_value ($self->{range}[0]);
2123		2255
2124	my ($value, $lo, $hi, $page) = @{$self->{range}};	2256	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2257	my $range = ($hi - $page - $lo) || 1e-100;
2125		2258
2126	my $inner_w = 1 - 2 * $self->{inner_pad};	2259	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127		2260
2128	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2261	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2262	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129		2263
2130	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2264	$value = ($value - $lo) / $range;
2131	$value = $self->{scale} * ($value - $lo);	2265	$value = $value * $self->{scale} + $self->{offset};
2132		2266
2133	$value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135	$value = 0 if $value < 0;
2136	$page = 1 - $value if $value + $page > 1;
2137
2138	$self->{knob_x} = $value;	2267	$self->{knob_x} = $value - $knob_w * 0.5;
2139	$self->{knob_w} = $page;	2268	$self->{knob_w} = $knob_w;
2140	});	2269	});
2141		2270
2142	$self->SUPER::update;	2271	$self->SUPER::update;
2143	}	2272	}
2144		2273
…		…
2168	# draw handle	2297	# draw handle
2169	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2298	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170		2299
2171	glDisable GL_TEXTURE_2D;	2300	glDisable GL_TEXTURE_2D;
2172	}	2301	}
		2302
		2303	#############################################################################
		2304
		2305	package CFClient::UI::ValSlider;
		2306
		2307	our @ISA = CFClient::UI::HBox::;
		2308
		2309	sub new {
		2310	my ($class, %arg) = @_;
		2311
		2312	my $range = delete $arg{range};
		2313
		2314	my $self = $class->SUPER::new (
		2315	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2316	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2317	to_value => sub { shift },
		2318	from_value => sub { shift },
		2319	%arg,
		2320	);
		2321
		2322	$self->{slider}->connect (changed => sub {
		2323	my ($self, $value) = @_;
		2324	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2325	$self->{parent}->emit (changed => $value);
		2326	});
		2327
		2328	# $self->{entry}->connect (changed => sub {
		2329	# my ($self, $value) = @_;
		2330	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2331	# $self->{parent}->emit (changed => $value);
		2332	# });
		2333
		2334	$self->add ($self->{slider}, $self->{entry});
		2335
		2336	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2337
		2338	$self
		2339	}
		2340
		2341	sub set_range { shift->{slider}->set_range (@_) }
		2342	sub set_value { shift->{slider}->set_value (@_) }
2173		2343
2174	#############################################################################	2344	#############################################################################
2175		2345
2176	package CFClient::UI::TextView;	2346	package CFClient::UI::TextView;
2177		2347
…		…
2207		2377
2208	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2209	$self->reflow;	2379	$self->reflow;
2210	}	2380	}
2211		2381
2212	sub text_height {
2213	my ($self, $text) = @_;
2214
2215	my $layout = $self->{layout};
2216
2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218	$layout->set_width ($self->{children}[0]{w});
2219	$layout->set_markup ($text);
2220
2221	($layout->size)[1]
2222	}
2223
2224	sub reflow {
2225	my ($self) = @_;
2226
2227	$self->{need_reflow}++;
2228	$self->update;
2229	}
2230
2231	sub size_allocate {	2382	sub size_allocate {
2232	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2233		2384
2234	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2235		2388
2236	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2237	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2239		2392
2240	$self->reflow;	2393	$self->reflow;
2241	}	2394	}
2242		2395
		2396	sub text_size {
		2397	my ($self, $text, $indent) = @_;
		2398
		2399	my $layout = $self->{layout};
		2400
		2401	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2402	$layout->set_width ($self->{children}[0]{w} - $indent);
		2403	$layout->set_markup ($text);
		2404
		2405	$layout->size
		2406	}
		2407
		2408	sub reflow {
		2409	my ($self) = @_;
		2410
		2411	$self->{need_reflow}++;
		2412	$self->update;
		2413	}
		2414
		2415	sub set_offset {
		2416	my ($self, $offset) = @_;
		2417
		2418	# todo: base offset on lines or so, not on pixels
		2419	$self->{children}[1]->set_value ($offset);
		2420	}
		2421
		2422	sub clear {
		2423	my ($self) = @_;
		2424
		2425	$self->{par} = [];
		2426	$self->{height} = 0;
		2427	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2428	}
		2429
2243	sub add_paragraph {	2430	sub add_paragraph {
2244	my ($self, $color, $text) = @_;	2431	my ($self, $color, $text, $indent) = @_;
2245		2432
2246	#TODO: intelligently "reformat" paragraph	2433	for my $line (split /\n/, $text) {
2247		2434	my ($w, $h) = $self->text_size ($line);
2248	my $height = $self->text_height ($text);
2249
2250	$self->{height} += $height;	2435	$self->{height} += $h;
		2436	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2437	}
2251		2438
2252	push @{$self->{par}}, [$height, $color, $text];
2253
2254	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2439	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255	$self->{children}[1]->update;
2256	}	2440	}
2257		2441
2258	sub update {	2442	sub update {
2259	my ($self) = @_;	2443	my ($self) = @_;
2260		2444
…		…
2263	return unless $self->{h} > 0;	2447	return unless $self->{h} > 0;
2264		2448
2265	delete $self->{texture};	2449	delete $self->{texture};
2266		2450
2267	$ROOT->on_post_alloc ($self, sub {	2451	$ROOT->on_post_alloc ($self, sub {
		2452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2453
2268	if (delete $self->{need_reflow}) {	2454	if (delete $self->{need_reflow}) {
2269	my $height = 0;	2455	my $height = 0;
2270		2456
2271	$height += $_->[0] = $self->text_height ($_->[2])	2457	my $layout = $self->{layout};
		2458
		2459	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2460
2272	for @{$self->{par}};	2461	for (@{$self->{par}}) {
		2462	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2463	$layout->set_width ($W - $_->[3]);
		2464	$layout->set_markup ($_->[4]);
		2465	my ($w, $h) = $layout->size;
		2466	$_->[0] = $w + $_->[3];
		2467	$_->[1] = $h;
		2468	}
		2469
		2470	$height += $_->[1];
		2471	}
2273		2472
2274	$self->{height} = $height;	2473	$self->{height} = $height;
2275		2474
2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2475	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277		2476
2278	delete $self->{texture};	2477	delete $self->{texture};
2279	}	2478	}
2280		2479
2281	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2480	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282	glClearColor 0.5, 0.5, 0.5, 0;	2481	glClearColor 0.5, 0.5, 0.5, 0;
2283	glClear GL_COLOR_BUFFER_BIT;	2482	glClear GL_COLOR_BUFFER_BIT;
2284		2483
2285	glEnable GL_TEXTURE_2D;
2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288	my $top = int $self->{children}[1]{range}[0];	2484	my $top = int $self->{children}[1]{range}[0];
2289		2485
2290	my $y0 = $top;	2486	my $y0 = $top;
2291	my $y1 = $top + $self->{h};	2487	my $y1 = $top + $H;
2292		2488
2293	my $y = 0;	2489	my $y = 0;
2294		2490
2295	my $layout = $self->{layout};	2491	my $layout = $self->{layout};
2296		2492
2297	$layout->set_font ($self->{font}) if $self->{font};	2493	$layout->set_font ($self->{font}) if $self->{font};
2298		2494
		2495	glEnable GL_BLEND;
		2496	#TODO# not correct in windows where rgba is forced off
		2497	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2498
2299	for my $par (@{$self->{par}}) {	2499	for my $par (@{$self->{par}}) {
2300	my $h = $par->[0];	2500	my $h = $par->[1];
2301		2501
2302	if ($y0 < $y + $h && $y < $y1) {	2502	if ($y0 < $y + $h && $y < $y1) {
2303	$layout->set_foreground (@{ $par->[1] });	2503	$layout->set_foreground (@{ $par->[2] });
		2504	$layout->set_width ($W - $par->[3]);
2304	$layout->set_markup ($par->[2]);	2505	$layout->set_markup ($par->[4]);
2305		2506
2306	my ($W, $H) = $layout->size;	2507	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2508
		2509	glRasterPos $par->[3], $y - $y0;
		2510	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308	}	2511	}
2309		2512
2310	$y += $h;	2513	$y += $h;
2311	}	2514	}
2312		2515
2313	glDisable GL_TEXTURE_2D;	2516	glDisable GL_BLEND;
2314	};	2517	};
2315	});	2518	});
2316	}	2519	}
2317		2520
2318	sub _draw {	2521	sub _draw {
…		…
2378		2581
2379	sub new {	2582	sub new {
2380	my $class = shift;	2583	my $class = shift;
2381		2584
2382	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2383	state => 0,	2586	state => 0,
2384	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2385	@_	2588	@_
2386	);	2589	);
2387		2590
2388	if ($self->{state}) {
2389	$self->{state} = 0;
2390	$self->toggle_flopper;
2391	}
2392
2393	$self	2591	$self
2394	}	2592	}
2395		2593
2396	sub toggle_flopper {	2594	sub toggle_flopper {
2397	my ($self) = @_;	2595	my ($self) = @_;
2398		2596
2399	# TODO: use animation	2597	$self->{other}->toggle_visibility;
2400	if ($self->{state} = !$self->{state}) {
2401	$CFClient::UI::ROOT->add ($self->{other});
2402	$self->{other}->move ($self->coord2global (0, $self->{h}));
2403	$self->emit ("open");
2404	} else {
2405	$CFClient::UI::ROOT->remove ($self->{other});
2406	$self->emit ("close");
2407	}
2408
2409	$self->emit (changed => $self->{state});
2410	}	2598	}
2411		2599
2412	#############################################################################	2600	#############################################################################
2413		2601
2414	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2446		2634
2447	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2448	}	2636	}
2449		2637
2450	sub size_allocate {	2638	sub size_allocate {
2451	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2452		2640
		2641	return unless $changed;
		2642
2453	$self->SUPER::size_allocate ($w - 4, $h - 4);	2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2454	}	2644	}
2455		2645
2456	sub _draw {	2646	sub _draw {
2457	my ($self) = @_;	2647	my ($self) = @_;
2458		2648
…		…
2475	glVertex $w, $h;	2665	glVertex $w, $h;
2476	glVertex $w, 0;	2666	glVertex $w, 0;
2477	glEnd;	2667	glEnd;
2478		2668
2479	glTranslate 2 - 0.375, 2 - 0.375;	2669	glTranslate 2 - 0.375, 2 - 0.375;
		2670
2480	$self->SUPER::_draw;	2671	$self->SUPER::_draw;
2481	}	2672	}
2482		2673
2483	#############################################################################	2674	#############################################################################
2484		2675
…		…
2489	use CFClient::OpenGL;	2680	use CFClient::OpenGL;
2490		2681
2491	sub new {	2682	sub new {
2492	my $class = shift;	2683	my $class = shift;
2493		2684
2494	$class->SUPER::new (	2685	my $self = $class->SUPER::new (
2495	aspect => 1,	2686	aspect => 1,
		2687	can_events => 0,
2496	@_,	2688	@_,
2497	)	2689	);
		2690
		2691	if ($self->{anim} && $self->{animspeed}) {
		2692	Scalar::Util::weaken (my $widget = $self);
		2693
		2694	$self->{timer} = Event->timer (
		2695	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2696	hard => 1,
		2697	interval => $self->{animspeed},
		2698	cb => sub {
		2699	++$widget->{frame};
		2700	$widget->update;
		2701	},
		2702	);
		2703	}
		2704
		2705	$self
2498	}	2706	}
2499		2707
2500	sub size_request {	2708	sub size_request {
2501	(32, 8)	2709	(32, 8)
2502	}	2710	}
2503		2711
		2712	sub update {
		2713	my ($self) = @_;
		2714
		2715	return unless $self->{visible};
		2716
		2717	$self->SUPER::update;
		2718	}
		2719
2504	sub _draw {	2720	sub _draw {
2505	my ($self) = @_;	2721	my ($self) = @_;
2506		2722
2507	return unless $::CONN;#d# manage and cache textures differently	2723	return unless $::CONN;
		2724
		2725	my $face;
		2726
		2727	if ($self->{frame}) {
		2728	my $anim = $::CONN->{anim}[$self->{anim}];
		2729
		2730	$face = $anim->[ $self->{frame} % @$anim ]
		2731	if $anim && @$anim;
		2732	}
		2733
2508	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2734	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509		2735
2510	# TODO animation
2511	if ($tex) {	2736	if ($tex) {
2512	glEnable GL_TEXTURE_2D;	2737	glEnable GL_TEXTURE_2D;
2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514	glColor 1, 1, 1, 1;	2739	glColor 1, 1, 1, 1;
2515	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2740	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2517	}	2742	}
2518	}	2743	}
2519		2744
2520	#############################################################################	2745	sub DESTROY {
		2746	my ($self) = @_;
2521		2747
		2748	$self->{timer}->cancel
		2749	if $self->{timer};
		2750
		2751	$self->SUPER::DESTROY;
		2752	}
		2753
		2754	#############################################################################
		2755
2522	package CFClient::UI::InventoryItem;	2756	package CFClient::UI::Inventory;
2523		2757
2524	our @ISA = CFClient::UI::HBox::;	2758	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub _item_to_desc {
2527	my ($item) = @_;
2528
2529	my $desc =
2530	$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	$desc
2550	}
2551		2759
2552	sub new {	2760	sub new {
2553	my $class = shift;	2761	my $class = shift;
2554		2762
2555	my %args = @_;
2556
2557	my $item = delete $args{item};
2558
2559	my $desc = _item_to_desc ($item);
2560
2561	my $self = $class->SUPER::new (	2763	my $self = $class->SUPER::new (
2562	can_hover => 1,	2764	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563	can_events => 1,
2564	tooltip => ((CFClient::UI::Label::escape $desc)
2565	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566	connect_button_down => sub {
2567	my ($self, $ev, $x, $y) = @_;
2568
2569	# todo: maybe put examine on 1? but should just be a tooltip :(
2570	if ($ev->{button} == 1) {
2571	my $targ = $::CONN->{player}{tag};
2572
2573	if ($item->{container} == $::CONN->{player}{tag}) {
2574	$targ = $main::OPENCONT;
2575	}
2576
2577	$::CONN->send ("move $targ $item->{tag} 0");
2578	} elsif ($ev->{button} == 2) {
2579	$::CONN->send ("apply $item->{tag}");
2580	} elsif ($ev->{button} == 3) {
2581	my @menu_items = (
2582	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586	[
2587	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588	sub { $::CONN->send ("lock $item->{tag}") },
2589	],
2590	);
2591
2592	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593	}
2594
2595	1
2596	},
2597	%args
2598	);
2599
2600
2601	$self->add (new CFClient::UI::Face
2602	can_events => 0,
2603	face => $item->{face},
2604	anim => $item->{anim},
2605	animspeed => $item->{animspeed},
2606	);
2607
2608	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610	$self->{item} = $item;
2611
2612	$self->update_item;
2613
2614	$self
2615	}
2616
2617	sub update_item {
2618	my ($self) = @_;
2619
2620	my $desc = _item_to_desc ($self->{item});
2621
2622	$self->{name_lbl}->set_text ($desc);
2623	}
2624
2625	#############################################################################
2626
2627	package CFClient::UI::Inventory;
2628
2629	our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631	sub new {
2632	my $class = shift;
2633
2634	my $self = $class->SUPER::new (
2635	scrolled => (new CFClient::UI::VBox),
2636	@_,	2765	@_,
2637	);	2766	);
2638		2767
2639	$self	2768	$self
2640	}	2769	}
…		…
2650	or ($a->{name} cmp $b->{name})	2779	or ($a->{name} cmp $b->{name})
2651	} @$items;	2780	} @$items;
2652		2781
2653	$self->{real_items} = \@items;	2782	$self->{real_items} = \@items;
2654		2783
		2784	my $row = 0;
2655	for my $item (@items) {	2785	for my $item (@items) {
2656	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2786	CFClient::Item::update_widgets $item;
2657	$item->update_item ();
2658	}
2659		2787
2660	$self->{scrolled}->add (@items);	2788	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2789	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2790	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2661		2791
2662	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2792	$row++;
2663	}	2793	}
2664
2665	sub size_request {
2666	my ($self) = @_;
2667	($self->{req_w}, $self->{req_h});
2668	}	2794	}
2669		2795
2670	#############################################################################	2796	#############################################################################
2671		2797
2672	package CFClient::UI::Menu;	2798	package CFClient::UI::Menu;
…		…
2707		2833
2708	# popup given the event (must be a mouse button down event currently)	2834	# popup given the event (must be a mouse button down event currently)
2709	sub popup {	2835	sub popup {
2710	my ($self, $ev) = @_;	2836	my ($self, $ev) = @_;
2711		2837
2712	$self->emit ("popdown");	2838	$self->_emit ("popdown");
2713		2839
2714	# maybe save $GRAB? must be careful about events...	2840	# maybe save $GRAB? must be careful about events...
2715	$GRAB = $self;	2841	$GRAB = $self;
2716	$self->{button} = $ev->{button};	2842	$self->{button} = $ev->{button};
2717		2843
…		…
2732		2858
2733	if ($ev->{button} == $self->{button}) {	2859	if ($ev->{button} == $self->{button}) {
2734	undef $GRAB;	2860	undef $GRAB;
2735	$self->hide;	2861	$self->hide;
2736		2862
2737	$self->emit ("popdown");	2863	$self->_emit ("popdown");
2738	$self->{hover}[1]->() if $self->{hover};	2864	$self->{hover}[1]->() if $self->{hover};
2739	}	2865	}
2740	}	2866	}
2741		2867
2742	#############################################################################	2868	#############################################################################
…		…
2804	sub add {	2930	sub add {
2805	my ($self, $text, %arg) = @_;	2931	my ($self, $text, %arg) = @_;
2806		2932
2807	$text =~ s/^\s+//;	2933	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	2934	$text =~ s/\s+$//;
		2935
		2936	return unless $text;
2809		2937
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	2938	my $timeout = time + ((delete $arg{timeout}) || 60);
2811		2939
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2940	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		2941
…		…
2856	use CFClient::OpenGL;	2984	use CFClient::OpenGL;
2857		2985
2858	sub new {	2986	sub new {
2859	my $class = shift;	2987	my $class = shift;
2860		2988
2861	$class->SUPER::new (	2989	my $self = $class->SUPER::new (
		2990	visible => 1,
2862	@_,	2991	@_,
2863	)	2992	);
		2993
		2994	Scalar::Util::weaken ($self->{root} = $self);
		2995
		2996	$self
2864	}	2997	}
2865		2998
2866	sub configure {	2999	sub configure {
2867	my ($self, $x, $y, $w, $h) = @_;	3000	my ($self, $x, $y, $w, $h) = @_;
2868		3001
2869	$self->{w} = $w;	3002	$self->{w} = $w;
2870	$self->{h} = $h;	3003	$self->{h} = $h;
2871	}	3004	}
2872		3005
2873	sub check_size {	3006	sub reconfigure {
2874	my ($self) = @_;	3007	my ($self) = @_;
2875		3008
		3009	$self->SUPER::reconfigure;
		3010
2876	$self->size_allocate ($self->{w}, $self->{h})	3011	$self->size_allocate ($self->{w}, $self->{h}, 1)
2877	if $self->{w};	3012	if $self->{w};
2878	}	3013	}
2879		3014
2880	sub size_request {	3015	sub size_request {
2881	my ($self) = @_;	3016	my ($self) = @_;
2882		3017
2883	($self->{w}, $self->{h})	3018	($self->{w}, $self->{h})
2884	}	3019	}
2885		3020
2886	sub size_allocate {	3021	sub size_allocate {
2887	my ($self, $w, $h) = @_;	3022	my ($self, $w, $h, $changed) = @_;
2888
2889	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894		3023
2895	for my $child ($self->children) {	3024	for my $child ($self->children) {
2896	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897		3026
2898	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899	if exists $child->{req_x};	3028	if exists $child->{req_x};
2900		3029
2901	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902	if exists $child->{req_y};	3031	if exists $child->{req_y};
2903		3032
		3033	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3034
2904	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3035	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3036	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906		3037
2907	$child->configure ($X, $Y, $W, $H);	3038	$child->configure ($X, $Y, $W, $H);
2908	}	3039	}
…		…
2921	}	3052	}
2922		3053
2923	sub update {	3054	sub update {
2924	my ($self) = @_;	3055	my ($self) = @_;
2925		3056
2926	$self->check_size;
2927	$::WANT_REFRESH++;	3057	$::WANT_REFRESH++;
2928	}	3058	}
2929		3059
2930	sub add {	3060	sub add {
2931	my ($self, @children) = @_;	3061	my ($self, @children) = @_;
2932		3062
2933	for my $child (@children) {	3063	for my $child (@children) {
2934	$child->{toplevel} = 1;	3064	$child->{is_toplevel} = 1;
2935		3065
2936	# integerise window positions	3066	# integerise window positions
2937	$child->{x} = int $child->{x};	3067	$child->{x} = int $child->{x};
2938	$child->{y} = int $child->{y};	3068	$child->{y} = int $child->{y};
2939	}	3069	}
2940		3070
2941	$self->SUPER::add (@children);	3071	$self->SUPER::add (@children);
2942	}	3072	}
2943		3073
		3074	sub remove {
		3075	my ($self, @children) = @_;
		3076
		3077	$self->SUPER::remove (@children);
		3078
		3079	while (@children) {
		3080	my $w = pop @children;
		3081	push @children, $w->children;
		3082	$w->set_invisible;
		3083	}
		3084	}
		3085
2944	sub on_refresh {	3086	sub on_refresh {
2945	my ($self, $id, $cb) = @_;	3087	my ($self, $id, $cb) = @_;
2946		3088
2947	$self->{refresh_hook}{$id} = $cb;	3089	$self->{refresh_hook}{$id} = $cb;
2948	}	3090	}
…		…
2959	while ($self->{refresh_hook}) {	3101	while ($self->{refresh_hook}) {
2960	$_->()	3102	$_->()
2961	for values %{delete $self->{refresh_hook}};	3103	for values %{delete $self->{refresh_hook}};
2962	}	3104	}
2963		3105
2964	if ($self->{check_size}) {	3106	if ($self->{realloc}) {
2965	my @queue = ([], []);	3107	my @queue;
2966		3108
2967	for (;;) {	3109	while () {
2968	if ($self->{check_size}) {	3110	if ($self->{realloc}) {
2969	# heuristic: check containers last	3111	#TODO use array-of-depth approach
2970	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3112
2971	for values %{delete $self->{check_size}}	3113	@queue = sort { $a->{visible} <=> $b->{visible} }
		3114	@queue, values %{delete $self->{realloc}};
2972	}	3115	}
2973		3116
2974	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3117	my $widget = pop @queue || last;
2975		3118
		3119	$widget->{visible} or last; # do not resize invisible widgets
		3120
2976	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3121	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2977	? @$widget{qw(user_w user_h)}	3122	? @$widget{qw(def_w def_h)}
2978	: $widget->size_request;	3123	: $widget->size_request;
2979		3124
2980	if (delete $widget->{force_alloc}
2981	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3125	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983		3126
2984	$widget->{req_w} = $w;	3127	$widget->{req_w} = $w;
2985	$widget->{req_h} = $h;	3128	$widget->{req_h} = $h;
2986		3129
2987	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3130	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2988		3131
2989	$widget->{parent}->check_size	3132	push @queue, $widget->{parent}
2990	if $widget->{parent};	3133	if $widget->{parent};
2991	}
2992	}	3134	}
2993	}	3135	}
2994		3136
2995	while ($self->{size_alloc}) {	3137	while (my $size_alloc = delete $self->{size_alloc}) {
2996	for (values %{delete $self->{size_alloc}}) {	3138	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2997	my ($widget, $w, $h) = @$_;	3139	values %$size_alloc;
		3140
		3141	while () {
		3142	my ($widget, $w, $h) = @{ pop @queue or last };
2998		3143
2999	$w = 0 if $w < 0;	3144	$w = 0 if $w < 0;
3000	$h = 0 if $h < 0;	3145	$h = 0 if $h < 0;
3001		3146
		3147	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3148
3002	$widget->{w} = $w;	3149	$widget->{w} = $w;
3003	$widget->{h} = $h;	3150	$widget->{h} = $h;
3004	$widget->size_allocate ($w, $h);	3151
3005	$widget->emit (size_allocate => $w, $h);	3152	$widget->emit (size_allocate => $w, $h, $changed);
3006	}	3153	}
3007	}	3154	}
3008		3155
3009	while ($self->{post_alloc_hook}) {	3156	while ($self->{post_alloc_hook}) {
3010	$_->()	3157	$_->()
…		…
3015	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3162	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016	glClear GL_COLOR_BUFFER_BIT;	3163	glClear GL_COLOR_BUFFER_BIT;
3017		3164
3018	glMatrixMode GL_PROJECTION;	3165	glMatrixMode GL_PROJECTION;
3019	glLoadIdentity;	3166	glLoadIdentity;
3020	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3167	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021	glMatrixMode GL_MODELVIEW;	3168	glMatrixMode GL_MODELVIEW;
3022	glLoadIdentity;	3169	glLoadIdentity;
3023		3170
3024	$self->_draw;	3171	$self->_draw;
3025	}	3172	}

Diff Legend

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