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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 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
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$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	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$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};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_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};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$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};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167
168	$widget->reconfigure;
169	}	190	}
		191
		192	reconfigure_widgets;
170	}	193	}
171		194
172	#############################################################################	195	#############################################################################
173		196
174	package CFClient::UI::Base;	197	package CFClient::UI::Base;
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub show_centered {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
218	return if $self->{parent};	257	return if $self->{visible};
219		258
220	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
221		261
222	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
223	"centered $self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225	},
226	);
227	}
228		263
229	sub hide {	264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
230	my ($self) = @_;	270	my ($self) = @_;
		271
		272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
		277	delete $self->{visible};
231		278
232	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
234		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
		285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
		305	}
		306
		307	sub hide {
		308	my ($self) = @_;
		309
		310	$self->set_invisible;
		311
235	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
236	if $self->{parent};	313	if $self->{parent};
237	}	314	}
238		315
239	sub move {	316	sub move_abs {
240	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
241		318
242	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
243	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
244	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
245		322
246	$self->update;	323	$self->update;
247	}	324	}
248		325
249	sub set_size {	326	sub set_size {
250	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
251		328
252	$self->{user_w} = $w;	329	$self->{force_w} = $w;
253	$self->{user_h} = $h;	330	$self->{force_h} = $h;
254		331
255	$self->check_size;	332	$self->realloc;
256	}	333	}
257		334
258	sub size_request {	335	sub size_request {
259	require Carp;	336	require Carp;
260	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
262		339
263	sub configure {	340	sub configure {
264	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
265		342
266	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
267	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
268	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
269		348
270	# use alignment to adjust x, y	349	# use alignment to adjust x, y
271		350
272	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
273	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
274
275	($w, $h) = ($w2, $h2);
276	}	353	}
277		354
278	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
279	$self->{x} = $x;	356	$self->{x} = $x;
280	$self->{y} = $y;	357	$self->{y} = $y;
281	$self->update;	358	$self->update;
282	}	359	}
283		360
284	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
286	}	368	}
287	}	369	}
288		370
289	sub size_allocate {	371	sub size_allocate {
290	# nothing to be done	372	# nothing to be done
291	}	373	}
292		374
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	375	sub children {
301	}	376	}
302		377
303	sub set_max_size {	378	sub set_max_size {
304	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	383	}
309		384
310	sub set_tooltip {	385	sub set_tooltip {
311	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
312		392
313	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
314		394
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	418	return if $FOCUS == $self;
339	return unless $self->{can_focus};	419	return unless $self->{can_focus};
340		420
341	my $focus = $FOCUS; $FOCUS = $self;	421	my $focus = $FOCUS; $FOCUS = $self;
342		422
343	$self->emit (focus_in => $focus);	423	$self->_emit (focus_in => $focus);
344		424
345	$focus->update if $focus;	425	$focus->update if $focus;
346	$FOCUS->update;	426	$FOCUS->update;
347	}	427	}
348		428
…		…
351		431
352	return unless $FOCUS == $self;	432	return unless $FOCUS == $self;
353		433
354	my $focus = $FOCUS; undef $FOCUS;	434	my $focus = $FOCUS; undef $FOCUS;
355		435
356	$self->emit (focus_out => $focus);	436	$self->_emit (focus_out => $focus);
357		437
358	$focus->update if $focus; #?	438	$focus->update if $focus; #?
		439
		440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		441	unless $FOCUS;
359	}	442	}
360		443
361	sub mouse_motion { }	444	sub mouse_motion { }
362	sub button_up { }	445	sub button_up { }
363	sub key_down { }	446	sub key_down { }
364	sub key_up { }	447	sub key_up { }
365		448
366	sub button_down {	449	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
368		451
369	$self->focus_in;	452	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		460
		461	sub find_widget {
		462	my ($self, $x, $y) = @_;
		463
		464	return () unless $self->{can_events};
		465
		466	return $self
		467	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		468	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		469
		470	()
		471	}
		472
		473	sub set_parent {
		474	my ($self, $parent) = @_;
		475
		476	Scalar::Util::weaken ($self->{parent} = $parent);
		477	$self->set_visible if $parent->{visible};
		478	}
		479
		480	sub connect {
		481	my ($self, $signal, $cb) = @_;
		482
		483	push @{ $self->{signal_cb}{$signal} }, $cb;
		484	}
		485
		486	sub _emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		490	}
		491
		492	sub emit {
		493	my ($self, $signal, @args) = @_;
		494
		495	$self->_emit ($signal, @args)
		496	|| $self->$signal (@args);
		497	}
		498
		499	sub visibility_change {
		500	#my ($self, $visible) = @_;
		501	}
		502
		503	sub realloc {
		504	my ($self) = @_;
		505
		506	if ($self->{visible}) {
		507	return if $self->{root}{realloc}{$self+0};
		508
		509	$self->{root}{realloc}{$self+0} = $self;
		510	$self->{root}->update;
		511	} else {
		512	delete $self->{req_w};
		513	delete $self->{req_h};
		514	}
		515	}
		516
		517	sub update {
		518	my ($self) = @_;
		519
		520	$self->{parent}->update
		521	if $self->{parent};
		522	}
		523
		524	sub reconfigure {
		525	my ($self) = @_;
		526
		527	$self->realloc;
		528	$self->update;
		529	}
377		530
378	sub draw {	531	sub draw {
379	my ($self) = @_;	532	my ($self) = @_;
380		533
381	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
398	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
399	glEnd;	552	glEnd;
400	glDisable GL_BLEND;	553	glDisable GL_BLEND;
401	}	554	}
402		555
403	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
404	glPushMatrix;	557	glPushMatrix;
405	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	561	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	562	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	563	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	564	glVertex 0 , $self->{h} - 1;
412	glEnd;	565	glEnd;
413	glPopMatrix;	566	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	567	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	568	}
416	}	569	}
417		570
418	sub _draw {	571	sub _draw {
419	my ($self) = @_;	572	my ($self) = @_;
420		573
421	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	575	}
473		576
474	sub DESTROY {	577	sub DESTROY {
475	my ($self) = @_;	578	my ($self) = @_;
476		579
…		…
534	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
536	}	639	}
537		640
538	sub size_request {	641	sub size_request {
539	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
540	}	645	}
541		646
542	sub draw { }	647	sub draw { }
543		648
544	#############################################################################	649	#############################################################################
…		…
573	$self->{children} = [	678	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
576	];	681	];
577		682
578	$self->check_size (1);	683	$self->realloc;
579	$self->update;
580	}	684	}
581		685
582	sub children {	686	sub children {
583	@{ $_[0]{children} }	687	@{ $_[0]{children} }
584	}	688	}
…		…
589	delete $child->{parent};	693	delete $child->{parent};
590	$child->hide;	694	$child->hide;
591		695
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		697
594	$self->check_size;	698	$self->realloc;
595	$self->update;
596	}	699	}
597		700
598	sub clear {	701	sub clear {
599	my ($self) = @_;	702	my ($self) = @_;
600		703
…		…
604	for (@$children) {	707	for (@$children) {
605	delete $_->{parent};	708	delete $_->{parent};
606	$_->hide;	709	$_->hide;
607	}	710	}
608		711
609	$self->check_size;	712	$self->realloc;
610	$self->update;
611	}	713	}
612		714
613	sub find_widget {	715	sub find_widget {
614	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
615		717
…		…
739		841
740	package CFClient::UI::ViewPort;	842	package CFClient::UI::ViewPort;
741		843
742	our @ISA = CFClient::UI::Window::;	844	our @ISA = CFClient::UI::Window::;
743		845
		846	sub new {
		847	my $class = shift;
		848
		849	$class->SUPER::new (
		850	scroll_x => 0,
		851	scroll_y => 1,
		852	@_,
		853	)
		854	}
		855
744	sub size_request {	856	sub size_request {
745	my ($self) = @_;	857	my ($self) = @_;
746		858
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748		860
749	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
750	}	865	}
751		866
752	sub size_allocate {	867	sub size_allocate {
753	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
754		869
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	870	my $child = $self->child;
756	# $w = $self->{w};	871
		872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		874
757	$self->child->configure (0, 0, $cw, $ch);	875	$self->child->configure (0, 0, $w, $h);
758	$self->update;	876	$self->update;
759	}	877	}
760		878
761	sub set_offset {	879	sub set_offset {
762	my ($self, $x, $y) = @_;	880	my ($self, $x, $y) = @_;
…		…
813	my $class = shift;	931	my $class = shift;
814		932
815	my $self;	933	my $self;
816		934
817	my $slider = new CFClient::UI::Slider	935	my $slider = new CFClient::UI::Slider
818	vertical => 1,	936	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	937	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	938	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	939	$self->{vp}->set_offset (0, $_[1]);
822	},	940	},
823	;	941	;
824		942
825	$self = $class->SUPER::new (	943	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	944	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
831	$self->{vp}->add ($self->{scrolled});	949	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});	950	$self->add ($self->{vp});
833	$self->add ($self->{slider});	951	$self->add ($self->{slider});
834		952
835	$self	953	$self
		954	}
		955
		956	sub update {
		957	my ($self) = @_;
		958
		959	$self->SUPER::update;
		960
		961	# todo: overwrite size_allocate of child
		962	my $child = $self->{vp}->child;
		963	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		964	}
		965
		966	sub size_allocate {
		967	my ($self, $w, $h) = @_;
		968
		969	$self->SUPER::size_allocate ($w, $h);
		970
		971	my $child = $self->{vp}->child;
		972	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836	}	973	}
837		974
838	#TODO# update range on size_allocate depending on child	975	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	976	# update viewport offset on scroll
840		977
…		…
884		1021
885	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
886		1023
887	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
888		1025
889	my @tex =	1026	my $bg =
		1027	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1028	mipmap => 1, wrap => 1;
		1029
		1030	my @border =
890	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1032	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892		1033
893	sub new {	1034	sub new {
894	my $class = shift;	1035	my $class = shift;
895		1036
896	# TODO: user_x, user_y, overwrite moveto?
897
898	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1040	border => 0.6,
902	toplevel => 1,
903	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
904	@_	1044	@_
905	);	1045	);
906		1046
907	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
908	align => 0,	1048	align => 0,
…		…
961	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
962		1102
963	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
965		1105
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1108
		1109	$self->realloc;
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969	$self->check_size;
970	};	1111	};
971		1112
972	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1117	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
978		1119
979	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
980		1121
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982	$self->update;
983	};	1123	};
984	}	1124	}
985	}	1125	}
986		1126
987	sub button_up {	1127	sub button_up {
…		…
1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007		1147
1008	my $border = $self->border;	1148	my $border = $self->border;
1009		1149
1010	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015		1155
1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1018		1158
1019	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1020	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1021	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1022
1023	glColor @{ $self->{bg} };
1024
1025	$bg->{s} = $rep_x;
1026	$bg->{t} = $rep_y;
1027	$bg->{wrap_mode} = 1;
1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029	}	1164	}
1030		1165
1031	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1032		1167
…		…
1048	sub new {	1183	sub new {
1049	my $class = shift;	1184	my $class = shift;
1050		1185
1051	$class->SUPER::new (	1186	$class->SUPER::new (
1052	col_expand => [],	1187	col_expand => [],
1053	@_	1188	@_,
1054	)	1189	)
		1190	}
		1191
		1192	sub children {
		1193	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1194	}
1056		1195
1057	sub add {	1196	sub add {
1058	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1059		1198
1060	$child->set_parent ($self);	1199	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1062		1201
1063	$child->check_size;	1202	$self->realloc;
1064	}	1203	}
1065		1204
1066	sub children {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068	}
1069
1070	# TODO: move to container class maybe? send childs a signal on removal?	1205	# TODO: move to container class maybe? send children a signal on removal?
1071	sub clear {	1206	sub clear {
1072	my ($self) = @_;	1207	my ($self) = @_;
1073		1208
1074	my @children = $self->children;	1209	my @children = $self->children;
1075	delete $self->{children};	1210	delete $self->{children};
…		…
1077	for (@children) {	1212	for (@children) {
1078	delete $_->{parent};	1213	delete $_->{parent};
1079	$_->hide;	1214	$_->hide;
1080	}	1215	}
1081		1216
1082	$self->update;	1217	$self->realloc;
1083	}	1218	}
1084		1219
1085	sub get_wh {	1220	sub get_wh {
1086	my ($self) = @_;	1221	my ($self) = @_;
1087		1222
…		…
1118	sub size_allocate {	1253	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1254	my ($self, $w, $h) = @_;
1120		1255
1121	my ($ws, $hs) = $self->get_wh;	1256	my ($ws, $hs) = $self->get_wh;
1122		1257
1123	my $req_w = sum @$ws;	1258	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1259	my $req_h = (sum @$hs) || 1;
1125		1260
1126	# TODO: nicer code && do row_expand	1261	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1262	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1263	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1264	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1318	}
1184	}	1319	}
1185		1320
1186	#############################################################################	1321	#############################################################################
1187		1322
1188	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1189
1190	# TODO: wrap into common Box base class
1191		1324
1192	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1193		1326
1194	sub size_request {	1327	sub size_request {
1195	my ($self) = @_;	1328	my ($self) = @_;
1196		1329
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1198		1331	? (
1199	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1200	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201	(List::Util::max map $_->[1], @alloc),	1334	)
1202	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1203	}	1339	}
1204		1340
1205	sub size_allocate {	1341	sub size_allocate {
1206	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1207		1343
1208	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1209
1210	my $children = $self->{children};	1345	my $children = $self->{children};
1211		1346
1212	my @h = map $_->{req_w}, @$children;	1347	my @req;
1213		1348
1214	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1215		1350	@req = ($space / (@$children || 1)) x @$children;
1216	if ($req_h > $h) {
1217	# ah well, not enough space
1218	$_ *= $h / $req_h for @h;
1219	} else {	1351	} else {
		1352	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1353	my $req = List::Util::sum @req;
		1354
		1355	if ($req > $space) {
		1356	# ah well, not enough space
		1357	$_ *= $space / $req for @req;
		1358	} else {
1220	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221	$exp ||= 1;
1222		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1223	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1224	my $child = $children->[$_];
1225
1226	my $alloc_h = $h[$_];
1227	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228	$h[$_] = $alloc_h;
1229	}	1365	}
1230	}	1366	}
1231		1367
1232	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1233		1369
1234	my $y = 0;	1370	my $pos = 0;
1235	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];	1372	my $alloc = $req[$_];
1238	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239		1374
1240	$y += $h;	1375	$pos += $alloc;
1241	}	1376	}
1242		1377
1243	1	1378	1
1244	}	1379	}
1245		1380
1246	#############################################################################	1381	#############################################################################
1247		1382
		1383	package CFClient::UI::HBox;
		1384
		1385	our @ISA = CFClient::UI::Box::;
		1386
		1387	sub new {
		1388	my $class = shift;
		1389
		1390	$class->SUPER::new (
		1391	vertical => 0,
		1392	@_,
		1393	)
		1394	}
		1395
		1396	#############################################################################
		1397
1248	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1249		1399
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1253		1401
1254	sub size_request {	1402	sub new {
1255	my ($self) = @_;	1403	my $class = shift;
1256		1404
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1258		1406	vertical => 1,
1259	(	1407	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1408	)
1263	}
1264
1265	sub size_allocate {
1266	my ($self, $w, $h) = @_;
1267
1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270	my $children = $self->{children};
1271
1272	my @h = map $_->{req_h}, @$children;
1273
1274	my $req_h = List::Util::sum @h;
1275
1276	if ($req_h > $h) {
1277	# ah well, not enough space
1278	$_ *= $h / $req_h for @h;
1279	} else {
1280	my $exp = List::Util::sum map $_->{expand}, @$children;
1281	$exp ||= 1;
1282
1283	for (0 .. $#$children) {
1284	my $child = $children->[$_];
1285
1286	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287	}
1288	}
1289
1290	CFClient::UI::harmonize \@h;
1291
1292	my $y = 0;
1293	for (0 .. $#$children) {
1294	my $child = $children->[$_];
1295	my $h = $h[$_];
1296	$child->configure (0, $y, $w, $h);
1297
1298	$y += $h;
1299	}
1300
1301	1
1302	}	1409	}
1303		1410
1304	#############################################################################	1411	#############################################################################
1305		1412
1306	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1323	ellipsise => 3, # end	1430	ellipsise => 3, # end
1324	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1325	fontsize => 1,	1432	fontsize => 1,
1326	align => -1,	1433	align => -1,
1327	valign => -1,	1434	valign => -1,
1328	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1329	can_events => 0,	1437	can_events => 0,
1330	%arg	1438	%arg
1331	);	1439	);
1332		1440
1333	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1369	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1370		1478
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1373		1481
		1482	$self->realloc;
1374	$self->update;	1483	$self->update;
1375	$self->check_size;
1376	}	1484	}
1377		1485
1378	sub set_markup {	1486	sub set_markup {
1379	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1380		1488
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1493
1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1388		1496
		1497	$self->realloc;
1389	$self->update;	1498	$self->update;
1390	$self->check_size;
1391	}	1499	}
1392		1500
1393	sub size_request {	1501	sub size_request {
1394	my ($self) = @_;	1502	my ($self) = @_;
1395		1503
…		…
1409		1517
1410	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1411	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1412	}	1520	}
1413		1521
1414	(	1522	($w, $h)
1415	$w + $self->{padding} * 2,
1416	$h + $self->{padding} * 2,
1417	)
1418	}	1523	}
1419		1524
1420	sub size_allocate {	1525	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1422		1527
1423	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424	}	1530	}
1425		1531
1426	sub set_fontsize {	1532	sub set_fontsize {
1427	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1428		1534
1429	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1536	delete $self->{texture};
1431		1537
1432	$self->update;	1538	$self->realloc;
1433	$self->check_size;
1434	}	1539	}
1435		1540
1436	sub _draw {	1541	sub _draw {
1437	my ($self) = @_;	1542	my ($self) = @_;
1438		1543
…		…
1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448		1553
1449	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1450		1555
1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1454		1559
1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1458		1563
1459	$tex	1564	$tex
1460	};	1565	};
1461		1566
…		…
1510	$self->{text} = $text;	1615	$self->{text} = $text;
1511		1616
1512	$text =~ s/./*/g if $self->{hidden};	1617	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1618	$self->{layout}->set_text ("$text ");
1514		1619
1515	$self->emit (changed => $self->{text});	1620	$self->_emit (changed => $self->{text});
1516	}	1621	}
1517		1622
1518	sub set_text {	1623	sub set_text {
1519	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1520		1625
1521	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1627	$self->_set_text ($text);
1523	$self->update;	1628
1524	$self->check_size;	1629	$self->realloc;
1525	}	1630	}
1526		1631
1527	sub get_text {	1632	sub get_text {
1528	$_[0]{text}	1633	$_[0]{text}
1529	}	1634	}
…		…
1532	my ($self) = @_;	1637	my ($self) = @_;
1533		1638
1534	my ($w, $h) = $self->SUPER::size_request;	1639	my ($w, $h) = $self->SUPER::size_request;
1535		1640
1536	($w + 1, $h) # add 1 for cursor	1641	($w + 1, $h) # add 1 for cursor
1537	}
1538
1539	sub size_allocate {
1540	my ($self, $w, $h) = @_;
1541
1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543	}	1642	}
1544		1643
1545	sub key_down {	1644	sub key_down {
1546	my ($self, $ev) = @_;	1645	my ($self, $ev) = @_;
1547		1646
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1661	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1662	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1663	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1664	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1665	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1666	$self->_emit ('escape');
1568	} elsif ($uni) {	1667	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1570	}	1669	}
1571		1670
1572	$self->_set_text ($text);	1671	$self->_set_text ($text);
1573	$self->update;	1672
1574	$self->check_size;	1673	$self->realloc;
1575	}	1674	}
1576		1675
1577	sub focus_in {	1676	sub focus_in {
1578	my ($self) = @_;	1677	my ($self) = @_;
1579		1678
…		…
1659	if ($sym == 13) {	1758	if ($sym == 13) {
1660	unshift @{$self->{history}},	1759	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1760	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1761	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1762	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1763	$self->_emit (activate => $txt);
1665	$self->update;	1764	$self->update;
1666		1765
1667	} elsif ($sym == CFClient::SDLK_UP) {	1766	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1767	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1768	$self->{history_saveback} = $self->get_text;
…		…
1706		1805
1707	sub new {	1806	sub new {
1708	my $class = shift;	1807	my $class = shift;
1709		1808
1710	$class->SUPER::new (	1809	$class->SUPER::new (
1711	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1712	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1713	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1714	can_hover => 1,	1814	can_hover => 1,
1715	align => 0,	1815	align => 0,
1716	valign => 0,	1816	valign => 0,
1717	can_events => 1,	1817	can_events => 1,
1718	@_	1818	@_
1719	)	1819	)
1720	}	1820	}
1721		1821
		1822	sub activate { }
		1823
1722	sub button_up {	1824	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1724		1826
		1827	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1828	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1829	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");
1728	}
1729	}	1830	}
1730		1831
1731	sub _draw {	1832	sub _draw {
1732	my ($self) = @_;	1833	my ($self) = @_;
1733		1834
…		…
1762		1863
1763	sub new {	1864	sub new {
1764	my $class = shift;	1865	my $class = shift;
1765		1866
1766	$class->SUPER::new (	1867	$class->SUPER::new (
1767	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1768	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1769	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1770	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1771	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1772	state => 0,	1874	state => 0,
…		…
1776	}	1878	}
1777		1879
1778	sub size_request {	1880	sub size_request {
1779	my ($self) = @_;	1881	my ($self) = @_;
1780		1882
1781	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1782	}	1884	}
1783		1885
1784	sub button_down {	1886	sub button_down {
1785	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1786		1888
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1791	}	1893	}
1792	}	1894	}
1793		1895
1794	sub _draw {	1896	sub _draw {
1795	my ($self) = @_;	1897	my ($self) = @_;
1796		1898
1797	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1798		1900
1799	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800		1902
1801	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1903	my ($w, $h) = @$self{qw(w h)};
		1904
		1905	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802		1906
1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804		1908
1805	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1806		1910
…		…
2071	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2072	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2073	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2074	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2075	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2076	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2077	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2078	vertical => 0,	2182	vertical => 0,
2079	can_hover => 1,	2183	can_hover => 1,
2080	inner_pad => 0.02,	2184	inner_pad => 0.02,
2081	@_	2185	@_
2082	);	2186	);
…		…
2085	$self->update;	2189	$self->update;
2086		2190
2087	$self	2191	$self
2088	}	2192	}
2089		2193
		2194	sub changed { }
		2195
2090	sub set_range {	2196	sub set_range {
2091	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2092		2198
2093	$self->{range} = $range;	2199	($range, $self->{range}) = ($self->{range}, $range);
2094		2200
2095	$self->update;	2201	$self->update
		2202	if "@$range" ne "@{$self->{range}}";
2096	}	2203	}
2097		2204
2098	sub set_value {	2205	sub set_value {
2099	my ($self, $value) = @_;	2206	my ($self, $value) = @_;
2100		2207
…		…
2111	if $unit;	2218	if $unit;
2112		2219
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2220	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2221
2115	if ($value != $old_value) {	2222	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2223	$self->_emit (changed => $value);
2117	$self->update;	2224	$self->update;
2118	}	2225	}
2119	}	2226	}
2120		2227
2121	sub size_request {	2228	sub size_request {
2122	my ($self) = @_;	2229	my ($self) = @_;
2123		2230
2124	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2125	my $h = $self->{req_h};
2126
2127	$self->{vertical} ? ($h, $w) : ($w, $h)
2128	}	2232	}
2129		2233
2130	sub button_down {	2234	sub button_down {
2131	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2132		2236
…		…
2483		2587
2484	sub new {	2588	sub new {
2485	my $class = shift;	2589	my $class = shift;
2486		2590
2487	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2488	state => 0,	2592	state => 0,
2489	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2490	@_	2594	@_
2491	);	2595	);
2492		2596
2493	if ($self->{state}) {
2494	$self->{state} = 0;
2495	$self->toggle_flopper;
2496	}
2497
2498	$self	2597	$self
2499	}	2598	}
2500		2599
2501	sub toggle_flopper {	2600	sub toggle_flopper {
2502	my ($self) = @_;	2601	my ($self) = @_;
2503		2602
2504	# TODO: use animation	2603	$self->{other}->toggle_visibility;
2505	if ($self->{state} = !$self->{state}) {
2506	$CFClient::UI::ROOT->add ($self->{other});
2507	$self->{other}->move ($self->coord2global (0, $self->{h}));
2508	$self->emit ("open");
2509	} else {
2510	$CFClient::UI::ROOT->remove ($self->{other});
2511	$self->emit ("close");
2512	}
2513
2514	$self->emit (changed => $self->{state});
2515	}	2604	}
2516		2605
2517	#############################################################################	2606	#############################################################################
2518		2607
2519	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2532	}	2621	}
2533		2622
2534	sub set_tooltip_from {	2623	sub set_tooltip_from {
2535	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2536		2625
		2626	my $tooltip = $widget->{tooltip};
		2627
		2628	if ($ENV{CFPLUS_DEBUG} & 2) {
		2629	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2630	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2631	. "req $widget->{req_w} $widget->{req_h}\n"
		2632	. "visible $widget->{visible}";
		2633	}
		2634
2537	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2538	markup => $widget->{tooltip},	2636	markup => $tooltip,
2539	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540	fontsize => 0.8,	2638	fontsize => 0.8,
2541	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2542	ellipsise => 0,	2640	ellipsise => 0,
2543	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2554		2652
2555	sub size_allocate {	2653	sub size_allocate {
2556	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2557		2655
2558	$self->SUPER::size_allocate ($w - 4, $h - 4);	2656	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2657	}
		2658
		2659	sub visibility_change {
		2660	my ($self, $visible) = @_;
		2661
		2662	return unless $visible;
		2663
		2664	$self->{root}->on_post_alloc ("move_$self" => sub {
		2665	my $widget = $self->{owner}
		2666	or return;
		2667
		2668	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2669
		2670	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2671	if $x + $self->{w} > $::WIDTH;
		2672
		2673	$self->move_abs ($x, $y);
		2674	});
2559	}	2675	}
2560		2676
2561	sub _draw {	2677	sub _draw {
2562	my ($self) = @_;	2678	my ($self) = @_;
2563		2679
…		…
2580	glVertex $w, $h;	2696	glVertex $w, $h;
2581	glVertex $w, 0;	2697	glVertex $w, 0;
2582	glEnd;	2698	glEnd;
2583		2699
2584	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2585	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2586	}	2703	}
2587		2704
2588	#############################################################################	2705	#############################################################################
2589		2706
…		…
2595		2712
2596	sub new {	2713	sub new {
2597	my $class = shift;	2714	my $class = shift;
2598		2715
2599	my $self = $class->SUPER::new (	2716	my $self = $class->SUPER::new (
2600	aspect => 1,	2717	aspect => 1,
		2718	can_events => 0,
2601	@_,	2719	@_,
2602	);	2720	);
2603		2721
2604	if ($self->{anim} && $self->{animspeed}) {	2722	if ($self->{anim} && $self->{animspeed}) {
2605	Scalar::Util::weaken (my $widget = $self);	2723	Scalar::Util::weaken (my $widget = $self);
…		…
2664	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2665	}	2783	}
2666		2784
2667	#############################################################################	2785	#############################################################################
2668		2786
2669	package CFClient::UI::InventoryItem;
2670
2671	our @ISA = CFClient::UI::HBox::;
2672
2673	sub _item_to_desc {
2674	my ($item) = @_;
2675
2676	my $desc =
2677	$item->{nrof} < 2
2678	? $item->{name}
2679	: "$item->{nrof} × $item->{name_pl}";
2680
2681	$item->{flags} & Crossfire::Protocol::F_OPEN
2682	and $desc .= " (open)";
2683	$item->{flags} & Crossfire::Protocol::F_APPLIED
2684	and $desc .= " (applied)";
2685	$item->{flags} & Crossfire::Protocol::F_UNPAID
2686	and $desc .= " (unpaid)";
2687	$item->{flags} & Crossfire::Protocol::F_MAGIC
2688	and $desc .= " (magic)";
2689	$item->{flags} & Crossfire::Protocol::F_CURSED
2690	and $desc .= " (cursed)";
2691	$item->{flags} & Crossfire::Protocol::F_DAMNED
2692	and $desc .= " (damned)";
2693	$item->{flags} & Crossfire::Protocol::F_LOCKED
2694	and $desc .= " *";
2695
2696	$desc
2697	}
2698
2699	sub new {
2700	my $class = shift;
2701
2702	my %args = @_;
2703
2704	my $item = delete $args{item};
2705
2706	my $desc = _item_to_desc ($item);
2707
2708	my $self = $class->SUPER::new (
2709	can_hover => 1,
2710	can_events => 1,
2711	tooltip => ((CFClient::UI::Label::escape $desc)
2712	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713	connect_button_down => sub {
2714	my ($self, $ev, $x, $y) = @_;
2715
2716	# todo: maybe put examine on 1? but should just be a tooltip :(
2717	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718	my $targ = $::CONN->{player}{tag};
2719
2720	if ($item->{container} == $::CONN->{player}{tag}) {
2721	$targ = $main::OPENCONT;
2722	}
2723
2724	$::CONN->send ("move $targ $item->{tag} 0");
2725	} elsif ($ev->{button} == 1) {
2726	$::CONN->send ("examine $item->{tag}");
2727	} elsif ($ev->{button} == 2) {
2728	$::CONN->send ("apply $item->{tag}");
2729	} elsif ($ev->{button} == 3) {
2730	my @menu_items = (
2731	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734	(
2735	$item->{flags} & Crossfire::Protocol::F_LOCKED
2736	? (
2737	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738	)
2739	: (
2740	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742	)
2743	),
2744	);
2745
2746	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747	}
2748
2749	1
2750	},
2751	%args
2752	);
2753
2754
2755	$self->add (new CFClient::UI::Face
2756	can_events => 0,
2757	face => $item->{face},
2758	anim => $item->{anim},
2759	animspeed => $item->{animspeed},
2760	);
2761
2762	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764	$self->{item} = $item;
2765
2766	$self->update_item;
2767
2768	$self
2769	}
2770
2771	sub update_item {
2772	my ($self) = @_;
2773
2774	my $desc = _item_to_desc ($self->{item});
2775
2776	$self->{name_lbl}->set_text ($desc);
2777	}
2778
2779	#############################################################################
2780
2781	package CFClient::UI::Inventory;
2782
2783	our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785	sub new {
2786	my $class = shift;
2787
2788	my $self = $class->SUPER::new (
2789	scrolled => (new CFClient::UI::Table),
2790	@_,
2791	);
2792
2793	$self
2794	}
2795
2796	sub set_items {
2797	my ($self, $items) = @_;
2798
2799	$self->{scrolled}->clear;
2800	return unless $items;
2801
2802	my @items = sort {
2803	($a->{type} <=> $b->{type})
2804	or ($a->{name} cmp $b->{name})
2805	} @$items;
2806
2807	$self->{real_items} = \@items;
2808
2809	for my $item (@items) {
2810	$item->{item} = $item;
2811	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812	$item->update_item ();
2813	}
2814
2815	my $i = 0;
2816	for (@items) {
2817	$self->{scrolled}->add (0, $i, $_);
2818	my $nrof = $_->{item}->{nrof} || 1;
2819	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820	}
2821
2822	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823	}
2824
2825	sub size_request {
2826	my ($self) = @_;
2827	($self->{req_w}, $self->{req_h});
2828	}
2829
2830	#############################################################################
2831
2832	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2833		2788
2834	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2835		2790
2836	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2867		2822
2868	# popup given the event (must be a mouse button down event currently)	2823	# popup given the event (must be a mouse button down event currently)
2869	sub popup {	2824	sub popup {
2870	my ($self, $ev) = @_;	2825	my ($self, $ev) = @_;
2871		2826
2872	$self->emit ("popdown");	2827	$self->_emit ("popdown");
2873		2828
2874	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	2830	$GRAB = $self;
2876	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2877		2832
2878	$self->show;	2833	$self->show;
2879	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2834	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880	}	2835	}
2881		2836
2882	sub mouse_motion {	2837	sub mouse_motion {
2883	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2884		2839
…		…
2892		2847
2893	if ($ev->{button} == $self->{button}) {	2848	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	2849	undef $GRAB;
2895	$self->hide;	2850	$self->hide;
2896		2851
2897	$self->emit ("popdown");	2852	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2853	$self->{hover}[1]->() if $self->{hover};
2899	}	2854	}
2900	}	2855	}
2901		2856
2902	#############################################################################	2857	#############################################################################
…		…
2964	sub add {	2919	sub add {
2965	my ($self, $text, %arg) = @_;	2920	my ($self, $text, %arg) = @_;
2966		2921
2967	$text =~ s/^\s+//;	2922	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	2923	$text =~ s/\s+$//;
		2924
		2925	return unless $text;
2969		2926
2970	my $timeout = time + ((delete $arg{timeout}) || 60);	2927	my $timeout = time + ((delete $arg{timeout}) || 60);
2971		2928
2972	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2929	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973		2930
…		…
3007	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
3008	}	2965	}
3009		2966
3010	#############################################################################	2967	#############################################################################
3011		2968
3012	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
3013		2970
3014	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016	use CFClient::OpenGL;
3017		2972
3018	sub new {	2973	sub new {
3019	my $class = shift;	2974	my $class = shift;
3020		2975
3021	$class->SUPER::new (	2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3022	@_,	2978	@_,
3023	)	2979	);
3024	}
3025		2980
3026	sub configure {	2981	$self
		2982	}
		2983
		2984	sub set_items {
		2985	my ($self, $items) = @_;
		2986
		2987	$self->{scrolled}->clear;
		2988	return unless $items;
		2989
		2990	my @items = sort {
		2991	($a->{type} <=> $b->{type})
		2992	or ($a->{name} cmp $b->{name})
		2993	} @$items;
		2994
		2995	$self->{real_items} = \@items;
		2996
		2997	my $row = 0;
		2998	for my $item (@items) {
		2999	CFClient::Item::update_widgets $item;
		3000
		3001	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3004
		3005	$row++;
		3006	}
		3007	}
		3008
		3009	#############################################################################
		3010
		3011	package CFClient::UI::BindEditor;
		3012
		3013	our @ISA = CFClient::UI::FancyFrame::;
		3014
		3015	sub new {
		3016	my $class = shift;
		3017
		3018	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3019
		3020	$self->add (my $vb = new CFClient::UI::VBox);
		3021
		3022
		3023	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3024	text => "start recording",
		3025	tooltip => "Start/Stops recording of actions."
		3026	."All subsequent actions after the recording started will be captured."
		3027	."The actions are displayed after the record was stopped."
		3028	."To bind the action you have to click on the 'Bind' button",
		3029	on_activate => sub {
		3030	unless ($self->{recording}) {
		3031	$self->start;
		3032	} else {
		3033	$self->stop;
		3034	}
		3035	});
		3036
		3037	$vb->add (new CFClient::UI::Label text => "Actions:");
		3038	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3039
		3040	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3041	$vb->add (my $hb = new CFClient::UI::HBox);
		3042	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3043	$hb->add (new CFClient::UI::Button
		3044	text => "bind",
		3045	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3046	on_activate => sub {
		3047	$self->ask_for_bind;
		3048	});
		3049
		3050	$vb->add (my $hb = new CFClient::UI::HBox);
		3051	$hb->add (new CFClient::UI::Button
		3052	text => "ok",
		3053	expand => 1,
		3054	tooltip => "This closes the binding editor and saves the binding",
		3055	on_activate => sub {
		3056	$self->hide;
		3057	$self->commit;
		3058	});
		3059
		3060	$hb->add (new CFClient::UI::Button
		3061	text => "cancel",
		3062	expand => 1,
		3063	tooltip => "This closes the binding editor without saving",
		3064	on_activate => sub {
		3065	$self->hide;
		3066	$self->{binding_cancel}->()
		3067	if $self->{binding_cancel};
		3068	});
		3069
		3070	$self->update_binding_widgets;
		3071
		3072	$self
		3073	}
		3074
		3075	sub commit {
		3076	my ($self) = @_;
		3077	my ($mod, $sym, $cmds) = $self->get_binding;
		3078	if ($sym != 0 && @$cmds > 0) {
		3079	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3080	."'. Don't forget 'Save Config'!");
		3081	$self->{binding_change}->($mod, $sym, $cmds)
		3082	if $self->{binding_change};
		3083	} else {
		3084	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3085	$self->{binding_cancel}->()
		3086	if $self->{binding_cancel};
		3087	}
		3088	}
		3089
		3090	sub start {
		3091	my ($self) = @_;
		3092
		3093	$self->{rec_btn}->set_text ("stop recording");
		3094	$self->{recording} = 1;
		3095	$self->clear_command_list;
		3096	$::CONN->start_record if $::CONN;
		3097	}
		3098
		3099	sub stop {
		3100	my ($self) = @_;
		3101
		3102	$self->{rec_btn}->set_text ("start recording");
		3103	$self->{recording} = 0;
		3104
		3105	my $rec;
		3106	$rec = $::CONN->stop_record if $::CONN;
		3107	return unless ref $rec eq 'ARRAY';
		3108	$self->set_command_list ($rec);
		3109	}
		3110
		3111	# if $commit is true, the binding will be set after the user entered a key combo
		3112	sub ask_for_bind {
		3113	my ($self, $commit) = @_;
		3114
		3115	CFClient::Binder::open_binding_dialog (sub {
		3116	my ($mod, $sym) = @_;
		3117	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3118	$self->update_binding_widgets;
		3119	$self->commit if $commit;
		3120	});
		3121	}
		3122
		3123	# $mod and $sym are the modifiers and key symbol
		3124	# $cmds is a array ref of strings (the commands)
		3125	# $cb is the callback that is executed on OK
		3126	# $ccb is the callback that is executed on CANCEL and
		3127	# when the binding was unsuccessful on OK
		3128	sub set_binding {
3027	my ($self, $x, $y, $w, $h) = @_;	3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3028		3130
3029	$self->{w} = $w;	3131	$self->clear_command_list;
3030	$self->{h} = $h;	3132	$self->{recording} = 0;
3031	}	3133	$self->{rec_btn}->set_text ("start recording");
3032		3134
3033	sub check_size {	3135	$self->{binding} = [$mod, $sym];
		3136	$self->{commands} = $cmds;
		3137
		3138	$self->{binding_change} = $cb;
		3139	$self->{binding_cancel} = $ccb;
		3140
		3141	$self->update_binding_widgets;
		3142	}
		3143
		3144	# this is a shortcut method that asks for a binding
		3145	# and then just binds it.
		3146	sub do_quick_binding {
3034	my ($self) = @_;	3147	my ($self, $cmds) = @_;
		3148	$self->set_binding (undef, undef, $cmds, sub {
		3149	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3150	});
		3151	$self->ask_for_bind (1);
		3152	}
3035		3153
3036	$self->size_allocate ($self->{w}, $self->{h})	3154	sub update_binding_widgets {
3037	if $self->{w};	3155	my ($self) = @_;
		3156	my ($mod, $sym, $cmds) = $self->get_binding;
		3157	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3158	$self->set_command_list ($cmds);
		3159	}
		3160
		3161	sub get_binding {
		3162	my ($self) = @_;
		3163	return (
		3164	$self->{binding}->[0],
		3165	$self->{binding}->[1],
		3166	[ grep { defined $_ } @{$self->{commands}} ]
		3167	);
		3168	}
		3169
		3170	sub clear_command_list {
		3171	my ($self) = @_;
		3172	$self->{cmdbox}->clear ();
		3173	}
		3174
		3175	sub set_command_list {
		3176	my ($self, $cmds) = @_;
		3177
		3178	$self->{cmdbox}->clear ();
		3179	$self->{commands} = $cmds;
		3180
		3181	my $idx = 0;
		3182
		3183	for (@$cmds) {
		3184	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3185
		3186	my $i = $idx;
		3187	$hb->add (new CFClient::UI::Label text => $_);
		3188	$hb->add (new CFClient::UI::Button
		3189	text => "delete",
		3190	tooltip => "Deletes the action from the record",
		3191	on_activate => sub {
		3192	$self->{cmdbox}->remove ($hb);
		3193	$cmds->[$i] = undef;
		3194	});
		3195
		3196
		3197	$idx++
		3198	}
		3199	}
		3200
		3201	#############################################################################
		3202
		3203	package CFClient::UI::SpellList;
		3204
		3205	our @ISA = CFClient::UI::FancyFrame::;
		3206
		3207	sub new {
		3208	my $class = shift;
		3209
		3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3211
		3212	$self->add (new CFClient::UI::ScrolledWindow
		3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3214
		3215	$self;
		3216	}
		3217
		3218	# XXX: Do sorting? Argl...
		3219	sub add_spell {
		3220	my ($self, $spell) = @_;
		3221	$self->{spells}->{$spell->{name}} = $spell;
		3222
		3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3224	face => $spell->{face},
		3225	can_hover => 1,
		3226	can_events => 1,
		3227	tooltip => $spell->{message});
		3228
		3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3230	text => $spell->{name},
		3231	can_hover => 1,
		3232	can_events => 1,
		3233	tooltip => $spell->{message},
		3234	expand => 1);
		3235
		3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3238	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3239	expand => 1);
		3240
		3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3242	text => "bind to key",
		3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3244	}
		3245
		3246	sub rebuild_spell_list {
		3247	my ($self) = @_;
		3248	$self->{tbl_idx} = 0;
		3249	$self->add_spell ($_) for values %{$self->{spells}};
		3250	}
		3251
		3252	sub remove_spell {
		3253	my ($self, $spell) = @_;
		3254	delete $self->{spells}->{$spell->{name}};
		3255	$self->rebuild_spell_list;
		3256	}
		3257
		3258	#############################################################################
		3259
		3260	package CFClient::UI::Root;
		3261
		3262	our @ISA = CFClient::UI::Container::;
		3263
		3264	use CFClient::OpenGL;
		3265
		3266	sub new {
		3267	my $class = shift;
		3268
		3269	my $self = $class->SUPER::new (
		3270	visible => 1,
		3271	@_,
		3272	);
		3273
		3274	Scalar::Util::weaken ($self->{root} = $self);
		3275
		3276	$self
3038	}	3277	}
3039		3278
3040	sub size_request {	3279	sub size_request {
3041	my ($self) = @_;	3280	my ($self) = @_;
3042		3281
3043	($self->{w}, $self->{h})	3282	($self->{w}, $self->{h})
		3283	}
		3284
		3285	sub _to_pixel {
		3286	my ($coord, $size, $max) = @_;
		3287
		3288	$coord =
		3289	$coord eq "center" ? ($max - $size) * 0.5
		3290	: $coord eq "max" ? $max
		3291	: $coord;
		3292
		3293	$coord = 0 if $coord < 0;
		3294	$coord = $max - $size if $coord > $max - $size;
		3295
		3296	int $coord + 0.5
3044	}	3297	}
3045		3298
3046	sub size_allocate {	3299	sub size_allocate {
3047	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
3048		3301
3049	my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050	my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055	for my $child ($self->children) {	3302	for my $child ($self->children) {
3056	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3303	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057		3304
3058	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3059	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3060		3307
3061	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3062	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
3063
3064	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066		3310
3067	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3068	}	3312	}
3069	}	3313	}
3070		3314
…		…
3081	}	3325	}
3082		3326
3083	sub update {	3327	sub update {
3084	my ($self) = @_;	3328	my ($self) = @_;
3085		3329
3086	$self->check_size;
3087	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3088	}	3331	}
3089		3332
3090	sub add {	3333	sub add {
3091	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3092		3335
3093	for my $child (@children) {
3094	$child->{toplevel} = 1;	3336	$_->{is_toplevel} = 1
3095		3337	for @children;
3096	# integerise window positions
3097	$child->{x} = int $child->{x};
3098	$child->{y} = int $child->{y};
3099	}
3100		3338
3101	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
		3340	}
		3341
		3342	sub remove {
		3343	my ($self, @children) = @_;
		3344
		3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3102		3349
3103	while (@children) {	3350	while (@children) {
3104	my $w = pop @children;	3351	my $w = pop @children;
3105	push @children, $w->children;	3352	push @children, $w->children;
3106	$w->{visible} = 1;	3353	$w->set_invisible;
3107	}
3108	}
3109
3110	sub remove {
3111	my ($self, @children) = @_;
3112
3113	$self->SUPER::remove (@children);
3114
3115	while (@children) {
3116	my $w = pop @children;
3117	push @children, $w->children;
3118	delete $w->{visible};
3119	}	3354	}
3120	}	3355	}
3121		3356
3122	sub on_refresh {	3357	sub on_refresh {
3123	my ($self, $id, $cb) = @_;	3358	my ($self, $id, $cb) = @_;
…		…
3137	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3138	$_->()	3373	$_->()
3139	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3140	}	3375	}
3141		3376
3142	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
3143	my @queue = ([], []);	3378	my %queue;
		3379	my @queue;
		3380	my $widget;
3144		3381
3145	for (;;) {	3382	outer:
3146	if ($self->{check_size}) {	3383	while () {
3147	# heuristic: check containers last	3384	if (my $realloc = delete $self->{realloc}) {
3148	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3385	for $widget (values %$realloc) {
3149	for values %{delete $self->{check_size}}	3386	$widget->{visible} or next; # do not resize invisible widgets
		3387
		3388	$queue{$widget+0}++ and next; # duplicates are common
		3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3150	}	3392	}
3151		3393
3152	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3394	while () {
		3395	@queue or last outer;
3153		3396
3154	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3397	$widget = pop @{ $queue[-1] || [] }
3155	? @$widget{qw(user_w user_h)}	3398	and last;
3156	: $widget->size_request;
3157
3158	if (delete $widget->{force_alloc}
3159	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161		3399
		3400	pop @queue;
		3401	}
		3402
		3403	delete $queue{$widget+0};
		3404
		3405	my ($w, $h) = $widget->size_request;
		3406
		3407	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3408	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3409
		3410	$w = $widget->{force_w} if exists $widget->{force_w};
		3411	$h = $widget->{force_h} if exists $widget->{force_h};
		3412
		3413	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3414	|| delete $widget->{force_realloc}) {
3162	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3163	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3164		3417
3165	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3166		3419
3167	$widget->{parent}->check_size
3168	if $widget->{parent};	3420	if (my $parent = $widget->{parent}) {
		3421	$self->{realloc}{$parent+0} = $parent
		3422	unless $queue{$parent+0};
		3423
		3424	$parent->{force_size_alloc} = 1;
		3425	$self->{size_alloc}{$parent+0} = $parent;
		3426	}
3169	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3170	}	3430	}
3171	}	3431	}
3172		3432
3173	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3174	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3175	my ($widget, $w, $h) = @$_;	3435	values %$size_alloc;
		3436
		3437	while () {
		3438	my $widget = pop @queue || last;
		3439
		3440	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176		3441
3177	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3178	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3179		3444
		3445	$w = int $w + 0.5;
		3446	$h = int $h + 0.5;
		3447
		3448	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3449	$widget->{old_w} = $widget->{w};
		3450	$widget->{old_h} = $widget->{h};
		3451
3180	$widget->{w} = $w;	3452	$widget->{w} = $w;
3181	$widget->{h} = $h;	3453	$widget->{h} = $h;
3182	$widget->size_allocate ($w, $h);	3454
3183	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3184	}	3457	}
3185	}	3458	}
3186		3459
3187	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3188	$_->()	3461	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3190	}	3463	}
		3464
3191		3465
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3195		3469

Diff Legend

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