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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 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}) {
23		43
24	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
25	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
26		48
27	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
28		50
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		52
31	$TOOLTIP->set_tooltip_from ($widget);	53	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	54	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	55	}
43		56
44	return;	57	return;
45	}	58	}
46	}	59	}
…		…
50	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
51	}	64	}
52		65
53	# class methods for events	66	# class methods for events
54	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	68	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	69	if $FOCUS;
57	}	70	}
58		71
59	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	73	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	74	if $FOCUS;
62	}	75	}
63		76
64	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	78	my ($ev) = @_;
…		…
74	check_tooltip;	87	check_tooltip;
75	}	88	}
76		89
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		91
79	if ($GRAB) {	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	94	}
84		95
85	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	97	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
88		99
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		101
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		103
93	if ($GRAB) {	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	105	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		106
98	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	109	$grab->update if $grab;
101	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		127
119	check_tooltip;	128	check_tooltip;
120	}	129	}
121		130
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	132	if $HOVER;
126	}	133	}
127		134
128	# convert position array to integers	135	# convert position array to integers
129	sub harmonize {	136	sub harmonize {
130	my ($vals) = @_;	137	my ($vals) = @_;
…		…
144		151
145	$_->update	152	$_->update
146	for @widgets;	153	for @widgets;
147	}	154	}
148		155
		156	sub reconfigure_widgets {
		157	# make a copy, otherwise C<for> complains about freed values.
		158	my @widgets = values %WIDGET;
		159
		160	$_->reconfigure
		161	for @widgets;
		162	}
		163
149	# call when resolution changes etc.	164	# call when resolution changes etc.
150	sub rescale_widgets {	165	sub rescale_widgets {
151	my ($sx, $sy) = @_;	166	my ($sx, $sy) = @_;
152		167
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	168	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	169	if ($widget->{is_toplevel}) {
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	170	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	171	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	172	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	173	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	174	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	175	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166	}	176	}
167
168	$widget->reconfigure;
169	}	177	}
		178
		179	reconfigure_widgets;
170	}	180	}
171		181
172	#############################################################################	182	#############################################################################
173		183
174	package CFClient::UI::Base;	184	package CFClient::UI::Base;
…		…
187	can_events => 1,	197	can_events => 1,
188	@_	198	@_
189	}, $class;	199	}, $class;
190		200
191	for (keys %$self) {	201	for (keys %$self) {
192	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
194	}	204	}
195	}	205	}
196		206
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198		208
		209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		210	$self->{req_x} = $layout->{x} * $::WIDTH;
		211	$self->{req_y} = $layout->{y} * $::HEIGHT;
		212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		214	}
		215
199	$self	216	$self
200	}	217	}
201		218
202	sub destroy {	219	sub destroy {
203	my ($self) = @_;	220	my ($self) = @_;
…		…
206	%$self = ();	223	%$self = ();
207	}	224	}
208		225
209	sub show {	226	sub show {
210	my ($self) = @_;	227	my ($self) = @_;
		228
211	return if $self->{parent};	229	return if $self->{parent};
212		230
213	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
214	}	232	}
215		233
216	sub show_centered {	234	sub center {
217	my ($self) = @_;	235	my ($self) = @_;
218	return if $self->{parent};
219
220	$self->show;
221		236
222	$CFClient::UI::ROOT->on_post_alloc (	237	$CFClient::UI::ROOT->on_post_alloc (
223	"centered $self" => sub {	238	"center_$self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225	},	240	},
226	);	241	);
227	}
228		242
229	sub hide {	243	$self->update;
		244	}
		245
		246	sub set_visible {
230	my ($self) = @_;	247	my ($self) = @_;
		248
		249	return if $self->{visible};
		250
		251	$self->{root} = $self->{parent}{root};
		252	$self->{visible} = $self->{parent}{visible} + 1;
		253
		254	$self->emit (visibility_change => 1);
		255
		256	$self->realloc if !exists $self->{req_w};
		257
		258	$_->set_visible for $self->children;
		259	}
		260
		261	sub set_invisible {
		262	my ($self) = @_;
		263
		264	return unless $self->{visible};
		265
		266	$_->set_invisible for $self->children;
		267
		268	delete $self->{root};
		269	delete $self->{visible};
231		270
232	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	272	undef $HOVER if $HOVER == $self;
		273
		274	CFClient::UI::check_tooltip
		275	if $TOOLTIP->{owner} == $self;
		276
		277	$self->focus_out;
		278
		279	$self->emit (visibility_change => 0);
		280	}
		281
		282	sub set_visibility {
		283	my ($self, $visible) = @_;
		284
		285	return if $self->{visible} == $visible;
		286
		287	$visible ? $self->hide
		288	: $self->show;
		289	}
		290
		291	sub toggle_visibility {
		292	my ($self) = @_;
		293
		294	$self->{visible}
		295	? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub hide {
		300	my ($self) = @_;
		301
		302	$self->set_invisible;
234		303
235	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
236	if $self->{parent};	305	if $self->{parent};
237	}	306	}
238		307
…		…
247	}	316	}
248		317
249	sub set_size {	318	sub set_size {
250	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
251		320
252	$self->{user_w} = $w;	321	$self->{def_w} = $w;
253	$self->{user_h} = $h;	322	$self->{def_h} = $h;
254		323
255	$self->check_size;	324	$self->realloc;
256	}	325	}
257		326
258	sub size_request {	327	sub size_request {
259	require Carp;	328	require Carp;
260	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
280	$self->{y} = $y;	349	$self->{y} = $y;
281	$self->update;	350	$self->update;
282	}	351	}
283		352
284	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
		354	return unless $self->{visible};
		355
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
286	}	357	}
287	}	358	}
288		359
289	sub size_allocate {	360	sub size_allocate {
290	# nothing to be done	361	# nothing to be done
291	}	362	}
292		363
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	364	sub children {
301	}	365	}
302		366
303	sub set_max_size {	367	sub set_max_size {
304	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	372	}
309		373
310	sub set_tooltip {	374	sub set_tooltip {
311	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
312		381
313	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
314		383
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	407	return if $FOCUS == $self;
339	return unless $self->{can_focus};	408	return unless $self->{can_focus};
340		409
341	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
342		411
343	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
344		413
345	$focus->update if $focus;	414	$focus->update if $focus;
346	$FOCUS->update;	415	$FOCUS->update;
347	}	416	}
348		417
…		…
351		420
352	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
353		422
354	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
355		424
356	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
357		426
358	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
359	}	431	}
360		432
361	sub mouse_motion { }	433	sub mouse_motion { }
362	sub button_up { }	434	sub button_up { }
363	sub key_down { }	435	sub key_down { }
364	sub key_up { }	436	sub key_up { }
365		437
366	sub button_down {	438	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
368		440
369	$self->focus_in;	441	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		449
		450	sub find_widget {
		451	my ($self, $x, $y) = @_;
		452
		453	return () unless $self->{can_events};
		454
		455	return $self
		456	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		457	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		458
		459	()
		460	}
		461
		462	sub set_parent {
		463	my ($self, $parent) = @_;
		464
		465	Scalar::Util::weaken ($self->{parent} = $parent);
		466
		467	$self->set_visible if $parent->{visible};
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub _emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		480	}
		481
		482	sub emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	$self->_emit ($signal, @args)
		486	|| $self->$signal (@args);
		487	}
		488
		489	sub visibility_change {
		490	#my ($self, $visible) = @_;
		491	}
		492
		493	sub realloc {
		494	my ($self) = @_;
		495
		496	if ($self->{visible}) {
		497	return if $self->{root}{realloc}{$self};
		498
		499	$self->{root}{realloc}{$self} = $self;
		500	$self->{root}->update;
		501	} else {
		502	delete $self->{req_w};
		503	}
		504	}
		505
		506	sub update {
		507	my ($self) = @_;
		508
		509	$self->{parent}->update
		510	if $self->{parent};
		511	}
377		512
378	sub draw {	513	sub draw {
379	my ($self) = @_;	514	my ($self) = @_;
380		515
381	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
403	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
404	glPushMatrix;	539	glPushMatrix;
405	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	543	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
412	glEnd;	547	glEnd;
413	glPopMatrix;	548	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	550	}
416	}	551	}
417		552
418	sub _draw {	553	sub _draw {
419	my ($self) = @_;	554	my ($self) = @_;
420		555
421	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	557	}
473		558
474	sub DESTROY {	559	sub DESTROY {
475	my ($self) = @_;	560	my ($self) = @_;
476		561
…		…
573	$self->{children} = [	658	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	660	@{$self->{children}}, @widgets
576	];	661	];
577		662
578	$self->check_size (1);	663	$self->realloc;
579	$self->update;
580	}	664	}
581		665
582	sub children {	666	sub children {
583	@{ $_[0]{children} }	667	@{ $_[0]{children} }
584	}	668	}
…		…
589	delete $child->{parent};	673	delete $child->{parent};
590	$child->hide;	674	$child->hide;
591		675
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		677
594	$self->check_size;	678	$self->realloc;
595	$self->update;
596	}	679	}
597		680
598	sub clear {	681	sub clear {
599	my ($self) = @_;	682	my ($self) = @_;
600		683
…		…
604	for (@$children) {	687	for (@$children) {
605	delete $_->{parent};	688	delete $_->{parent};
606	$_->hide;	689	$_->hide;
607	}	690	}
608		691
609	$self->check_size;	692	$self->realloc;
610	$self->update;
611	}	693	}
612		694
613	sub find_widget {	695	sub find_widget {
614	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
615		697
…		…
668	sub size_request {	750	sub size_request {
669	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
670	}	752	}
671		753
672	sub size_allocate {	754	sub size_allocate {
673	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
674		756
675	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	758	}
677		759
678	#############################################################################	760	#############################################################################
…		…
695	$ROOT->on_post_alloc ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
696	$self->SUPER::update;	778	$self->SUPER::update;
697	}	779	}
698		780
699	sub size_allocate {	781	sub size_allocate {
700	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
701		783
702	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
703	$self->update;	785	$self->update
		786	if $changed;
704	}	787	}
705		788
706	sub _render {	789	sub _render {
707	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
708	}	791	}
…		…
739		822
740	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
741		824
742	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
743		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
744	sub size_request {	837	sub size_request {
745	my ($self) = @_;	838	my ($self) = @_;
746		839
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
749		841
750	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
751	}	846	}
752		847
753	sub size_allocate {	848	sub size_allocate {
754	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
755		850
		851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		853
		854	$self->child->configure (0, 0, $w, $h);
756	$self->update;	855	$self->update;
757	}	856	}
758		857
759	sub set_offset {	858	sub set_offset {
760	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
811	my $class = shift;	910	my $class = shift;
812		911
813	my $self;	912	my $self;
814		913
815	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
816	vertical => 1,	915	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	917	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	918	$self->{vp}->set_offset (0, $_[1]);
820	},	919	},
821	;	920	;
822		921
823	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	923	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
829	$self->{vp}->add ($self->{scrolled});	928	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});	929	$self->add ($self->{vp});
831	$self->add ($self->{slider});	930	$self->add ($self->{slider});
832		931
833	$self	932	$self
		933	}
		934
		935	sub update {
		936	my ($self) = @_;
		937
		938	$self->SUPER::update;
		939
		940	# todo: overwrite size_allocate of child
		941	my $child = $self->{vp}->child;
		942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		943	}
		944
		945	sub size_allocate {
		946	my ($self, $w, $h, $changed) = @_;
		947
		948	$self->SUPER::size_allocate ($w, $h, $changed);
		949
		950	my $child = $self->{vp}->child;
		951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834	}	952	}
835		953
836	#TODO# update range on size_allocate depending on child	954	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	955	# update viewport offset on scroll
838		956
…		…
889	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1007	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890		1008
891	sub new {	1009	sub new {
892	my $class = shift;	1010	my $class = shift;
893		1011
894	# TODO: user_x, user_y, overwrite moveto?
895
896	my $self = $class->SUPER::new (	1012	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1013	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1014	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1015	border => 0.6,
900	toplevel => 1,	1016	is_toplevel => 1,
901	can_events => 1,	1017	can_events => 1,
902	@_	1018	@_
903	);	1019	);
904		1020
905	$self->{title} &&= new CFClient::UI::Label	1021	$self->{title} &&= new CFClient::UI::Label
906	align => 0,	1022	align => 0,
…		…
925	$h + $self->border * 2,	1041	$h + $self->border * 2,
926	)	1042	)
927	}	1043	}
928		1044
929	sub size_allocate {	1045	sub size_allocate {
930	my ($self, $w, $h) = @_;	1046	my ($self, $w, $h, $changed) = @_;
		1047
		1048	return unless $changed;
931		1049
932	$h -= List::Util::max 0, $self->border * 2;	1050	$h -= List::Util::max 0, $self->border * 2;
933	$w -= List::Util::max 0, $self->border * 2;	1051	$w -= List::Util::max 0, $self->border * 2;
934		1052
935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
959	my ($ev, $x, $y) = @_;	1077	my ($ev, $x, $y) = @_;
960		1078
961	my $dx = $ev->{x} - $ox;	1079	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1080	my $dy = $ev->{y} - $oy;
963		1081
		1082	$self->{user_x} = $wx + $dx * $mx;
		1083	$self->{user_y} = $wy + $dy * $my;
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1086	$self->move ($self->{user_x}, $self->{user_y});
967	$self->check_size;	1087	$self->realloc;
968	};	1088	};
969		1089
970	} elsif ($lr ^ $td) {	1090	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});
972	my ($bx, $by) = ($self->{x}, $self->{y});	1092	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
974	$self->{motion} = sub {	1094	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1095	my ($ev, $x, $y) = @_;
976		1096
977	($x, $y) = ($ev->{x}, $ev->{y});	1097	($x, $y) = ($ev->{x}, $ev->{y});
978		1098
979	$self->move ($bx + $x - $ox, $by + $y - $oy);	1099	$self->{user_x} = $bx + $x - $ox;
		1100	$self->{user_y} = $by + $y - $oy;
		1101
		1102	$self->move ($self->{user_x}, $self->{user_y});
980	$self->update;	1103	$self->realloc;
981	};	1104	};
982	}	1105	}
983	}	1106	}
984		1107
985	sub button_up {	1108	sub button_up {
…		…
1046	sub new {	1169	sub new {
1047	my $class = shift;	1170	my $class = shift;
1048		1171
1049	$class->SUPER::new (	1172	$class->SUPER::new (
1050	col_expand => [],	1173	col_expand => [],
1051	@_	1174	@_,
1052	)	1175	)
		1176	}
		1177
		1178	sub children {
		1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1180	}
1054		1181
1055	sub add {	1182	sub add {
1056	my ($self, $x, $y, $child) = @_;	1183	my ($self, $x, $y, $child) = @_;
1057		1184
1058	$child->set_parent ($self);	1185	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1186	$self->{children}[$y][$x] = $child;
1060		1187
1061	$child->check_size;	1188	$self->realloc;
1062	}	1189	}
1063		1190
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# TODO: move to container class maybe? send childs a signal on removal?	1191	# TODO: move to container class maybe? send children a signal on removal?
1069	sub clear {	1192	sub clear {
1070	my ($self) = @_;	1193	my ($self) = @_;
1071		1194
1072	my @children = $self->children;	1195	my @children = $self->children;
1073	delete $self->{children};	1196	delete $self->{children};
…		…
1075	for (@children) {	1198	for (@children) {
1076	delete $_->{parent};	1199	delete $_->{parent};
1077	$_->hide;	1200	$_->hide;
1078	}	1201	}
1079		1202
1080	$self->update;	1203	$self->realloc;
1081	}	1204	}
1082		1205
1083	sub get_wh {	1206	sub get_wh {
1084	my ($self) = @_;	1207	my ($self) = @_;
1085		1208
…		…
1112	(sum @$hs),	1235	(sum @$hs),
1113	)	1236	)
1114	}	1237	}
1115		1238
1116	sub size_allocate {	1239	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h, $changed) = @_;
1118		1241
1119	my ($ws, $hs) = $self->get_wh;	1242	my ($ws, $hs) = $self->get_wh;
1120		1243
1121	my $req_w = sum @$ws;	1244	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1245	my $req_h = (sum @$hs) || 1;
1123		1246
1124	# TODO: nicer code && do row_expand	1247	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1248	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1249	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1250	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1304	}
1182	}	1305	}
1183		1306
1184	#############################################################################	1307	#############################################################################
1185		1308
		1309	package CFClient::UI::Box;
		1310
		1311	our @ISA = CFClient::UI::Container::;
		1312
		1313	sub size_request {
		1314	my ($self) = @_;
		1315
		1316	$self->{vertical}
		1317	? (
		1318	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1320	)
		1321	: (
		1322	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	}
		1326
		1327	sub size_allocate {
		1328	my ($self, $w, $h, $changed) = @_;
		1329
		1330	my $space = $self->{vertical} ? $h : $w;
		1331	my $children = $self->{children};
		1332
		1333	my @req;
		1334
		1335	if ($self->{homogeneous}) {
		1336	@req = ($space / (@$children || 1)) x @$children;
		1337	} else {
		1338	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1339	my $req = List::Util::sum @req;
		1340
		1341	if ($req > $space) {
		1342	# ah well, not enough space
		1343	$_ *= $space / $req for @req;
		1344	} else {
		1345	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1346
		1347	$space = ($space - $req) / $expand; # remaining space to give away
		1348
		1349	$req[$_] += $space * $children->[$_]{expand}
		1350	for 0 .. $#$children;
		1351	}
		1352	}
		1353
		1354	CFClient::UI::harmonize \@req;
		1355
		1356	my $pos = 0;
		1357	for (0 .. $#$children) {
		1358	my $alloc = $req[$_];
		1359	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1360
		1361	$pos += $alloc;
		1362	}
		1363
		1364	1
		1365	}
		1366
		1367	#############################################################################
		1368
1186	package CFClient::UI::HBox;	1369	package CFClient::UI::HBox;
1187		1370
1188	# TODO: wrap into common Box base class
1189
1190	our @ISA = CFClient::UI::Container::;	1371	our @ISA = CFClient::UI::Box::;
1191		1372
1192	sub size_request {	1373	sub new {
1193	my ($self) = @_;	1374	my $class = shift;
1194		1375
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1376	$class->SUPER::new (
1196		1377	vertical => 0,
1197	(	1378	@_,
1198	(List::Util::sum map $_->[0], @alloc),
1199	(List::Util::max map $_->[1], @alloc),
1200	)	1379	)
1201	}	1380	}
1202		1381
1203	sub size_allocate {
1204	my ($self, $w, $h) = @_;
1205
1206	($h, $w) = ($w, $h);
1207
1208	my $children = $self->{children};
1209
1210	my @h = map $_->{req_w}, @$children;
1211
1212	my $req_h = List::Util::sum @h;
1213
1214	if ($req_h > $h) {
1215	# ah well, not enough space
1216	$_ *= $h / $req_h for @h;
1217	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;
1219	$exp ||= 1;
1220
1221	for (0 .. $#$children) {
1222	my $child = $children->[$_];
1223
1224	my $alloc_h = $h[$_];
1225	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226	$h[$_] = $alloc_h;
1227	}
1228	}
1229
1230	CFClient::UI::harmonize \@h;
1231
1232	my $y = 0;
1233	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];
1236	$child->configure ($y, 0, $h, $w);
1237
1238	$y += $h;
1239	}
1240
1241	1
1242	}
1243
1244	#############################################################################	1382	#############################################################################
1245		1383
1246	package CFClient::UI::VBox;	1384	package CFClient::UI::VBox;
1247		1385
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1386	our @ISA = CFClient::UI::Box::;
1251		1387
1252	sub size_request {	1388	sub new {
1253	my ($self) = @_;	1389	my $class = shift;
1254		1390
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1391	$class->SUPER::new (
1256		1392	vertical => 1,
1257	(	1393	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1394	)
1261	}
1262
1263	sub size_allocate {
1264	my ($self, $w, $h) = @_;
1265
1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268	my $children = $self->{children};
1269
1270	my @h = map $_->{req_h}, @$children;
1271
1272	my $req_h = List::Util::sum @h;
1273
1274	if ($req_h > $h) {
1275	# ah well, not enough space
1276	$_ *= $h / $req_h for @h;
1277	} else {
1278	my $exp = List::Util::sum map $_->{expand}, @$children;
1279	$exp ||= 1;
1280
1281	for (0 .. $#$children) {
1282	my $child = $children->[$_];
1283
1284	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285	}
1286	}
1287
1288	CFClient::UI::harmonize \@h;
1289
1290	my $y = 0;
1291	for (0 .. $#$children) {
1292	my $child = $children->[$_];
1293	my $h = $h[$_];
1294	$child->configure (0, $y, $w, $h);
1295
1296	$y += $h;
1297	}
1298
1299	1
1300	}	1395	}
1301		1396
1302	#############################################################################	1397	#############################################################################
1303		1398
1304	package CFClient::UI::Label;	1399	package CFClient::UI::Label;
…		…
1367	$self->{text} = "T$text";	1462	$self->{text} = "T$text";
1368		1463
1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370	$self->{layout}->set_text ($text);	1465	$self->{layout}->set_text ($text);
1371		1466
		1467	$self->realloc;
1372	$self->update;	1468	$self->update;
1373	$self->check_size;
1374	}	1469	}
1375		1470
1376	sub set_markup {	1471	sub set_markup {
1377	my ($self, $markup) = @_;	1472	my ($self, $markup) = @_;
1378		1473
…		…
1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383		1478
1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385	$self->{layout}->set_markup ($markup);	1480	$self->{layout}->set_markup ($markup);
1386		1481
		1482	$self->realloc;
1387	$self->update;	1483	$self->update;
1388	$self->check_size;
1389	}	1484	}
1390		1485
1391	sub size_request {	1486	sub size_request {
1392	my ($self) = @_;	1487	my ($self) = @_;
1393		1488
…		…
1414	$h + $self->{padding} * 2,	1509	$h + $self->{padding} * 2,
1415	)	1510	)
1416	}	1511	}
1417		1512
1418	sub size_allocate {	1513	sub size_allocate {
1419	my ($self, $w, $h) = @_;	1514	my ($self, $w, $h, $changed) = @_;
1420		1515
1421	delete $self->{texture};	1516	delete $self->{texture}
		1517	if $changed;
1422	}	1518	}
1423		1519
1424	sub set_fontsize {	1520	sub set_fontsize {
1425	my ($self, $fontsize) = @_;	1521	my ($self, $fontsize) = @_;
1426		1522
1427	$self->{fontsize} = $fontsize;	1523	$self->{fontsize} = $fontsize;
1428	delete $self->{texture};	1524	delete $self->{texture};
1429		1525
1430	$self->update;	1526	$self->realloc;
1431	$self->check_size;
1432	}	1527	}
1433		1528
1434	sub _draw {	1529	sub _draw {
1435	my ($self) = @_;	1530	my ($self) = @_;
1436		1531
…		…
1488	active_fg => [0, 0, 0],	1583	active_fg => [0, 0, 0],
1489	can_hover => 1,	1584	can_hover => 1,
1490	can_focus => 1,	1585	can_focus => 1,
1491	valign => 0,	1586	valign => 0,
1492	can_events => 1,	1587	can_events => 1,
		1588	#text => ...
1493	@_	1589	@_
1494	)	1590	)
1495	}	1591	}
1496		1592
1497	sub _set_text {	1593	sub _set_text {
…		…
1507	$self->{text} = $text;	1603	$self->{text} = $text;
1508		1604
1509	$text =~ s/./*/g if $self->{hidden};	1605	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1606	$self->{layout}->set_text ("$text ");
1511		1607
1512	$self->emit (changed => $self->{text});	1608	$self->_emit (changed => $self->{text});
1513	}	1609	}
1514		1610
1515	sub set_text {	1611	sub set_text {
1516	my ($self, $text) = @_;	1612	my ($self, $text) = @_;
1517		1613
1518	$self->{cursor} = length $text;	1614	$self->{cursor} = length $text;
1519	$self->_set_text ($text);	1615	$self->_set_text ($text);
1520	$self->update;	1616
1521	$self->check_size;	1617	$self->realloc;
1522	}	1618	}
1523		1619
1524	sub get_text {	1620	sub get_text {
1525	$_[0]{text}	1621	$_[0]{text}
1526	}	1622	}
…		…
1529	my ($self) = @_;	1625	my ($self) = @_;
1530		1626
1531	my ($w, $h) = $self->SUPER::size_request;	1627	my ($w, $h) = $self->SUPER::size_request;
1532		1628
1533	($w + 1, $h) # add 1 for cursor	1629	($w + 1, $h) # add 1 for cursor
1534	}
1535
1536	sub size_allocate {
1537	my ($self, $w, $h) = @_;
1538
1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540	}	1630	}
1541		1631
1542	sub key_down {	1632	sub key_down {
1543	my ($self, $ev) = @_;	1633	my ($self, $ev) = @_;
1544		1634
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1649	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1650	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1651	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1652	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1653	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1654	$self->_emit ('escape');
1565	} elsif ($uni) {	1655	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1656	substr $text, $self->{cursor}++, 0, chr $uni;
1567	}	1657	}
1568		1658
1569	$self->_set_text ($text);	1659	$self->_set_text ($text);
1570	$self->update;	1660
1571	$self->check_size;	1661	$self->realloc;
1572	}	1662	}
1573		1663
1574	sub focus_in {	1664	sub focus_in {
1575	my ($self) = @_;	1665	my ($self) = @_;
1576		1666
…		…
1656	if ($sym == 13) {	1746	if ($sym == 13) {
1657	unshift @{$self->{history}},	1747	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1748	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1749	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1750	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1751	$self->_emit (activate => $txt);
1662	$self->update;	1752	$self->update;
1663		1753
1664	} elsif ($sym == CFClient::SDLK_UP) {	1754	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1755	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1756	$self->{history_saveback} = $self->get_text;
…		…
1714	can_events => 1,	1804	can_events => 1,
1715	@_	1805	@_
1716	)	1806	)
1717	}	1807	}
1718		1808
		1809	sub activate { }
		1810
1719	sub button_up {	1811	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1812	my ($self, $ev, $x, $y) = @_;
1721		1813
		1814	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1815	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1816	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");
1725	}
1726	}	1817	}
1727		1818
1728	sub _draw {	1819	sub _draw {
1729	my ($self) = @_;	1820	my ($self) = @_;
1730		1821
…		…
1782	my ($self, $ev, $x, $y) = @_;	1873	my ($self, $ev, $x, $y) = @_;
1783		1874
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786	$self->{state} = !$self->{state};	1877	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1878	$self->_emit (changed => $self->{state});
1788	}	1879	}
1789	}	1880	}
1790		1881
1791	sub _draw {	1882	sub _draw {
1792	my ($self) = @_;	1883	my ($self) = @_;
…		…
2067	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2159	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2160	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2161	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2162	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2163	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2164	req_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2165	req_h => $::WIDTH / 80,
2075	vertical => 0,	2166	vertical => 0,
2076	can_hover => 1,	2167	can_hover => 1,
2077	inner_pad => 0.02,	2168	inner_pad => 0.02,
…		…
2082	$self->update;	2173	$self->update;
2083		2174
2084	$self	2175	$self
2085	}	2176	}
2086		2177
		2178	sub changed { }
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
2087	sub set_value {	2189	sub set_value {
2088	my ($self, $value) = @_;	2190	my ($self, $value) = @_;
2089		2191
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2193
2092	$hi = $lo + 1 if $hi <= $lo;	2194	$hi = $lo + 1 if $hi <= $lo;
2093		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
2094	$value = $lo if $value < $lo;	2198	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2199	$value = $hi - $page if $value > $hi - $page;
2096		2200
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2202	if $unit;
2099		2203
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2205
2104	if ($value != $old_value) {	2206	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2207	$self->_emit (changed => $value);
2106	$self->update;	2208	$self->update;
2107	}	2209	}
2108	}	2210	}
2109		2211
2110	sub size_request {	2212	sub size_request {
…		…
2118		2220
2119	sub button_down {	2221	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
2121		2223
2122	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
2123	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
2124	}	2229	}
2125		2230
2126	sub mouse_motion {	2231	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
…		…
2129	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2236
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2238
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2240
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137	}	2242	}
2138	}	2243	}
2139		2244
2140	sub update {	2245	sub update {
2141	my ($self) = @_;	2246	my ($self) = @_;
2142		2247
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2249	$self->set_value ($self->{range}[0]);
2145		2250
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2147		2253
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2255
2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151		2258
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2259	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2260	$value = $value * $self->{scale} + $self->{offset};
2154		2261
2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157	$value = 0 if $value < 0;
2158	$page = 1 - $value if $value + $page > 1;
2159
2160	$self->{knob_x} = $value;	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2263	$self->{knob_w} = $knob_w;
2162	});	2264	});
2163		2265
2164	$self->SUPER::update;	2266	$self->SUPER::update;
2165	}	2267	}
2166		2268
…		…
2190	# draw handle	2292	# draw handle
2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192		2294
2193	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2194	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
2195		2338
2196	#############################################################################	2339	#############################################################################
2197		2340
2198	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2199		2342
…		…
2230	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2231	$self->reflow;	2374	$self->reflow;
2232	}	2375	}
2233		2376
2234	sub size_allocate {	2377	sub size_allocate {
2235	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h, $changed) = @_;
2236		2379
2237	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h, $changed);
		2381
		2382	return unless $changed;
2238		2383
2239	$self->{layout}->set_font ($self->{font}) if $self->{font};	2384	$self->{layout}->set_font ($self->{font}) if $self->{font};
2240	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2386	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2387
2243	$self->reflow;	2388	$self->reflow;
2244	}	2389	}
2245		2390
2246	sub text_height {	2391	sub text_size {
2247	my ($self, $text, $indent) = @_;	2392	my ($self, $text, $indent) = @_;
2248		2393
2249	my $layout = $self->{layout};	2394	my $layout = $self->{layout};
2250		2395
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2396	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2397	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2398	$layout->set_markup ($text);
2254		2399
2255	($layout->size)[1]	2400	$layout->size
2256	}	2401	}
2257		2402
2258	sub reflow {	2403	sub reflow {
2259	my ($self) = @_;	2404	my ($self) = @_;
2260		2405
2261	$self->{need_reflow}++;	2406	$self->{need_reflow}++;
2262	$self->update;	2407	$self->update;
2263	}	2408	}
2264		2409
		2410	sub set_offset {
		2411	my ($self, $offset) = @_;
		2412
		2413	# todo: base offset on lines or so, not on pixels
		2414	$self->{children}[1]->set_value ($offset);
		2415	}
		2416
		2417	sub clear {
		2418	my ($self) = @_;
		2419
		2420	$self->{par} = [];
		2421	$self->{height} = 0;
		2422	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2423	}
		2424
2265	sub add_paragraph {	2425	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2426	my ($self, $color, $text, $indent) = @_;
2267		2427
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2428	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2429	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2430	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2432	}
2275		2433
2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2434	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277	$self->{children}[1]->update;
2278	}	2435	}
2279		2436
2280	sub update {	2437	sub update {
2281	my ($self) = @_;	2438	my ($self) = @_;
2282		2439
…		…
2285	return unless $self->{h} > 0;	2442	return unless $self->{h} > 0;
2286		2443
2287	delete $self->{texture};	2444	delete $self->{texture};
2288		2445
2289	$ROOT->on_post_alloc ($self, sub {	2446	$ROOT->on_post_alloc ($self, sub {
		2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2448
2290	if (delete $self->{need_reflow}) {	2449	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2450	my $height = 0;
2292		2451
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2455
2294	for @{$self->{par}};	2456	for (@{$self->{par}}) {
		2457	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2458	$layout->set_width ($W - $_->[3]);
		2459	$layout->set_markup ($_->[4]);
		2460	my ($w, $h) = $layout->size;
		2461	$_->[0] = $w + $_->[3];
		2462	$_->[1] = $h;
		2463	}
		2464
		2465	$height += $_->[1];
		2466	}
2295		2467
2296	$self->{height} = $height;	2468	$self->{height} = $height;
2297		2469
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2471
2301	delete $self->{texture};	2472	delete $self->{texture};
2302	}	2473	}
2303		2474
2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2476	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2477	glClear GL_COLOR_BUFFER_BIT;
2307		2478
2308	my $top = int $self->{children}[1]{range}[0];	2479	my $top = int $self->{children}[1]{range}[0];
2309		2480
2310	my $y0 = $top;	2481	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2482	my $y1 = $top + $H;
2312		2483
2313	my $y = 0;	2484	my $y = 0;
2314		2485
2315	my $layout = $self->{layout};	2486	my $layout = $self->{layout};
2316		2487
2317	$layout->set_font ($self->{font}) if $self->{font};	2488	$layout->set_font ($self->{font}) if $self->{font};
2318		2489
2319	glEnable GL_BLEND;	2490	glEnable GL_BLEND;
		2491	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2493
2322	for my $par (@{$self->{par}}) {	2494	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2495	my $h = $par->[1];
2324		2496
2325	if ($y0 < $y + $h && $y < $y1) {	2497	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2498	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2499	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2500	$layout->set_markup ($par->[4]);
2329		2501
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2503
2332	glRasterPos $par->[2], $y - $y0;	2504	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2506	}
2335		2507
2336	$y += $h;	2508	$y += $h;
2337	}	2509	}
…		…
2404		2576
2405	sub new {	2577	sub new {
2406	my $class = shift;	2578	my $class = shift;
2407		2579
2408	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2409	state => 0,	2581	state => 0,
2410	connect_activate => \&toggle_flopper,	2582	on_activate => \&toggle_flopper,
2411	@_	2583	@_
2412	);	2584	);
2413		2585
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2586	$self
2420	}	2587	}
2421		2588
2422	sub toggle_flopper {	2589	sub toggle_flopper {
2423	my ($self) = @_;	2590	my ($self) = @_;
2424		2591
2425	# TODO: use animation	2592	$self->{other}->toggle_visibility;
2426	if ($self->{state} = !$self->{state}) {
2427	$CFClient::UI::ROOT->add ($self->{other});
2428	$self->{other}->move ($self->coord2global (0, $self->{h}));
2429	$self->emit ("open");
2430	} else {
2431	$CFClient::UI::ROOT->remove ($self->{other});
2432	$self->emit ("close");
2433	}
2434
2435	$self->emit (changed => $self->{state});
2436	}	2593	}
2437		2594
2438	#############################################################################	2595	#############################################################################
2439		2596
2440	package CFClient::UI::Tooltip;	2597	package CFClient::UI::Tooltip;
…		…
2472		2629
2473	($w + 4, $h + 4)	2630	($w + 4, $h + 4)
2474	}	2631	}
2475		2632
2476	sub size_allocate {	2633	sub size_allocate {
2477	my ($self, $w, $h) = @_;	2634	my ($self, $w, $h, $changed) = @_;
2478		2635
		2636	return unless $changed;
		2637
2479	$self->SUPER::size_allocate ($w - 4, $h - 4);	2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2639	}
		2640
		2641	sub visibility_change {
		2642	my ($self, $visible) = @_;
		2643
		2644	return unless $visible;
		2645
		2646	$self->{root}->on_post_alloc ("move_$self" => sub {
		2647	my $widget = $self->{owner}
		2648	or return;
		2649
		2650	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2651
		2652	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2653	if $x + $self->{w} > $::WIDTH;
		2654
		2655	$self->move ($x, $y);
		2656	});
2480	}	2657	}
2481		2658
2482	sub _draw {	2659	sub _draw {
2483	my ($self) = @_;	2660	my ($self) = @_;
2484		2661
…		…
2501	glVertex $w, $h;	2678	glVertex $w, $h;
2502	glVertex $w, 0;	2679	glVertex $w, 0;
2503	glEnd;	2680	glEnd;
2504		2681
2505	glTranslate 2 - 0.375, 2 - 0.375;	2682	glTranslate 2 - 0.375, 2 - 0.375;
		2683
2506	$self->SUPER::_draw;	2684	$self->SUPER::_draw;
2507	}	2685	}
2508		2686
2509	#############################################################################	2687	#############################################################################
2510		2688
…		…
2516		2694
2517	sub new {	2695	sub new {
2518	my $class = shift;	2696	my $class = shift;
2519		2697
2520	my $self = $class->SUPER::new (	2698	my $self = $class->SUPER::new (
2521	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2522	@_,	2701	@_,
2523	);	2702	);
2524		2703
2525	if ($self->{anim} && $self->{animspeed}) {	2704	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2705	Scalar::Util::weaken (my $widget = $self);
…		…
2552	}	2731	}
2553		2732
2554	sub _draw {	2733	sub _draw {
2555	my ($self) = @_;	2734	my ($self) = @_;
2556		2735
2557	return unless $::CONN;#d# manage and cache textures differently	2736	return unless $::CONN;
2558		2737
2559	my $face;	2738	my $face;
2560		2739
2561	if ($self->{frame}) {	2740	if ($self->{frame}) {
2562	my $anim = $::CONN->{anim}[$self->{anim}];	2741	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2585	$self->SUPER::DESTROY;	2764	$self->SUPER::DESTROY;
2586	}	2765	}
2587		2766
2588	#############################################################################	2767	#############################################################################
2589		2768
2590	package CFClient::UI::InventoryItem;	2769	package CFClient::UI::Inventory;
2591		2770
2592	our @ISA = CFClient::UI::HBox::;	2771	our @ISA = CFClient::UI::ScrolledWindow::;
2593
2594	sub _item_to_desc {
2595	my ($item) = @_;
2596
2597	my $desc =
2598	$item->{nrof} < 2
2599	? $item->{name}
2600	: "$item->{nrof} × $item->{name_pl}";
2601
2602	$item->{flags} & Crossfire::Protocol::F_OPEN
2603	and $desc .= " (open)";
2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
2605	and $desc .= " (applied)";
2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
2607	and $desc .= " (unpaid)";
2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
2609	and $desc .= " (magic)";
2610	$item->{flags} & Crossfire::Protocol::F_CURSED
2611	and $desc .= " (cursed)";
2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
2613	and $desc .= " (damned)";
2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
2615	and $desc .= " *";
2616
2617	$desc
2618	}
2619		2772
2620	sub new {	2773	sub new {
2621	my $class = shift;	2774	my $class = shift;
2622		2775
2623	my %args = @_;
2624
2625	my $item = delete $args{item};
2626
2627	my $desc = _item_to_desc ($item);
2628
2629	my $self = $class->SUPER::new (	2776	my $self = $class->SUPER::new (
2630	can_hover => 1,
2631	can_events => 1,
2632	tooltip => ((CFClient::UI::Label::escape $desc)
2633	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634	connect_button_down => sub {
2635	my ($self, $ev, $x, $y) = @_;
2636
2637	# todo: maybe put examine on 1? but should just be a tooltip :(
2638	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639	my $targ = $::CONN->{player}{tag};
2640
2641	if ($item->{container} == $::CONN->{player}{tag}) {
2642	$targ = $main::OPENCONT;
2643	}
2644
2645	$::CONN->send ("move $targ $item->{tag} 0");
2646	} elsif ($ev->{button} == 1) {
2647	$::CONN->send ("examine $item->{tag}");
2648	} elsif ($ev->{button} == 2) {
2649	$::CONN->send ("apply $item->{tag}");
2650	} elsif ($ev->{button} == 3) {
2651	my @menu_items = (
2652	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655	(
2656	$item->{flags} & Crossfire::Protocol::F_LOCKED
2657	? (
2658	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659	)
2660	: (
2661	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663	)
2664	),
2665	);
2666
2667	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668	}
2669
2670	1
2671	},
2672	%args
2673	);
2674
2675
2676	$self->add (new CFClient::UI::Face
2677	can_events => 0,
2678	face => $item->{face},
2679	anim => $item->{anim},
2680	animspeed => $item->{animspeed},
2681	);
2682
2683	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685	$self->{item} = $item;
2686
2687	$self->update_item;
2688
2689	$self
2690	}
2691
2692	sub update_item {
2693	my ($self) = @_;
2694
2695	my $desc = _item_to_desc ($self->{item});
2696
2697	$self->{name_lbl}->set_text ($desc);
2698	}
2699
2700	#############################################################################
2701
2702	package CFClient::UI::Inventory;
2703
2704	our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706	sub new {
2707	my $class = shift;
2708
2709	my $self = $class->SUPER::new (
2710	scrolled => (new CFClient::UI::Table),	2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2711	@_,	2778	@_,
2712	);	2779	);
2713		2780
2714	$self	2781	$self
2715	}	2782	}
…		…
2725	or ($a->{name} cmp $b->{name})	2792	or ($a->{name} cmp $b->{name})
2726	} @$items;	2793	} @$items;
2727		2794
2728	$self->{real_items} = \@items;	2795	$self->{real_items} = \@items;
2729		2796
		2797	my $row = 0;
2730	for my $item (@items) {	2798	for my $item (@items) {
2731	$item->{item} = $item;	2799	CFClient::Item::update_widgets $item;
2732	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733	$item->update_item ();
2734	}
2735		2800
2736	my $i = 0;	2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2737	for (@items) {	2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2738	$self->{scrolled}->add (0, $i, $_);	2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2739	my $nrof = $_->{item}->{nrof} || 1;
2740	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741	}
2742		2804
2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2805	$row++;
2744	}	2806	}
2745
2746	sub size_request {
2747	my ($self) = @_;
2748	($self->{req_w}, $self->{req_h});
2749	}	2807	}
2750		2808
2751	#############################################################################	2809	#############################################################################
2752		2810
2753	package CFClient::UI::Menu;	2811	package CFClient::UI::Menu;
…		…
2788		2846
2789	# popup given the event (must be a mouse button down event currently)	2847	# popup given the event (must be a mouse button down event currently)
2790	sub popup {	2848	sub popup {
2791	my ($self, $ev) = @_;	2849	my ($self, $ev) = @_;
2792		2850
2793	$self->emit ("popdown");	2851	$self->_emit ("popdown");
2794		2852
2795	# maybe save $GRAB? must be careful about events...	2853	# maybe save $GRAB? must be careful about events...
2796	$GRAB = $self;	2854	$GRAB = $self;
2797	$self->{button} = $ev->{button};	2855	$self->{button} = $ev->{button};
2798		2856
…		…
2813		2871
2814	if ($ev->{button} == $self->{button}) {	2872	if ($ev->{button} == $self->{button}) {
2815	undef $GRAB;	2873	undef $GRAB;
2816	$self->hide;	2874	$self->hide;
2817		2875
2818	$self->emit ("popdown");	2876	$self->_emit ("popdown");
2819	$self->{hover}[1]->() if $self->{hover};	2877	$self->{hover}[1]->() if $self->{hover};
2820	}	2878	}
2821	}	2879	}
2822		2880
2823	#############################################################################	2881	#############################################################################
…		…
2885	sub add {	2943	sub add {
2886	my ($self, $text, %arg) = @_;	2944	my ($self, $text, %arg) = @_;
2887		2945
2888	$text =~ s/^\s+//;	2946	$text =~ s/^\s+//;
2889	$text =~ s/\s+$//;	2947	$text =~ s/\s+$//;
		2948
		2949	return unless $text;
2890		2950
2891	my $timeout = time + ((delete $arg{timeout}) || 60);	2951	my $timeout = time + ((delete $arg{timeout}) || 60);
2892		2952
2893	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2953	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894		2954
…		…
2937	use CFClient::OpenGL;	2997	use CFClient::OpenGL;
2938		2998
2939	sub new {	2999	sub new {
2940	my $class = shift;	3000	my $class = shift;
2941		3001
2942	$class->SUPER::new (	3002	my $self = $class->SUPER::new (
		3003	visible => 1,
2943	@_,	3004	@_,
2944	)	3005	);
		3006
		3007	Scalar::Util::weaken ($self->{root} = $self);
		3008
		3009	$self
2945	}	3010	}
2946		3011
2947	sub configure {	3012	sub configure {
2948	my ($self, $x, $y, $w, $h) = @_;	3013	my ($self, $x, $y, $w, $h) = @_;
2949		3014
2950	$self->{w} = $w;	3015	$self->{w} = $w;
2951	$self->{h} = $h;	3016	$self->{h} = $h;
2952	}	3017	}
2953		3018
2954	sub check_size {	3019	sub reconfigure {
2955	my ($self) = @_;	3020	my ($self) = @_;
2956		3021
		3022	$self->SUPER::reconfigure;
		3023
2957	$self->size_allocate ($self->{w}, $self->{h})	3024	$self->size_allocate ($self->{w}, $self->{h}, 1)
2958	if $self->{w};	3025	if $self->{w};
2959	}	3026	}
2960		3027
2961	sub size_request {	3028	sub size_request {
2962	my ($self) = @_;	3029	my ($self) = @_;
2963		3030
2964	($self->{w}, $self->{h})	3031	($self->{w}, $self->{h})
2965	}	3032	}
2966		3033
2967	sub size_allocate {	3034	sub size_allocate {
2968	my ($self, $w, $h) = @_;	3035	my ($self, $w, $h, $changed) = @_;
2969
2970	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975		3036
2976	for my $child ($self->children) {	3037	for my $child ($self->children) {
2977	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3038	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978		3039
2979	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3040	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980	if exists $child->{req_x};	3041	if exists $child->{req_x};
2981		3042
2982	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3043	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983	if exists $child->{req_y};	3044	if exists $child->{req_y};
2984		3045
		3046	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3047
2985	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987		3050
2988	$child->configure ($X, $Y, $W, $H);	3051	$child->configure ($X, $Y, $W, $H);
2989	}	3052	}
…		…
3002	}	3065	}
3003		3066
3004	sub update {	3067	sub update {
3005	my ($self) = @_;	3068	my ($self) = @_;
3006		3069
3007	$self->check_size;
3008	$::WANT_REFRESH++;	3070	$::WANT_REFRESH++;
3009	}	3071	}
3010		3072
3011	sub add {	3073	sub add {
3012	my ($self, @children) = @_;	3074	my ($self, @children) = @_;
3013		3075
3014	for my $child (@children) {	3076	for my $child (@children) {
3015	$child->{toplevel} = 1;	3077	$child->{is_toplevel} = 1;
3016		3078
3017	# integerise window positions	3079	# integerise window positions
3018	$child->{x} = int $child->{x};	3080	$child->{x} = int $child->{x};
3019	$child->{y} = int $child->{y};	3081	$child->{y} = int $child->{y};
3020	}	3082	}
3021		3083
3022	$self->SUPER::add (@children);	3084	$self->SUPER::add (@children);
		3085	}
		3086
		3087	sub remove {
		3088	my ($self, @children) = @_;
		3089
		3090	$self->SUPER::remove (@children);
3023		3091
3024	while (@children) {	3092	while (@children) {
3025	my $w = pop @children;	3093	my $w = pop @children;
3026	push @children, $w->children;	3094	push @children, $w->children;
3027	$w->{visible} = 1;	3095	$w->set_invisible;
3028	}
3029	}
3030
3031	sub remove {
3032	my ($self, @children) = @_;
3033
3034	$self->SUPER::remove (@children);
3035
3036	while (@children) {
3037	my $w = pop @children;
3038	push @children, $w->children;
3039	delete $w->{visible};
3040	}	3096	}
3041	}	3097	}
3042		3098
3043	sub on_refresh {	3099	sub on_refresh {
3044	my ($self, $id, $cb) = @_;	3100	my ($self, $id, $cb) = @_;
…		…
3058	while ($self->{refresh_hook}) {	3114	while ($self->{refresh_hook}) {
3059	$_->()	3115	$_->()
3060	for values %{delete $self->{refresh_hook}};	3116	for values %{delete $self->{refresh_hook}};
3061	}	3117	}
3062		3118
3063	if ($self->{check_size}) {	3119	if ($self->{realloc}) {
3064	my @queue = ([], []);	3120	my @queue;
3065		3121
3066	for (;;) {	3122	while () {
3067	if ($self->{check_size}) {	3123	if ($self->{realloc}) {
3068	# heuristic: check containers last	3124	#TODO use array-of-depth approach
3069	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3125
3070	for values %{delete $self->{check_size}}	3126	@queue = sort { $a->{visible} <=> $b->{visible} }
		3127	@queue, values %{delete $self->{realloc}};
3071	}	3128	}
3072		3129
3073	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3130	my $widget = pop @queue || last;
3074		3131
		3132	$widget->{visible} or last; # do not resize invisible widgets
		3133
3075	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3134	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3076	? @$widget{qw(user_w user_h)}	3135	? @$widget{qw(def_w def_h)}
3077	: $widget->size_request;	3136	: $widget->size_request;
3078		3137
3079	if (delete $widget->{force_alloc}
3080	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3138	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082		3139
3083	$widget->{req_w} = $w;	3140	$widget->{req_w} = $w;
3084	$widget->{req_h} = $h;	3141	$widget->{req_h} = $h;
3085		3142
3086	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3143	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3087		3144
3088	$widget->{parent}->check_size	3145	push @queue, $widget->{parent}
3089	if $widget->{parent};	3146	if $widget->{parent};
3090	}
3091	}	3147	}
3092	}	3148	}
3093		3149
3094	while ($self->{size_alloc}) {	3150	while (my $size_alloc = delete $self->{size_alloc}) {
3095	for (values %{delete $self->{size_alloc}}) {	3151	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3096	my ($widget, $w, $h) = @$_;	3152	values %$size_alloc;
		3153
		3154	while () {
		3155	my ($widget, $w, $h) = @{ pop @queue or last };
3097		3156
3098	$w = 0 if $w < 0;	3157	$w = 0 if $w < 0;
3099	$h = 0 if $h < 0;	3158	$h = 0 if $h < 0;
3100		3159
		3160	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3161
3101	$widget->{w} = $w;	3162	$widget->{w} = $w;
3102	$widget->{h} = $h;	3163	$widget->{h} = $h;
3103	$widget->size_allocate ($w, $h);	3164
3104	$widget->emit (size_allocate => $w, $h);	3165	$widget->emit (size_allocate => $w, $h, $changed);
3105	}	3166	}
3106	}	3167	}
3107		3168
3108	while ($self->{post_alloc_hook}) {	3169	while ($self->{post_alloc_hook}) {
3109	$_->()	3170	$_->()

Diff Legend

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