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

Diff Legend

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