ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 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 hide {	234	sub center {
217	my ($self) = @_;	235	my ($self) = @_;
		236
		237	$CFClient::UI::ROOT->on_post_alloc (
		238	"center_$self" => sub {
		239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		240	},
		241	);
		242
		243	$self->update;
		244	}
		245
		246	sub set_visible {
		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};
218		270
219	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
220	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;
221		303
222	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
223	if $self->{parent};	305	if $self->{parent};
224	}	306	}
225		307
…		…
234	}	316	}
235		317
236	sub set_size {	318	sub set_size {
237	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
238		320
239	$self->{user_w} = $w;	321	$self->{def_w} = $w;
240	$self->{user_h} = $h;	322	$self->{def_h} = $h;
241		323
242	$self->check_size;	324	$self->realloc;
243	}	325	}
244		326
245	sub size_request {	327	sub size_request {
246	require Carp;	328	require Carp;
247	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
267	$self->{y} = $y;	349	$self->{y} = $y;
268	$self->update;	350	$self->update;
269	}	351	}
270		352
271	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
		354	return unless $self->{visible};
		355
272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
273	}	357	}
274	}	358	}
275		359
276	sub size_allocate {	360	sub size_allocate {
277	# nothing to be done	361	# nothing to be done
278	}	362	}
279		363
280	sub reconfigure {
281	my ($self) = @_;
282
283	$self->check_size (1);
284	$self->update;
285	}
286
287	sub children {	364	sub children {
288	}	365	}
289		366
290	sub set_max_size {	367	sub set_max_size {
291	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
…		…
294	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
295	}	372	}
296		373
297	sub set_tooltip {	374	sub set_tooltip {
298	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
299		381
300	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
301		383
302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
…		…
325	return if $FOCUS == $self;	407	return if $FOCUS == $self;
326	return unless $self->{can_focus};	408	return unless $self->{can_focus};
327		409
328	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
329		411
330	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
331		413
332	$focus->update if $focus;	414	$focus->update if $focus;
333	$FOCUS->update;	415	$FOCUS->update;
334	}	416	}
335		417
…		…
338		420
339	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
340		422
341	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
342		424
343	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
344		426
345	$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;
346	}	431	}
347		432
348	sub mouse_motion { }	433	sub mouse_motion { }
349	sub button_up { }	434	sub button_up { }
350	sub key_down { }	435	sub key_down { }
351	sub key_up { }	436	sub key_up { }
352		437
353	sub button_down {	438	sub button_down {
354	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
355		440
356	$self->focus_in;	441	$self->focus_in;
…		…
359	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
360	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
361	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
362	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
363	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	}
364		512
365	sub draw {	513	sub draw {
366	my ($self) = @_;	514	my ($self) = @_;
367		515
368	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
390	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
391	glPushMatrix;	539	glPushMatrix;
392	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
395	glVertex 0 , 0;	543	glVertex 0 , 0;
396	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
397	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
398	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
399	glEnd;	547	glEnd;
400	glPopMatrix;	548	glPopMatrix;
401	#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;
402	}	550	}
403	}	551	}
404		552
405	sub _draw {	553	sub _draw {
406	my ($self) = @_;	554	my ($self) = @_;
407		555
408	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
409	}
410
411	sub find_widget {
412	my ($self, $x, $y) = @_;
413
414	return () unless $self->{can_events};
415
416	return $self
417	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420	()
421	}
422
423	sub set_parent {
424	my ($self, $parent) = @_;
425
426	Scalar::Util::weaken ($self->{parent} = $parent);
427
428	# TODO: req_w _does_change after ->reconfigure
429	$self->check_size
430	unless exists $self->{req_w};
431
432	$self->show;
433	}
434
435	sub check_size {
436	my ($self, $forced) = @_;
437
438	$self->{force_alloc} = 1 if $forced;
439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
440	}
441
442	sub update {
443	my ($self) = @_;
444
445	$self->{parent}->update
446	if $self->{parent};
447	}
448
449	sub connect {
450	my ($self, $signal, $cb) = @_;
451
452	push @{ $self->{signal_cb}{$signal} }, $cb;
453	}
454
455	sub emit {
456	my ($self, $signal, @args) = @_;
457
458	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459	}	557	}
460		558
461	sub DESTROY {	559	sub DESTROY {
462	my ($self) = @_;	560	my ($self) = @_;
463		561
…		…
560	$self->{children} = [	658	$self->{children} = [
561	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
562	@{$self->{children}}, @widgets	660	@{$self->{children}}, @widgets
563	];	661	];
564		662
565	$self->check_size (1);	663	$self->realloc;
566	$self->update;
567	}	664	}
568		665
569	sub children {	666	sub children {
570	@{ $_[0]{children} }	667	@{ $_[0]{children} }
571	}	668	}
…		…
576	delete $child->{parent};	673	delete $child->{parent};
577	$child->hide;	674	$child->hide;
578		675
579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580		677
581	$self->check_size;	678	$self->realloc;
582	$self->update;
583	}	679	}
584		680
585	sub clear {	681	sub clear {
586	my ($self) = @_;	682	my ($self) = @_;
587		683
…		…
591	for (@$children) {	687	for (@$children) {
592	delete $_->{parent};	688	delete $_->{parent};
593	$_->hide;	689	$_->hide;
594	}	690	}
595		691
596	$self->check_size;	692	$self->realloc;
597	$self->update;
598	}	693	}
599		694
600	sub find_widget {	695	sub find_widget {
601	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
602		697
…		…
655	sub size_request {	750	sub size_request {
656	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
657	}	752	}
658		753
659	sub size_allocate {	754	sub size_allocate {
660	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
661		756
662	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
663	}	758	}
664		759
665	#############################################################################	760	#############################################################################
…		…
682	$ROOT->on_post_alloc ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
683	$self->SUPER::update;	778	$self->SUPER::update;
684	}	779	}
685		780
686	sub size_allocate {	781	sub size_allocate {
687	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
688		783
689	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
690	$self->update;	785	$self->update
		786	if $changed;
691	}	787	}
692		788
693	sub _render {	789	sub _render {
694	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
695	}	791	}
…		…
726		822
727	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
728		824
729	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
730		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
731	sub size_request {	837	sub size_request {
732	my ($self) = @_;	838	my ($self) = @_;
733		839
734	@$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)};
735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
736		841
737	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
738	}	846	}
739		847
740	sub size_allocate {	848	sub size_allocate {
741	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
742		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);
743	$self->update;	855	$self->update;
744	}	856	}
745		857
746	sub set_offset {	858	sub set_offset {
747	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
798	my $class = shift;	910	my $class = shift;
799		911
800	my $self;	912	my $self;
801		913
802	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
803	vertical => 1,	915	vertical => 1,
804	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
805	connect_changed => sub {	917	on_changed => sub {
806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	918	$self->{vp}->set_offset (0, $_[1]);
807	},	919	},
808	;	920	;
809		921
810	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
811	vp => (new CFClient::UI::ViewPort expand => 1),	923	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
816	$self->{vp}->add ($self->{scrolled});	928	$self->{vp}->add ($self->{scrolled});
817	$self->add ($self->{vp});	929	$self->add ($self->{vp});
818	$self->add ($self->{slider});	930	$self->add ($self->{slider});
819		931
820	$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]);
821	}	952	}
822		953
823	#TODO# update range on size_allocate depending on child	954	#TODO# update range on size_allocate depending on child
824	# update viewport offset on scroll	955	# update viewport offset on scroll
825		956
…		…
876	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);
877		1008
878	sub new {	1009	sub new {
879	my $class = shift;	1010	my $class = shift;
880		1011
881	# TODO: user_x, user_y, overwrite moveto?
882
883	my $self = $class->SUPER::new (	1012	my $self = $class->SUPER::new (
884	bg => [1, 1, 1, 1],	1013	bg => [1, 1, 1, 1],
885	border_bg => [1, 1, 1, 1],	1014	border_bg => [1, 1, 1, 1],
886	border => 0.6,	1015	border => 0.6,
887	toplevel => 1,	1016	is_toplevel => 1,
888	can_events => 1,	1017	can_events => 1,
889	@_	1018	@_
890	);	1019	);
891		1020
892	$self->{title} &&= new CFClient::UI::Label	1021	$self->{title} &&= new CFClient::UI::Label
893	align => 0,	1022	align => 0,
…		…
912	$h + $self->border * 2,	1041	$h + $self->border * 2,
913	)	1042	)
914	}	1043	}
915		1044
916	sub size_allocate {	1045	sub size_allocate {
917	my ($self, $w, $h) = @_;	1046	my ($self, $w, $h, $changed) = @_;
		1047
		1048	return unless $changed;
918		1049
919	$h -= List::Util::max 0, $self->border * 2;	1050	$h -= List::Util::max 0, $self->border * 2;
920	$w -= List::Util::max 0, $self->border * 2;	1051	$w -= List::Util::max 0, $self->border * 2;
921		1052
922	$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)
…		…
946	my ($ev, $x, $y) = @_;	1077	my ($ev, $x, $y) = @_;
947		1078
948	my $dx = $ev->{x} - $ox;	1079	my $dx = $ev->{x} - $ox;
949	my $dy = $ev->{y} - $oy;	1080	my $dy = $ev->{y} - $oy;
950		1081
		1082	$self->{user_x} = $wx + $dx * $mx;
		1083	$self->{user_y} = $wy + $dy * $my;
951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1086	$self->move ($self->{user_x}, $self->{user_y});
954	$self->check_size;	1087	$self->realloc;
955	};	1088	};
956		1089
957	} elsif ($lr ^ $td) {	1090	} elsif ($lr ^ $td) {
958	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});
959	my ($bx, $by) = ($self->{x}, $self->{y});	1092	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
961	$self->{motion} = sub {	1094	$self->{motion} = sub {
962	my ($ev, $x, $y) = @_;	1095	my ($ev, $x, $y) = @_;
963		1096
964	($x, $y) = ($ev->{x}, $ev->{y});	1097	($x, $y) = ($ev->{x}, $ev->{y});
965		1098
966	$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});
967	$self->update;	1103	$self->realloc;
968	};	1104	};
969	}	1105	}
970	}	1106	}
971		1107
972	sub button_up {	1108	sub button_up {
…		…
1033	sub new {	1169	sub new {
1034	my $class = shift;	1170	my $class = shift;
1035		1171
1036	$class->SUPER::new (	1172	$class->SUPER::new (
1037	col_expand => [],	1173	col_expand => [],
1038	@_	1174	@_,
1039	)	1175	)
		1176	}
		1177
		1178	sub children {
		1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1180	}
1041		1181
1042	sub add {	1182	sub add {
1043	my ($self, $x, $y, $child) = @_;	1183	my ($self, $x, $y, $child) = @_;
1044		1184
1045	$child->set_parent ($self);	1185	$child->set_parent ($self);
1046	$self->{children}[$y][$x] = $child;	1186	$self->{children}[$y][$x] = $child;
1047		1187
1048	$child->check_size;	1188	$self->realloc;
1049	}	1189	}
1050		1190
1051	sub children {
1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}
1054
1055	# 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?
1056	sub clear {	1192	sub clear {
1057	my ($self) = @_;	1193	my ($self) = @_;
1058		1194
1059	my @children = $self->children;	1195	my @children = $self->children;
1060	delete $self->{children};	1196	delete $self->{children};
…		…
1062	for (@children) {	1198	for (@children) {
1063	delete $_->{parent};	1199	delete $_->{parent};
1064	$_->hide;	1200	$_->hide;
1065	}	1201	}
1066		1202
1067	$self->update;	1203	$self->realloc;
1068	}	1204	}
1069		1205
1070	sub get_wh {	1206	sub get_wh {
1071	my ($self) = @_;	1207	my ($self) = @_;
1072		1208
…		…
1099	(sum @$hs),	1235	(sum @$hs),
1100	)	1236	)
1101	}	1237	}
1102		1238
1103	sub size_allocate {	1239	sub size_allocate {
1104	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h, $changed) = @_;
1105		1241
1106	my ($ws, $hs) = $self->get_wh;	1242	my ($ws, $hs) = $self->get_wh;
1107		1243
1108	my $req_w = sum @$ws;	1244	my $req_w = (sum @$ws) || 1;
1109	my $req_h = sum @$hs;	1245	my $req_h = (sum @$hs) || 1;
1110		1246
1111	# TODO: nicer code && do row_expand	1247	# TODO: nicer code && do row_expand
1112	my @col_expand = @{$self->{col_expand}};	1248	my @col_expand = @{$self->{col_expand}};
1113	@col_expand = (1) x @$ws unless @col_expand;	1249	@col_expand = (1) x @$ws unless @col_expand;
1114	my $col_expand = (sum @col_expand) || 1;	1250	my $col_expand = (sum @col_expand) || 1;
…		…
1168	}	1304	}
1169	}	1305	}
1170		1306
1171	#############################################################################	1307	#############################################################################
1172		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
1173	package CFClient::UI::HBox;	1369	package CFClient::UI::HBox;
1174		1370
1175	# TODO: wrap into common Box base class
1176
1177	our @ISA = CFClient::UI::Container::;	1371	our @ISA = CFClient::UI::Box::;
1178		1372
1179	sub size_request {	1373	sub new {
1180	my ($self) = @_;	1374	my $class = shift;
1181		1375
1182	my @alloc = map [$_->size_request], @{$self->{children}};	1376	$class->SUPER::new (
1183		1377	vertical => 0,
1184	(	1378	@_,
1185	(List::Util::sum map $_->[0], @alloc),
1186	(List::Util::max map $_->[1], @alloc),
1187	)	1379	)
1188	}	1380	}
1189		1381
1190	sub size_allocate {
1191	my ($self, $w, $h) = @_;
1192
1193	($h, $w) = ($w, $h);
1194
1195	my $children = $self->{children};
1196
1197	my @h = map $_->{req_w}, @$children;
1198
1199	my $req_h = List::Util::sum @h;
1200
1201	if ($req_h > $h) {
1202	# ah well, not enough space
1203	$_ *= $h / $req_h for @h;
1204	} else {
1205	my $exp = List::Util::sum map $_->{expand}, @$children;
1206	$exp ||= 1;
1207
1208	for (0 .. $#$children) {
1209	my $child = $children->[$_];
1210
1211	my $alloc_h = $h[$_];
1212	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213	$h[$_] = $alloc_h;
1214	}
1215	}
1216
1217	CFClient::UI::harmonize \@h;
1218
1219	my $y = 0;
1220	for (0 .. $#$children) {
1221	my $child = $children->[$_];
1222	my $h = $h[$_];
1223	$child->configure ($y, 0, $h, $w);
1224
1225	$y += $h;
1226	}
1227
1228	1
1229	}
1230
1231	#############################################################################	1382	#############################################################################
1232		1383
1233	package CFClient::UI::VBox;	1384	package CFClient::UI::VBox;
1234		1385
1235	# TODO: wrap into common Box base class
1236
1237	our @ISA = CFClient::UI::Container::;	1386	our @ISA = CFClient::UI::Box::;
1238		1387
1239	sub size_request {	1388	sub new {
1240	my ($self) = @_;	1389	my $class = shift;
1241		1390
1242	my @alloc = map [$_->size_request], @{$self->{children}};	1391	$class->SUPER::new (
1243		1392	vertical => 1,
1244	(	1393	@_,
1245	(List::Util::max map $_->[0], @alloc),
1246	(List::Util::sum map $_->[1], @alloc),
1247	)	1394	)
1248	}
1249
1250	sub size_allocate {
1251	my ($self, $w, $h) = @_;
1252
1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255	my $children = $self->{children};
1256
1257	my @h = map $_->{req_h}, @$children;
1258
1259	my $req_h = List::Util::sum @h;
1260
1261	if ($req_h > $h) {
1262	# ah well, not enough space
1263	$_ *= $h / $req_h for @h;
1264	} else {
1265	my $exp = List::Util::sum map $_->{expand}, @$children;
1266	$exp ||= 1;
1267
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270
1271	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272	}
1273	}
1274
1275	CFClient::UI::harmonize \@h;
1276
1277	my $y = 0;
1278	for (0 .. $#$children) {
1279	my $child = $children->[$_];
1280	my $h = $h[$_];
1281	$child->configure (0, $y, $w, $h);
1282
1283	$y += $h;
1284	}
1285
1286	1
1287	}	1395	}
1288		1396
1289	#############################################################################	1397	#############################################################################
1290		1398
1291	package CFClient::UI::Label;	1399	package CFClient::UI::Label;
…		…
1354	$self->{text} = "T$text";	1462	$self->{text} = "T$text";
1355		1463
1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357	$self->{layout}->set_text ($text);	1465	$self->{layout}->set_text ($text);
1358		1466
		1467	$self->realloc;
1359	$self->update;	1468	$self->update;
1360	$self->check_size;
1361	}	1469	}
1362		1470
1363	sub set_markup {	1471	sub set_markup {
1364	my ($self, $markup) = @_;	1472	my ($self, $markup) = @_;
1365		1473
…		…
1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370		1478
1371	$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;
1372	$self->{layout}->set_markup ($markup);	1480	$self->{layout}->set_markup ($markup);
1373		1481
		1482	$self->realloc;
1374	$self->update;	1483	$self->update;
1375	$self->check_size;
1376	}	1484	}
1377		1485
1378	sub size_request {	1486	sub size_request {
1379	my ($self) = @_;	1487	my ($self) = @_;
1380		1488
…		…
1401	$h + $self->{padding} * 2,	1509	$h + $self->{padding} * 2,
1402	)	1510	)
1403	}	1511	}
1404		1512
1405	sub size_allocate {	1513	sub size_allocate {
1406	my ($self, $w, $h) = @_;	1514	my ($self, $w, $h, $changed) = @_;
1407		1515
1408	delete $self->{texture};	1516	delete $self->{texture}
		1517	if $changed;
1409	}	1518	}
1410		1519
1411	sub set_fontsize {	1520	sub set_fontsize {
1412	my ($self, $fontsize) = @_;	1521	my ($self, $fontsize) = @_;
1413		1522
1414	$self->{fontsize} = $fontsize;	1523	$self->{fontsize} = $fontsize;
1415	delete $self->{texture};	1524	delete $self->{texture};
1416		1525
1417	$self->update;	1526	$self->realloc;
1418	$self->check_size;
1419	}	1527	}
1420		1528
1421	sub _draw {	1529	sub _draw {
1422	my ($self) = @_;	1530	my ($self) = @_;
1423		1531
…		…
1475	active_fg => [0, 0, 0],	1583	active_fg => [0, 0, 0],
1476	can_hover => 1,	1584	can_hover => 1,
1477	can_focus => 1,	1585	can_focus => 1,
1478	valign => 0,	1586	valign => 0,
1479	can_events => 1,	1587	can_events => 1,
		1588	#text => ...
1480	@_	1589	@_
1481	)	1590	)
1482	}	1591	}
1483		1592
1484	sub _set_text {	1593	sub _set_text {
…		…
1494	$self->{text} = $text;	1603	$self->{text} = $text;
1495		1604
1496	$text =~ s/./*/g if $self->{hidden};	1605	$text =~ s/./*/g if $self->{hidden};
1497	$self->{layout}->set_text ("$text ");	1606	$self->{layout}->set_text ("$text ");
1498		1607
1499	$self->emit (changed => $self->{text});	1608	$self->_emit (changed => $self->{text});
1500	}	1609	}
1501		1610
1502	sub set_text {	1611	sub set_text {
1503	my ($self, $text) = @_;	1612	my ($self, $text) = @_;
1504		1613
1505	$self->{cursor} = length $text;	1614	$self->{cursor} = length $text;
1506	$self->_set_text ($text);	1615	$self->_set_text ($text);
1507	$self->update;	1616
1508	$self->check_size;	1617	$self->realloc;
1509	}	1618	}
1510		1619
1511	sub get_text {	1620	sub get_text {
1512	$_[0]{text}	1621	$_[0]{text}
1513	}	1622	}
…		…
1516	my ($self) = @_;	1625	my ($self) = @_;
1517		1626
1518	my ($w, $h) = $self->SUPER::size_request;	1627	my ($w, $h) = $self->SUPER::size_request;
1519		1628
1520	($w + 1, $h) # add 1 for cursor	1629	($w + 1, $h) # add 1 for cursor
1521	}
1522
1523	sub size_allocate {
1524	my ($self, $w, $h) = @_;
1525
1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527	}	1630	}
1528		1631
1529	sub key_down {	1632	sub key_down {
1530	my ($self, $ev) = @_;	1633	my ($self, $ev) = @_;
1531		1634
…		…
1546	} elsif ($sym == CFClient::SDLK_HOME) {	1649	} elsif ($sym == CFClient::SDLK_HOME) {
1547	$self->{cursor} = 0;	1650	$self->{cursor} = 0;
1548	} elsif ($sym == CFClient::SDLK_END) {	1651	} elsif ($sym == CFClient::SDLK_END) {
1549	$self->{cursor} = length $text;	1652	$self->{cursor} = length $text;
1550	} elsif ($uni == 27) {	1653	} elsif ($uni == 27) {
1551	$self->emit ('escape');	1654	$self->_emit ('escape');
1552	} elsif ($uni) {	1655	} elsif ($uni) {
1553	substr $text, $self->{cursor}++, 0, chr $uni;	1656	substr $text, $self->{cursor}++, 0, chr $uni;
1554	}	1657	}
1555		1658
1556	$self->_set_text ($text);	1659	$self->_set_text ($text);
1557	$self->update;	1660
1558	$self->check_size;	1661	$self->realloc;
1559	}	1662	}
1560		1663
1561	sub focus_in {	1664	sub focus_in {
1562	my ($self) = @_;	1665	my ($self) = @_;
1563		1666
…		…
1643	if ($sym == 13) {	1746	if ($sym == 13) {
1644	unshift @{$self->{history}},	1747	unshift @{$self->{history}},
1645	my $txt = $self->get_text;	1748	my $txt = $self->get_text;
1646	$self->{history_pointer} = -1;	1749	$self->{history_pointer} = -1;
1647	$self->{history_saveback} = '';	1750	$self->{history_saveback} = '';
1648	$self->emit (activate => $txt);	1751	$self->_emit (activate => $txt);
1649	$self->update;	1752	$self->update;
1650		1753
1651	} elsif ($sym == CFClient::SDLK_UP) {	1754	} elsif ($sym == CFClient::SDLK_UP) {
1652	if ($self->{history_pointer} < 0) {	1755	if ($self->{history_pointer} < 0) {
1653	$self->{history_saveback} = $self->get_text;	1756	$self->{history_saveback} = $self->get_text;
…		…
1701	can_events => 1,	1804	can_events => 1,
1702	@_	1805	@_
1703	)	1806	)
1704	}	1807	}
1705		1808
		1809	sub activate { }
		1810
1706	sub button_up {	1811	sub button_up {
1707	my ($self, $ev, $x, $y) = @_;	1812	my ($self, $ev, $x, $y) = @_;
1708		1813
		1814	$self->emit ("activate")
1709	if ($x >= 0 && $x < $self->{w}	1815	if $x >= 0 && $x < $self->{w}
1710	&& $y >= 0 && $y < $self->{h}) {	1816	&& $y >= 0 && $y < $self->{h};
1711	$self->emit ("activate");
1712	}
1713	}	1817	}
1714		1818
1715	sub _draw {	1819	sub _draw {
1716	my ($self) = @_;	1820	my ($self) = @_;
1717		1821
…		…
1769	my ($self, $ev, $x, $y) = @_;	1873	my ($self, $ev, $x, $y) = @_;
1770		1874
1771	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1772	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1773	$self->{state} = !$self->{state};	1877	$self->{state} = !$self->{state};
1774	$self->emit (changed => $self->{state});	1878	$self->_emit (changed => $self->{state});
1775	}	1879	}
1776	}	1880	}
1777		1881
1778	sub _draw {	1882	sub _draw {
1779	my ($self) = @_;	1883	my ($self) = @_;
…		…
2054	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
2055	fg => [1, 1, 1],	2159	fg => [1, 1, 1],
2056	active_fg => [0, 0, 0],	2160	active_fg => [0, 0, 0],
2057	bg => [0, 0, 0, 0.2],	2161	bg => [0, 0, 0, 0.2],
2058	active_bg => [1, 1, 1, 0.5],	2162	active_bg => [1, 1, 1, 0.5],
2059	range => [0, 0, 100, 10],	2163	range => [0, 0, 100, 10, 0],
2060	req_w => $::WIDTH / 80,	2164	req_w => $::WIDTH / 80,
2061	req_h => $::WIDTH / 80,	2165	req_h => $::WIDTH / 80,
2062	vertical => 0,	2166	vertical => 0,
2063	can_hover => 1,	2167	can_hover => 1,
2064	inner_pad => 0.02,	2168	inner_pad => 0.02,
…		…
2069	$self->update;	2173	$self->update;
2070		2174
2071	$self	2175	$self
2072	}	2176	}
2073		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
2074	sub set_value {	2189	sub set_value {
2075	my ($self, $value) = @_;	2190	my ($self, $value) = @_;
2076		2191
2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078		2193
2079	$hi = $lo + 1 if $hi <= $lo;	2194	$hi = $lo + 1 if $hi <= $lo;
2080		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
2081	$value = $lo if $value < $lo;	2198	$value = $lo if $value < $lo;
2082	$value = $hi if $value > $hi;	2199	$value = $hi - $page if $value > $hi - $page;
2083		2200
2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085	if $unit;	2202	if $unit;
2086		2203
2087	$page = $hi - $lo if $page > $hi - $lo;
2088
2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090		2205
2091	if ($value != $old_value) {	2206	if ($value != $old_value) {
2092	$self->emit (changed => $value);	2207	$self->_emit (changed => $value);
2093	$self->update;	2208	$self->update;
2094	}	2209	}
2095	}	2210	}
2096		2211
2097	sub size_request {	2212	sub size_request {
…		…
2105		2220
2106	sub button_down {	2221	sub button_down {
2107	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
2108		2223
2109	$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
2110	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
2111	}	2229	}
2112		2230
2113	sub mouse_motion {	2231	sub mouse_motion {
2114	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
…		…
2116	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118		2236
2119	my (undef, $lo, $hi, $page) = @{$self->{range}};	2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
2120		2238
2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122		2240
2123	$self->set_value ($x * ($hi - $lo) + $lo);	2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2124	}	2242	}
2125	}	2243	}
2126		2244
2127	sub update {	2245	sub update {
2128	my ($self) = @_;	2246	my ($self) = @_;
2129		2247
2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131	$self->set_value ($self->{range}[0]);	2249	$self->set_value ($self->{range}[0]);
2132		2250
2133	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2134		2253
2135	my $inner_w = 1 - 2 * $self->{inner_pad};	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136		2255
2137	$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;
2138		2258
2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2259	$value = ($value - $lo) / $range;
2140	$value = $self->{scale} * ($value - $lo);	2260	$value = $value * $self->{scale} + $self->{offset};
2141		2261
2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144	$value = 0 if $value < 0;
2145	$page = 1 - $value if $value + $page > 1;
2146
2147	$self->{knob_x} = $value;	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2148	$self->{knob_w} = $page;	2263	$self->{knob_w} = $knob_w;
2149	});	2264	});
2150		2265
2151	$self->SUPER::update;	2266	$self->SUPER::update;
2152	}	2267	}
2153		2268
…		…
2177	# draw handle	2292	# draw handle
2178	$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);
2179		2294
2180	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2181	}	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 (@_) }
2182		2338
2183	#############################################################################	2339	#############################################################################
2184		2340
2185	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2186		2342
…		…
2217	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2218	$self->reflow;	2374	$self->reflow;
2219	}	2375	}
2220		2376
2221	sub size_allocate {	2377	sub size_allocate {
2222	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h, $changed) = @_;
2223		2379
2224	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h, $changed);
		2381
		2382	return unless $changed;
2225		2383
2226	$self->{layout}->set_font ($self->{font}) if $self->{font};	2384	$self->{layout}->set_font ($self->{font}) if $self->{font};
2227	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2228	$self->{layout}->set_width ($self->{children}[0]{w});	2386	$self->{layout}->set_width ($self->{children}[0]{w});
2229		2387
2230	$self->reflow;	2388	$self->reflow;
2231	}	2389	}
2232		2390
2233	sub text_height {	2391	sub text_size {
2234	my ($self, $text, $indent) = @_;	2392	my ($self, $text, $indent) = @_;
2235		2393
2236	my $layout = $self->{layout};	2394	my $layout = $self->{layout};
2237		2395
2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2396	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239	$layout->set_width ($self->{children}[0]{w} - $indent);	2397	$layout->set_width ($self->{children}[0]{w} - $indent);
2240	$layout->set_markup ($text);	2398	$layout->set_markup ($text);
2241		2399
2242	($layout->size)[1]	2400	$layout->size
2243	}	2401	}
2244		2402
2245	sub reflow {	2403	sub reflow {
2246	my ($self) = @_;	2404	my ($self) = @_;
2247		2405
2248	$self->{need_reflow}++;	2406	$self->{need_reflow}++;
2249	$self->update;	2407	$self->update;
2250	}	2408	}
2251		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
2252	sub add_paragraph {	2425	sub add_paragraph {
2253	my ($self, $color, $text, $indent) = @_;	2426	my ($self, $color, $text, $indent) = @_;
2254		2427
2255	#TODO: intelligently "reformat" paragraph
2256
2257	for my $line (split /\n/, $text) {	2428	for my $line (split /\n/, $text) {
2258	my $height = $self->text_height ($line);	2429	my ($w, $h) = $self->text_size ($line);
2259	$self->{height} += $height;	2430	$self->{height} += $h;
2260	push @{$self->{par}}, [$height, $color, $indent, $line];	2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261	}	2432	}
2262		2433
2263	$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]);
2264	$self->{children}[1]->update;
2265	}	2435	}
2266		2436
2267	sub update {	2437	sub update {
2268	my ($self) = @_;	2438	my ($self) = @_;
2269		2439
…		…
2272	return unless $self->{h} > 0;	2442	return unless $self->{h} > 0;
2273		2443
2274	delete $self->{texture};	2444	delete $self->{texture};
2275		2445
2276	$ROOT->on_post_alloc ($self, sub {	2446	$ROOT->on_post_alloc ($self, sub {
		2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2448
2277	if (delete $self->{need_reflow}) {	2449	if (delete $self->{need_reflow}) {
2278	my $height = 0;	2450	my $height = 0;
2279		2451
2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2455
2281	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	}
2282		2467
2283	$self->{height} = $height;	2468	$self->{height} = $height;
2284		2469
2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286	$self->{children}[1]->update;
2287		2471
2288	delete $self->{texture};	2472	delete $self->{texture};
2289	}	2473	}
2290		2474
2291	$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 {
2292	glClearColor 0.5, 0.5, 0.5, 0;	2476	glClearColor 0.5, 0.5, 0.5, 0;
2293	glClear GL_COLOR_BUFFER_BIT;	2477	glClear GL_COLOR_BUFFER_BIT;
2294		2478
2295	my $top = int $self->{children}[1]{range}[0];	2479	my $top = int $self->{children}[1]{range}[0];
2296		2480
2297	my $y0 = $top;	2481	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2482	my $y1 = $top + $H;
2299		2483
2300	my $y = 0;	2484	my $y = 0;
2301		2485
2302	my $layout = $self->{layout};	2486	my $layout = $self->{layout};
2303		2487
2304	$layout->set_font ($self->{font}) if $self->{font};	2488	$layout->set_font ($self->{font}) if $self->{font};
2305		2489
2306	glEnable GL_BLEND;	2490	glEnable GL_BLEND;
		2491	#TODO# not correct in windows where rgba is forced off
2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308		2493
2309	for my $par (@{$self->{par}}) {	2494	for my $par (@{$self->{par}}) {
2310	my $h = $par->[0];	2495	my $h = $par->[1];
2311		2496
2312	if ($y0 < $y + $h && $y < $y1) {	2497	if ($y0 < $y + $h && $y < $y1) {
2313	$layout->set_foreground (@{ $par->[1] });	2498	$layout->set_foreground (@{ $par->[2] });
2314	$layout->set_width ($self->{w} - $par->[2]);	2499	$layout->set_width ($W - $par->[3]);
2315	$layout->set_markup ($par->[3]);	2500	$layout->set_markup ($par->[4]);
2316		2501
2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318		2503
2319	glRasterPos $par->[2], $y - $y0;	2504	glRasterPos $par->[3], $y - $y0;
2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321	}	2506	}
2322		2507
2323	$y += $h;	2508	$y += $h;
2324	}	2509	}
…		…
2391		2576
2392	sub new {	2577	sub new {
2393	my $class = shift;	2578	my $class = shift;
2394		2579
2395	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2396	state => 0,	2581	state => 0,
2397	connect_activate => \&toggle_flopper,	2582	on_activate => \&toggle_flopper,
2398	@_	2583	@_
2399	);	2584	);
2400		2585
2401	if ($self->{state}) {
2402	$self->{state} = 0;
2403	$self->toggle_flopper;
2404	}
2405
2406	$self	2586	$self
2407	}	2587	}
2408		2588
2409	sub toggle_flopper {	2589	sub toggle_flopper {
2410	my ($self) = @_;	2590	my ($self) = @_;
2411		2591
2412	# TODO: use animation	2592	$self->{other}->toggle_visibility;
2413	if ($self->{state} = !$self->{state}) {
2414	$CFClient::UI::ROOT->add ($self->{other});
2415	$self->{other}->move ($self->coord2global (0, $self->{h}));
2416	$self->emit ("open");
2417	} else {
2418	$CFClient::UI::ROOT->remove ($self->{other});
2419	$self->emit ("close");
2420	}
2421
2422	$self->emit (changed => $self->{state});
2423	}	2593	}
2424		2594
2425	#############################################################################	2595	#############################################################################
2426		2596
2427	package CFClient::UI::Tooltip;	2597	package CFClient::UI::Tooltip;
…		…
2459		2629
2460	($w + 4, $h + 4)	2630	($w + 4, $h + 4)
2461	}	2631	}
2462		2632
2463	sub size_allocate {	2633	sub size_allocate {
2464	my ($self, $w, $h) = @_;	2634	my ($self, $w, $h, $changed) = @_;
2465		2635
		2636	return unless $changed;
		2637
2466	$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
		2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2650
		2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2652	if $x + $self->{w} > $::WIDTH;
		2653
		2654	$self->move ($x, $y);
		2655	});
2467	}	2656	}
2468		2657
2469	sub _draw {	2658	sub _draw {
2470	my ($self) = @_;	2659	my ($self) = @_;
2471		2660
…		…
2488	glVertex $w, $h;	2677	glVertex $w, $h;
2489	glVertex $w, 0;	2678	glVertex $w, 0;
2490	glEnd;	2679	glEnd;
2491		2680
2492	glTranslate 2 - 0.375, 2 - 0.375;	2681	glTranslate 2 - 0.375, 2 - 0.375;
		2682
2493	$self->SUPER::_draw;	2683	$self->SUPER::_draw;
2494	}	2684	}
2495		2685
2496	#############################################################################	2686	#############################################################################
2497		2687
…		…
2503		2693
2504	sub new {	2694	sub new {
2505	my $class = shift;	2695	my $class = shift;
2506		2696
2507	my $self = $class->SUPER::new (	2697	my $self = $class->SUPER::new (
2508	aspect => 1,	2698	aspect => 1,
		2699	can_events => 0,
2509	@_,	2700	@_,
2510	);	2701	);
2511		2702
2512	if ($self->{anim} && $self->{animspeed}) {	2703	if ($self->{anim} && $self->{animspeed}) {
2513	Scalar::Util::weaken (my $widget = $self);	2704	Scalar::Util::weaken (my $widget = $self);
…		…
2539	}	2730	}
2540		2731
2541	sub _draw {	2732	sub _draw {
2542	my ($self) = @_;	2733	my ($self) = @_;
2543		2734
2544	return unless $::CONN;#d# manage and cache textures differently	2735	return unless $::CONN;
2545		2736
2546	my $face;	2737	my $face;
2547		2738
2548	if ($self->{frame}) {	2739	if ($self->{frame}) {
2549	my $anim = $::CONN->{anim}[$self->{anim}];	2740	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2572	$self->SUPER::DESTROY;	2763	$self->SUPER::DESTROY;
2573	}	2764	}
2574		2765
2575	#############################################################################	2766	#############################################################################
2576		2767
2577	package CFClient::UI::InventoryItem;	2768	package CFClient::UI::Inventory;
2578		2769
2579	our @ISA = CFClient::UI::HBox::;	2770	our @ISA = CFClient::UI::ScrolledWindow::;
2580
2581	sub _item_to_desc {
2582	my ($item) = @_;
2583
2584	my $desc =
2585	$item->{nrof} < 2
2586	? $item->{name}
2587	: "$item->{nrof} × $item->{name_pl}";
2588
2589	$item->{flags} & Crossfire::Protocol::F_OPEN
2590	and $desc .= " (open)";
2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
2592	and $desc .= " (applied)";
2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
2594	and $desc .= " (unpaid)";
2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
2596	and $desc .= " (magic)";
2597	$item->{flags} & Crossfire::Protocol::F_CURSED
2598	and $desc .= " (cursed)";
2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
2600	and $desc .= " (damned)";
2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
2602	and $desc .= " *";
2603
2604	$desc
2605	}
2606		2771
2607	sub new {	2772	sub new {
2608	my $class = shift;	2773	my $class = shift;
2609		2774
2610	my %args = @_;
2611
2612	my $item = delete $args{item};
2613
2614	my $desc = _item_to_desc ($item);
2615
2616	my $self = $class->SUPER::new (	2775	my $self = $class->SUPER::new (
2617	can_hover => 1,	2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2618	can_events => 1,
2619	tooltip => ((CFClient::UI::Label::escape $desc)
2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621	connect_button_down => sub {
2622	my ($self, $ev, $x, $y) = @_;
2623
2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2625	if ($ev->{button} == 1) {
2626	my $targ = $::CONN->{player}{tag};
2627
2628	if ($item->{container} == $::CONN->{player}{tag}) {
2629	$targ = $main::OPENCONT;
2630	}
2631
2632	$::CONN->send ("move $targ $item->{tag} 0");
2633	} elsif ($ev->{button} == 2) {
2634	$::CONN->send ("apply $item->{tag}");
2635	} elsif ($ev->{button} == 3) {
2636	my @menu_items = (
2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640	(
2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
2642	? (
2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644	)
2645	: (
2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648	)
2649	),
2650	);
2651
2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653	}
2654
2655	1
2656	},
2657	%args
2658	);
2659
2660
2661	$self->add (new CFClient::UI::Face
2662	can_events => 0,
2663	face => $item->{face},
2664	anim => $item->{anim},
2665	animspeed => $item->{animspeed},
2666	);
2667
2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670	$self->{item} = $item;
2671
2672	$self->update_item;
2673
2674	$self
2675	}
2676
2677	sub update_item {
2678	my ($self) = @_;
2679
2680	my $desc = _item_to_desc ($self->{item});
2681
2682	$self->{name_lbl}->set_text ($desc);
2683	}
2684
2685	#############################################################################
2686
2687	package CFClient::UI::Inventory;
2688
2689	our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691	sub new {
2692	my $class = shift;
2693
2694	my $self = $class->SUPER::new (
2695	scrolled => (new CFClient::UI::VBox),
2696	@_,	2777	@_,
2697	);	2778	);
2698		2779
2699	$self	2780	$self
2700	}	2781	}
…		…
2710	or ($a->{name} cmp $b->{name})	2791	or ($a->{name} cmp $b->{name})
2711	} @$items;	2792	} @$items;
2712		2793
2713	$self->{real_items} = \@items;	2794	$self->{real_items} = \@items;
2714		2795
		2796	my $row = 0;
2715	for my $item (@items) {	2797	for my $item (@items) {
2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2798	CFClient::Item::update_widgets $item;
2717	$item->update_item ();
2718	}
2719		2799
2720	$self->{scrolled}->add (@items);	2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2721		2803
2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2804	$row++;
2723	}	2805	}
2724
2725	sub size_request {
2726	my ($self) = @_;
2727	($self->{req_w}, $self->{req_h});
2728	}	2806	}
2729		2807
2730	#############################################################################	2808	#############################################################################
2731		2809
2732	package CFClient::UI::Menu;	2810	package CFClient::UI::Menu;
…		…
2767		2845
2768	# popup given the event (must be a mouse button down event currently)	2846	# popup given the event (must be a mouse button down event currently)
2769	sub popup {	2847	sub popup {
2770	my ($self, $ev) = @_;	2848	my ($self, $ev) = @_;
2771		2849
2772	$self->emit ("popdown");	2850	$self->_emit ("popdown");
2773		2851
2774	# maybe save $GRAB? must be careful about events...	2852	# maybe save $GRAB? must be careful about events...
2775	$GRAB = $self;	2853	$GRAB = $self;
2776	$self->{button} = $ev->{button};	2854	$self->{button} = $ev->{button};
2777		2855
…		…
2792		2870
2793	if ($ev->{button} == $self->{button}) {	2871	if ($ev->{button} == $self->{button}) {
2794	undef $GRAB;	2872	undef $GRAB;
2795	$self->hide;	2873	$self->hide;
2796		2874
2797	$self->emit ("popdown");	2875	$self->_emit ("popdown");
2798	$self->{hover}[1]->() if $self->{hover};	2876	$self->{hover}[1]->() if $self->{hover};
2799	}	2877	}
2800	}	2878	}
2801		2879
2802	#############################################################################	2880	#############################################################################
…		…
2864	sub add {	2942	sub add {
2865	my ($self, $text, %arg) = @_;	2943	my ($self, $text, %arg) = @_;
2866		2944
2867	$text =~ s/^\s+//;	2945	$text =~ s/^\s+//;
2868	$text =~ s/\s+$//;	2946	$text =~ s/\s+$//;
		2947
		2948	return unless $text;
2869		2949
2870	my $timeout = time + ((delete $arg{timeout}) || 60);	2950	my $timeout = time + ((delete $arg{timeout}) || 60);
2871		2951
2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2952	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873		2953
…		…
2916	use CFClient::OpenGL;	2996	use CFClient::OpenGL;
2917		2997
2918	sub new {	2998	sub new {
2919	my $class = shift;	2999	my $class = shift;
2920		3000
2921	$class->SUPER::new (	3001	my $self = $class->SUPER::new (
		3002	visible => 1,
2922	@_,	3003	@_,
2923	)	3004	);
		3005
		3006	Scalar::Util::weaken ($self->{root} = $self);
		3007
		3008	$self
2924	}	3009	}
2925		3010
2926	sub configure {	3011	sub configure {
2927	my ($self, $x, $y, $w, $h) = @_;	3012	my ($self, $x, $y, $w, $h) = @_;
2928		3013
2929	$self->{w} = $w;	3014	$self->{w} = $w;
2930	$self->{h} = $h;	3015	$self->{h} = $h;
2931	}	3016	}
2932		3017
2933	sub check_size {	3018	sub reconfigure {
2934	my ($self) = @_;	3019	my ($self) = @_;
2935		3020
		3021	$self->SUPER::reconfigure;
		3022
2936	$self->size_allocate ($self->{w}, $self->{h})	3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
2937	if $self->{w};	3024	if $self->{w};
2938	}	3025	}
2939		3026
2940	sub size_request {	3027	sub size_request {
2941	my ($self) = @_;	3028	my ($self) = @_;
2942		3029
2943	($self->{w}, $self->{h})	3030	($self->{w}, $self->{h})
2944	}	3031	}
2945		3032
2946	sub size_allocate {	3033	sub size_allocate {
2947	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h, $changed) = @_;
2948
2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954		3035
2955	for my $child ($self->children) {	3036	for my $child ($self->children) {
2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957		3038
2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959	if exists $child->{req_x};	3040	if exists $child->{req_x};
2960		3041
2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962	if exists $child->{req_y};	3043	if exists $child->{req_y};
2963		3044
		3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3046
2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966		3049
2967	$child->configure ($X, $Y, $W, $H);	3050	$child->configure ($X, $Y, $W, $H);
2968	}	3051	}
…		…
2981	}	3064	}
2982		3065
2983	sub update {	3066	sub update {
2984	my ($self) = @_;	3067	my ($self) = @_;
2985		3068
2986	$self->check_size;
2987	$::WANT_REFRESH++;	3069	$::WANT_REFRESH++;
2988	}	3070	}
2989		3071
2990	sub add {	3072	sub add {
2991	my ($self, @children) = @_;	3073	my ($self, @children) = @_;
2992		3074
2993	for my $child (@children) {	3075	for my $child (@children) {
2994	$child->{toplevel} = 1;	3076	$child->{is_toplevel} = 1;
2995		3077
2996	# integerise window positions	3078	# integerise window positions
2997	$child->{x} = int $child->{x};	3079	$child->{x} = int $child->{x};
2998	$child->{y} = int $child->{y};	3080	$child->{y} = int $child->{y};
2999	}	3081	}
3000		3082
3001	$self->SUPER::add (@children);	3083	$self->SUPER::add (@children);
		3084	}
		3085
		3086	sub remove {
		3087	my ($self, @children) = @_;
		3088
		3089	$self->SUPER::remove (@children);
3002		3090
3003	while (@children) {	3091	while (@children) {
3004	my $w = pop @children;	3092	my $w = pop @children;
3005	push @children, $w->children;	3093	push @children, $w->children;
3006	$w->{visible} = 1;	3094	$w->set_invisible;
3007	}
3008	}
3009
3010	sub remove {
3011	my ($self, @children) = @_;
3012
3013	$self->SUPER::remove (@children);
3014
3015	while (@children) {
3016	my $w = pop @children;
3017	push @children, $w->children;
3018	delete $w->{visible};
3019	}	3095	}
3020	}	3096	}
3021		3097
3022	sub on_refresh {	3098	sub on_refresh {
3023	my ($self, $id, $cb) = @_;	3099	my ($self, $id, $cb) = @_;
…		…
3037	while ($self->{refresh_hook}) {	3113	while ($self->{refresh_hook}) {
3038	$_->()	3114	$_->()
3039	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{refresh_hook}};
3040	}	3116	}
3041		3117
3042	if ($self->{check_size}) {	3118	if ($self->{realloc}) {
3043	my @queue = ([], []);	3119	my @queue;
3044		3120
3045	for (;;) {	3121	while () {
3046	if ($self->{check_size}) {	3122	if ($self->{realloc}) {
3047	# heuristic: check containers last	3123	#TODO use array-of-depth approach
3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3124
3049	for values %{delete $self->{check_size}}	3125	@queue = sort { $a->{visible} <=> $b->{visible} }
		3126	@queue, values %{delete $self->{realloc}};
3050	}	3127	}
3051		3128
3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3129	my $widget = pop @queue || last;
3053		3130
		3131	$widget->{visible} or last; # do not resize invisible widgets
		3132
3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3055	? @$widget{qw(user_w user_h)}	3134	? @$widget{qw(def_w def_h)}
3056	: $widget->size_request;	3135	: $widget->size_request;
3057		3136
3058	if (delete $widget->{force_alloc}
3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061		3138
3062	$widget->{req_w} = $w;	3139	$widget->{req_w} = $w;
3063	$widget->{req_h} = $h;	3140	$widget->{req_h} = $h;
3064		3141
3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3066		3143
3067	$widget->{parent}->check_size	3144	push @queue, $widget->{parent}
3068	if $widget->{parent};	3145	if $widget->{parent};
3069	}
3070	}	3146	}
3071	}	3147	}
3072		3148
3073	while ($self->{size_alloc}) {	3149	while (my $size_alloc = delete $self->{size_alloc}) {
3074	for (values %{delete $self->{size_alloc}}) {	3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3075	my ($widget, $w, $h) = @$_;	3151	values %$size_alloc;
		3152
		3153	while () {
		3154	my ($widget, $w, $h) = @{ pop @queue or last };
3076		3155
3077	$w = 0 if $w < 0;	3156	$w = 0 if $w < 0;
3078	$h = 0 if $h < 0;	3157	$h = 0 if $h < 0;
3079		3158
		3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3160
3080	$widget->{w} = $w;	3161	$widget->{w} = $w;
3081	$widget->{h} = $h;	3162	$widget->{h} = $h;
3082	$widget->size_allocate ($w, $h);	3163
3083	$widget->emit (size_allocate => $w, $h);	3164	$widget->emit (size_allocate => $w, $h, $changed);
3084	}	3165	}
3085	}	3166	}
3086		3167
3087	while ($self->{post_alloc_hook}) {	3168	while ($self->{post_alloc_hook}) {
3088	$_->()	3169	$_->()

Diff Legend

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