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

Diff Legend

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