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.230 by root, Wed May 24 21:59: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) = @_;
…		…
158	sub rescale_widgets {	171	sub rescale_widgets {
159	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
160		173
161	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
162	if ($widget->{is_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
163	$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.]+$/;
164	$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};
165	$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};
166	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167	$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.]+$/;
168	$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};
169	$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};
170	$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
171	}	189	}
172	}	190	}
173		191
174	reconfigure_widgets;	192	reconfigure_widgets;
175	}	193	}
…		…
184		202
185	sub new {	203	sub new {
186	my $class = shift;	204	my $class = shift;
187		205
188	my $self = bless {	206	my $self = bless {
189	x => 0,	207	x => "center",
190	y => 0,	208	y => "center",
191	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
192	can_events => 1,	212	can_events => 1,
193	@_	213	@_
194	}, $class;	214	}, $class;
195		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
196	for (keys %$self) {	218	for (keys %$self) {
197	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
198	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
199	}	221	}
200	}	222	}
201		223
202	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	}
203		235
204	$self	236	$self
205	}	237	}
206		238
207	sub destroy {	239	sub destroy {
…		…
211	%$self = ();	243	%$self = ();
212	}	244	}
213		245
214	sub show {	246	sub show {
215	my ($self) = @_;	247	my ($self) = @_;
		248
216	return if $self->{parent};	249	return if $self->{parent};
217		250
218	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
219	}	252	}
220		253
221	sub show_centered {	254	sub set_visible {
222	my ($self) = @_;	255	my ($self) = @_;
		256
223	return if $self->{parent};	257	return if $self->{visible};
224		258
225	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
226		261
227	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
228	"centered $self" => sub {
229	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230	},
231	);
232	}
233		263
234	sub hide {	264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
235	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};
236		278
237	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
238	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
239		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
240	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
241	if $self->{parent};	313	if $self->{parent};
242	}	314	}
243		315
244	sub move {	316	sub move_abs {
245	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
246		318
247	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
248	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
249	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
250		322
251	$self->update;	323	$self->update;
252	}	324	}
253		325
254	sub set_size {	326	sub set_size {
255	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
256		328
257	$self->{user_w} = $w;	329	$self->{force_w} = $w;
258	$self->{user_h} = $h;	330	$self->{force_h} = $h;
259		331
260	$self->check_size;	332	$self->realloc;
261	}	333	}
262		334
263	sub size_request {	335	sub size_request {
264	require Carp;	336	require Carp;
265	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
267		339
268	sub configure {	340	sub configure {
269	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
270		342
271	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
272	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
273	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
274		348
275	# use alignment to adjust x, y	349	# use alignment to adjust x, y
276		350
277	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
278	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
279
280	($w, $h) = ($w2, $h2);
281	}	353	}
282		354
283	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
284	$self->{x} = $x;	356	$self->{x} = $x;
285	$self->{y} = $y;	357	$self->{y} = $y;
286	$self->update;	358	$self->update;
287	}	359	}
288		360
289	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290	$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;
291	}	368	}
292	}	369	}
293		370
294	sub size_allocate {	371	sub size_allocate {
295	# nothing to be done	372	# nothing to be done
296	}	373	}
297		374
298	sub reconfigure {
299	my ($self) = @_;
300
301	$self->check_size (1);
302	$self->update;
303	}
304
305	sub children {	375	sub children {
306	}	376	}
307		377
308	sub set_max_size {	378	sub set_max_size {
309	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
312	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
313	}	383	}
314		384
315	sub set_tooltip {	385	sub set_tooltip {
316	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
317		392
318	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
319		394
320	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
343	return if $FOCUS == $self;	418	return if $FOCUS == $self;
344	return unless $self->{can_focus};	419	return unless $self->{can_focus};
345		420
346	my $focus = $FOCUS; $FOCUS = $self;	421	my $focus = $FOCUS; $FOCUS = $self;
347		422
348	$self->emit (focus_in => $focus);	423	$self->_emit (focus_in => $focus);
349		424
350	$focus->update if $focus;	425	$focus->update if $focus;
351	$FOCUS->update;	426	$FOCUS->update;
352	}	427	}
353		428
…		…
356		431
357	return unless $FOCUS == $self;	432	return unless $FOCUS == $self;
358		433
359	my $focus = $FOCUS; undef $FOCUS;	434	my $focus = $FOCUS; undef $FOCUS;
360		435
361	$self->emit (focus_out => $focus);	436	$self->_emit (focus_out => $focus);
362		437
363	$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;
364	}	442	}
365		443
366	sub mouse_motion { }	444	sub mouse_motion { }
367	sub button_up { }	445	sub button_up { }
368	sub key_down { }	446	sub key_down { }
369	sub key_up { }	447	sub key_up { }
370		448
371	sub button_down {	449	sub button_down {
372	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
373		451
374	$self->focus_in;	452	$self->focus_in;
…		…
377	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
378	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
379	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
380	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
381	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	}
382		530
383	sub draw {	531	sub draw {
384	my ($self) = @_;	532	my ($self) = @_;
385		533
386	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
403	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
404	glEnd;	552	glEnd;
405	glDisable GL_BLEND;	553	glDisable GL_BLEND;
406	}	554	}
407		555
408	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
409	glPushMatrix;	557	glPushMatrix;
410	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
411	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
413	glVertex 0 , 0;	561	glVertex 0 , 0;
414	glVertex $self->{w}, 0;	562	glVertex $self->{w} - 1, 0;
415	glVertex $self->{w}, $self->{h};	563	glVertex $self->{w} - 1, $self->{h} - 1;
416	glVertex 0 , $self->{h};	564	glVertex 0 , $self->{h} - 1;
417	glEnd;	565	glEnd;
418	glPopMatrix;	566	glPopMatrix;
419	#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;
420	}	568	}
421	}	569	}
422		570
423	sub _draw {	571	sub _draw {
424	my ($self) = @_;	572	my ($self) = @_;
425		573
426	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
427	}
428
429	sub find_widget {
430	my ($self, $x, $y) = @_;
431
432	return () unless $self->{can_events};
433
434	return $self
435	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438	()
439	}
440
441	sub set_parent {
442	my ($self, $parent) = @_;
443
444	Scalar::Util::weaken ($self->{parent} = $parent);
445
446	# TODO: req_w _does_change after ->reconfigure
447	$self->check_size
448	unless exists $self->{req_w};
449
450	$self->show;
451	}
452
453	sub check_size {
454	my ($self, $forced) = @_;
455
456	$self->{force_alloc} = 1 if $forced;
457	$CFClient::UI::ROOT->{check_size}{$self} = $self;
458	}
459
460	sub update {
461	my ($self) = @_;
462
463	$self->{parent}->update
464	if $self->{parent};
465	}
466
467	sub connect {
468	my ($self, $signal, $cb) = @_;
469
470	push @{ $self->{signal_cb}{$signal} }, $cb;
471	}
472
473	sub emit {
474	my ($self, $signal, @args) = @_;
475
476	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477	}	575	}
478		576
479	sub DESTROY {	577	sub DESTROY {
480	my ($self) = @_;	578	my ($self) = @_;
481		579
…		…
539	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
540	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
541	}	639	}
542		640
543	sub size_request {	641	sub size_request {
544	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
545	}	645	}
546		646
547	sub draw { }	647	sub draw { }
548		648
549	#############################################################################	649	#############################################################################
…		…
578	$self->{children} = [	678	$self->{children} = [
579	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
580	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
581	];	681	];
582		682
583	$self->check_size (1);	683	$self->realloc;
584	$self->update;
585	}	684	}
586		685
587	sub children {	686	sub children {
588	@{ $_[0]{children} }	687	@{ $_[0]{children} }
589	}	688	}
…		…
594	delete $child->{parent};	693	delete $child->{parent};
595	$child->hide;	694	$child->hide;
596		695
597	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598		697
599	$self->check_size;	698	$self->realloc;
600	$self->update;
601	}	699	}
602		700
603	sub clear {	701	sub clear {
604	my ($self) = @_;	702	my ($self) = @_;
605		703
…		…
609	for (@$children) {	707	for (@$children) {
610	delete $_->{parent};	708	delete $_->{parent};
611	$_->hide;	709	$_->hide;
612	}	710	}
613		711
614	$self->check_size;	712	$self->realloc;
615	$self->update;
616	}	713	}
617		714
618	sub find_widget {	715	sub find_widget {
619	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
620		717
…		…
744		841
745	package CFClient::UI::ViewPort;	842	package CFClient::UI::ViewPort;
746		843
747	our @ISA = CFClient::UI::Window::;	844	our @ISA = CFClient::UI::Window::;
748		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
749	sub size_request {	856	sub size_request {
750	my ($self) = @_;	857	my ($self) = @_;
751		858
752	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753		860
754	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
755	}	865	}
756		866
757	sub size_allocate {	867	sub size_allocate {
758	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
759		869
760	my ($cw, $ch) = @$self{qw(child_w child_h)};	870	my $child = $self->child;
761	# $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
762	$self->child->configure (0, 0, $cw, $ch);	875	$self->child->configure (0, 0, $w, $h);
763	$self->update;	876	$self->update;
764	}	877	}
765		878
766	sub set_offset {	879	sub set_offset {
767	my ($self, $x, $y) = @_;	880	my ($self, $x, $y) = @_;
…		…
818	my $class = shift;	931	my $class = shift;
819		932
820	my $self;	933	my $self;
821		934
822	my $slider = new CFClient::UI::Slider	935	my $slider = new CFClient::UI::Slider
823	vertical => 1,	936	vertical => 1,
824	range => [0, 0, 1, 0.01], # HACK fix	937	range => [0, 0, 1, 0.01], # HACK fix
825	connect_changed => sub {	938	on_changed => sub {
826	$self->{vp}->set_offset (0, $_[1]);	939	$self->{vp}->set_offset (0, $_[1]);
827	},	940	},
828	;	941	;
829		942
830	$self = $class->SUPER::new (	943	$self = $class->SUPER::new (
…		…
836	$self->{vp}->add ($self->{scrolled});	949	$self->{vp}->add ($self->{scrolled});
837	$self->add ($self->{vp});	950	$self->add ($self->{vp});
838	$self->add ($self->{slider});	951	$self->add ($self->{slider});
839		952
840	$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]);
841	}	964	}
842		965
843	sub size_allocate {	966	sub size_allocate {
844	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
845		968
…		…
898		1021
899	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
900		1023
901	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
902		1025
903	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 =
904	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905	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);
906		1033
907	sub new {	1034	sub new {
908	my $class = shift;	1035	my $class = shift;
909
910	# TODO: user_x, user_y, overwrite moveto?
911		1036
912	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
913	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
914	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
915	border => 0.6,	1040	border => 0.6,
916	is_toplevel => 1,
917	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
918	@_	1044	@_
919	);	1045	);
920		1046
921	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
922	align => 0,	1048	align => 0,
…		…
975	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
976		1102
977	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
978	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
979		1105
980	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1108
		1109	$self->realloc;
982	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983	$self->check_size;
984	};	1111	};
985		1112
986	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
987	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
988	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
990	$self->{motion} = sub {	1117	$self->{motion} = sub {
991	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
992		1119
993	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
994		1121
995	$self->move ($bx + $x - $ox, $by + $y - $oy);	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996	$self->update;
997	};	1123	};
998	}	1124	}
999	}	1125	}
1000		1126
1001	sub button_up {	1127	sub button_up {
…		…
1020	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021		1147
1022	my $border = $self->border;	1148	my $border = $self->border;
1023		1149
1024	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1025	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1026	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029		1155
1030	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1032		1158
1033	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1034	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1035	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1036
1037	glColor @{ $self->{bg} };
1038
1039	$bg->{s} = $rep_x;
1040	$bg->{t} = $rep_y;
1041	$bg->{wrap_mode} = 1;
1042	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043	}	1164	}
1044		1165
1045	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1046		1167
…		…
1062	sub new {	1183	sub new {
1063	my $class = shift;	1184	my $class = shift;
1064		1185
1065	$class->SUPER::new (	1186	$class->SUPER::new (
1066	col_expand => [],	1187	col_expand => [],
1067	@_	1188	@_,
1068	)	1189	)
		1190	}
		1191
		1192	sub children {
		1193	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069	}	1194	}
1070		1195
1071	sub add {	1196	sub add {
1072	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1073		1198
1074	$child->set_parent ($self);	1199	$child->set_parent ($self);
1075	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1076		1201
1077	$child->check_size;	1202	$self->realloc;
1078	}	1203	}
1079		1204
1080	sub children {
1081	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082	}
1083
1084	# 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?
1085	sub clear {	1206	sub clear {
1086	my ($self) = @_;	1207	my ($self) = @_;
1087		1208
1088	my @children = $self->children;	1209	my @children = $self->children;
1089	delete $self->{children};	1210	delete $self->{children};
…		…
1091	for (@children) {	1212	for (@children) {
1092	delete $_->{parent};	1213	delete $_->{parent};
1093	$_->hide;	1214	$_->hide;
1094	}	1215	}
1095		1216
1096	$self->update;	1217	$self->realloc;
1097	}	1218	}
1098		1219
1099	sub get_wh {	1220	sub get_wh {
1100	my ($self) = @_;	1221	my ($self) = @_;
1101		1222
…		…
1132	sub size_allocate {	1253	sub size_allocate {
1133	my ($self, $w, $h) = @_;	1254	my ($self, $w, $h) = @_;
1134		1255
1135	my ($ws, $hs) = $self->get_wh;	1256	my ($ws, $hs) = $self->get_wh;
1136		1257
1137	my $req_w = sum @$ws;	1258	my $req_w = (sum @$ws) || 1;
1138	my $req_h = sum @$hs;	1259	my $req_h = (sum @$hs) || 1;
1139		1260
1140	# TODO: nicer code && do row_expand	1261	# TODO: nicer code && do row_expand
1141	my @col_expand = @{$self->{col_expand}};	1262	my @col_expand = @{$self->{col_expand}};
1142	@col_expand = (1) x @$ws unless @col_expand;	1263	@col_expand = (1) x @$ws unless @col_expand;
1143	my $col_expand = (sum @col_expand) || 1;	1264	my $col_expand = (sum @col_expand) || 1;
…		…
1197	}	1318	}
1198	}	1319	}
1199		1320
1200	#############################################################################	1321	#############################################################################
1201		1322
1202	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1203
1204	# TODO: wrap into common Box base class
1205		1324
1206	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1207		1326
1208	sub size_request {	1327	sub size_request {
1209	my ($self) = @_;	1328	my ($self) = @_;
1210		1329
1211	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1212		1331	? (
1213	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1214	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215	(List::Util::max map $_->[1], @alloc),	1334	)
1216	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1217	}	1339	}
1218		1340
1219	sub size_allocate {	1341	sub size_allocate {
1220	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1221		1343
1222	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1223
1224	my $children = $self->{children};	1345	my $children = $self->{children};
1225		1346
1226	my @h = map $_->{req_w}, @$children;	1347	my @req;
1227		1348
1228	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1229		1350	@req = ($space / (@$children || 1)) x @$children;
1230	if ($req_h > $h) {
1231	# ah well, not enough space
1232	$_ *= $h / $req_h for @h;
1233	} 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 {
1234	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235	$exp ||= 1;
1236		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1237	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1238	my $child = $children->[$_];
1239
1240	my $alloc_h = $h[$_];
1241	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242	$h[$_] = $alloc_h;
1243	}	1365	}
1244	}	1366	}
1245		1367
1246	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1247		1369
1248	my $y = 0;	1370	my $pos = 0;
1249	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1250	my $child = $children->[$_];
1251	my $h = $h[$_];	1372	my $alloc = $req[$_];
1252	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253		1374
1254	$y += $h;	1375	$pos += $alloc;
1255	}	1376	}
1256		1377
1257	1	1378	1
1258	}	1379	}
1259		1380
1260	#############################################################################	1381	#############################################################################
1261		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
1262	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1263		1399
1264	# TODO: wrap into common Box base class
1265
1266	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1267		1401
1268	sub size_request {	1402	sub new {
1269	my ($self) = @_;	1403	my $class = shift;
1270		1404
1271	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1272		1406	vertical => 1,
1273	(	1407	@_,
1274	(List::Util::max map $_->[0], @alloc),
1275	(List::Util::sum map $_->[1], @alloc),
1276	)	1408	)
1277	}
1278
1279	sub size_allocate {
1280	my ($self, $w, $h) = @_;
1281
1282	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284	my $children = $self->{children};
1285
1286	my @h = map $_->{req_h}, @$children;
1287
1288	my $req_h = List::Util::sum @h;
1289
1290	if ($req_h > $h) {
1291	# ah well, not enough space
1292	$_ *= $h / $req_h for @h;
1293	} else {
1294	my $exp = List::Util::sum map $_->{expand}, @$children;
1295	$exp ||= 1;
1296
1297	for (0 .. $#$children) {
1298	my $child = $children->[$_];
1299
1300	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301	}
1302	}
1303
1304	CFClient::UI::harmonize \@h;
1305
1306	my $y = 0;
1307	for (0 .. $#$children) {
1308	my $child = $children->[$_];
1309	my $h = $h[$_];
1310	$child->configure (0, $y, $w, $h);
1311
1312	$y += $h;
1313	}
1314
1315	1
1316	}	1409	}
1317		1410
1318	#############################################################################	1411	#############################################################################
1319		1412
1320	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1337	ellipsise => 3, # end	1430	ellipsise => 3, # end
1338	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1339	fontsize => 1,	1432	fontsize => 1,
1340	align => -1,	1433	align => -1,
1341	valign => -1,	1434	valign => -1,
1342	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1343	can_events => 0,	1437	can_events => 0,
1344	%arg	1438	%arg
1345	);	1439	);
1346		1440
1347	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1383	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1384		1478
1385	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1387		1481
		1482	$self->realloc;
1388	$self->update;	1483	$self->update;
1389	$self->check_size;
1390	}	1484	}
1391		1485
1392	sub set_markup {	1486	sub set_markup {
1393	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1394		1488
…		…
1398	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399		1493
1400	$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;
1401	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1402		1496
		1497	$self->realloc;
1403	$self->update;	1498	$self->update;
1404	$self->check_size;
1405	}	1499	}
1406		1500
1407	sub size_request {	1501	sub size_request {
1408	my ($self) = @_;	1502	my ($self) = @_;
1409		1503
…		…
1423		1517
1424	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1425	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1426	}	1520	}
1427		1521
1428	(	1522	($w, $h)
1429	$w + $self->{padding} * 2,
1430	$h + $self->{padding} * 2,
1431	)
1432	}	1523	}
1433		1524
1434	sub size_allocate {	1525	sub size_allocate {
1435	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1436		1527
1437	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438	}	1530	}
1439		1531
1440	sub set_fontsize {	1532	sub set_fontsize {
1441	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1442		1534
1443	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1444	delete $self->{texture};	1536	delete $self->{texture};
1445		1537
1446	$self->update;	1538	$self->realloc;
1447	$self->check_size;
1448	}	1539	}
1449		1540
1450	sub _draw {	1541	sub _draw {
1451	my ($self) = @_;	1542	my ($self) = @_;
1452		1543
…		…
1460	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462		1553
1463	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1464		1555
1465	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1468		1559
1469	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1472		1563
1473	$tex	1564	$tex
1474	};	1565	};
1475		1566
…		…
1524	$self->{text} = $text;	1615	$self->{text} = $text;
1525		1616
1526	$text =~ s/./*/g if $self->{hidden};	1617	$text =~ s/./*/g if $self->{hidden};
1527	$self->{layout}->set_text ("$text ");	1618	$self->{layout}->set_text ("$text ");
1528		1619
1529	$self->emit (changed => $self->{text});	1620	$self->_emit (changed => $self->{text});
1530	}	1621	}
1531		1622
1532	sub set_text {	1623	sub set_text {
1533	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1534		1625
1535	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1536	$self->_set_text ($text);	1627	$self->_set_text ($text);
1537	$self->update;	1628
1538	$self->check_size;	1629	$self->realloc;
1539	}	1630	}
1540		1631
1541	sub get_text {	1632	sub get_text {
1542	$_[0]{text}	1633	$_[0]{text}
1543	}	1634	}
…		…
1546	my ($self) = @_;	1637	my ($self) = @_;
1547		1638
1548	my ($w, $h) = $self->SUPER::size_request;	1639	my ($w, $h) = $self->SUPER::size_request;
1549		1640
1550	($w + 1, $h) # add 1 for cursor	1641	($w + 1, $h) # add 1 for cursor
1551	}
1552
1553	sub size_allocate {
1554	my ($self, $w, $h) = @_;
1555
1556	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557	}	1642	}
1558		1643
1559	sub key_down {	1644	sub key_down {
1560	my ($self, $ev) = @_;	1645	my ($self, $ev) = @_;
1561		1646
…		…
1576	} elsif ($sym == CFClient::SDLK_HOME) {	1661	} elsif ($sym == CFClient::SDLK_HOME) {
1577	$self->{cursor} = 0;	1662	$self->{cursor} = 0;
1578	} elsif ($sym == CFClient::SDLK_END) {	1663	} elsif ($sym == CFClient::SDLK_END) {
1579	$self->{cursor} = length $text;	1664	$self->{cursor} = length $text;
1580	} elsif ($uni == 27) {	1665	} elsif ($uni == 27) {
1581	$self->emit ('escape');	1666	$self->_emit ('escape');
1582	} elsif ($uni) {	1667	} elsif ($uni) {
1583	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1584	}	1669	}
1585		1670
1586	$self->_set_text ($text);	1671	$self->_set_text ($text);
1587	$self->update;	1672
1588	$self->check_size;	1673	$self->realloc;
1589	}	1674	}
1590		1675
1591	sub focus_in {	1676	sub focus_in {
1592	my ($self) = @_;	1677	my ($self) = @_;
1593		1678
…		…
1673	if ($sym == 13) {	1758	if ($sym == 13) {
1674	unshift @{$self->{history}},	1759	unshift @{$self->{history}},
1675	my $txt = $self->get_text;	1760	my $txt = $self->get_text;
1676	$self->{history_pointer} = -1;	1761	$self->{history_pointer} = -1;
1677	$self->{history_saveback} = '';	1762	$self->{history_saveback} = '';
1678	$self->emit (activate => $txt);	1763	$self->_emit (activate => $txt);
1679	$self->update;	1764	$self->update;
1680		1765
1681	} elsif ($sym == CFClient::SDLK_UP) {	1766	} elsif ($sym == CFClient::SDLK_UP) {
1682	if ($self->{history_pointer} < 0) {	1767	if ($self->{history_pointer} < 0) {
1683	$self->{history_saveback} = $self->get_text;	1768	$self->{history_saveback} = $self->get_text;
…		…
1720		1805
1721	sub new {	1806	sub new {
1722	my $class = shift;	1807	my $class = shift;
1723		1808
1724	$class->SUPER::new (	1809	$class->SUPER::new (
1725	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1726	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1727	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1728	can_hover => 1,	1814	can_hover => 1,
1729	align => 0,	1815	align => 0,
1730	valign => 0,	1816	valign => 0,
1731	can_events => 1,	1817	can_events => 1,
1732	@_	1818	@_
1733	)	1819	)
1734	}	1820	}
1735		1821
		1822	sub activate { }
		1823
1736	sub button_up {	1824	sub button_up {
1737	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1738		1826
		1827	$self->emit ("activate")
1739	if ($x >= 0 && $x < $self->{w}	1828	if $x >= 0 && $x < $self->{w}
1740	&& $y >= 0 && $y < $self->{h}) {	1829	&& $y >= 0 && $y < $self->{h};
1741	$self->emit ("activate");
1742	}
1743	}	1830	}
1744		1831
1745	sub _draw {	1832	sub _draw {
1746	my ($self) = @_;	1833	my ($self) = @_;
1747		1834
…		…
1776		1863
1777	sub new {	1864	sub new {
1778	my $class = shift;	1865	my $class = shift;
1779		1866
1780	$class->SUPER::new (	1867	$class->SUPER::new (
1781	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1782	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1783	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1784	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1785	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1786	state => 0,	1874	state => 0,
…		…
1790	}	1878	}
1791		1879
1792	sub size_request {	1880	sub size_request {
1793	my ($self) = @_;	1881	my ($self) = @_;
1794		1882
1795	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1796	}	1884	}
1797		1885
1798	sub button_down {	1886	sub button_down {
1799	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1800		1888
1801	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1804	$self->emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1805	}	1893	}
1806	}	1894	}
1807		1895
1808	sub _draw {	1896	sub _draw {
1809	my ($self) = @_;	1897	my ($self) = @_;
1810		1898
1811	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1812		1900
1813	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814		1902
1815	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;
1816		1906
1817	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818		1908
1819	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1820		1910
…		…
2085	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2086	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2087	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2088	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2089	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2090	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2091	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2092	vertical => 0,	2182	vertical => 0,
2093	can_hover => 1,	2183	can_hover => 1,
2094	inner_pad => 0.02,	2184	inner_pad => 0.02,
2095	@_	2185	@_
2096	);	2186	);
…		…
2099	$self->update;	2189	$self->update;
2100		2190
2101	$self	2191	$self
2102	}	2192	}
2103		2193
		2194	sub changed { }
		2195
2104	sub set_range {	2196	sub set_range {
2105	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2106		2198
2107	$self->{range} = $range;	2199	($range, $self->{range}) = ($self->{range}, $range);
2108		2200
2109	$self->update;	2201	$self->update
		2202	if "@$range" ne "@{$self->{range}}";
2110	}	2203	}
2111		2204
2112	sub set_value {	2205	sub set_value {
2113	my ($self, $value) = @_;	2206	my ($self, $value) = @_;
2114		2207
…		…
2125	if $unit;	2218	if $unit;
2126		2219
2127	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2220	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128		2221
2129	if ($value != $old_value) {	2222	if ($value != $old_value) {
2130	$self->emit (changed => $value);	2223	$self->_emit (changed => $value);
2131	$self->update;	2224	$self->update;
2132	}	2225	}
2133	}	2226	}
2134		2227
2135	sub size_request {	2228	sub size_request {
2136	my ($self) = @_;	2229	my ($self) = @_;
2137		2230
2138	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2139	my $h = $self->{req_h};
2140
2141	$self->{vertical} ? ($h, $w) : ($w, $h)
2142	}	2232	}
2143		2233
2144	sub button_down {	2234	sub button_down {
2145	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2146		2236
…		…
2497		2587
2498	sub new {	2588	sub new {
2499	my $class = shift;	2589	my $class = shift;
2500		2590
2501	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2502	state => 0,	2592	state => 0,
2503	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2504	@_	2594	@_
2505	);	2595	);
2506		2596
2507	if ($self->{state}) {
2508	$self->{state} = 0;
2509	$self->toggle_flopper;
2510	}
2511
2512	$self	2597	$self
2513	}	2598	}
2514		2599
2515	sub toggle_flopper {	2600	sub toggle_flopper {
2516	my ($self) = @_;	2601	my ($self) = @_;
2517		2602
2518	# TODO: use animation	2603	$self->{other}->toggle_visibility;
2519	if ($self->{state} = !$self->{state}) {
2520	$CFClient::UI::ROOT->add ($self->{other});
2521	$self->{other}->move ($self->coord2global (0, $self->{h}));
2522	$self->emit ("open");
2523	} else {
2524	$CFClient::UI::ROOT->remove ($self->{other});
2525	$self->emit ("close");
2526	}
2527
2528	$self->emit (changed => $self->{state});
2529	}	2604	}
2530		2605
2531	#############################################################################	2606	#############################################################################
2532		2607
2533	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2546	}	2621	}
2547		2622
2548	sub set_tooltip_from {	2623	sub set_tooltip_from {
2549	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2550		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
2551	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2552	markup => $widget->{tooltip},	2636	markup => $tooltip,
2553	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554	fontsize => 0.8,	2638	fontsize => 0.8,
2555	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2556	ellipsise => 0,	2640	ellipsise => 0,
2557	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2568		2652
2569	sub size_allocate {	2653	sub size_allocate {
2570	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2571		2655
2572	$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	});
2573	}	2675	}
2574		2676
2575	sub _draw {	2677	sub _draw {
2576	my ($self) = @_;	2678	my ($self) = @_;
2577		2679
…		…
2594	glVertex $w, $h;	2696	glVertex $w, $h;
2595	glVertex $w, 0;	2697	glVertex $w, 0;
2596	glEnd;	2698	glEnd;
2597		2699
2598	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2599	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2600	}	2703	}
2601		2704
2602	#############################################################################	2705	#############################################################################
2603		2706
…		…
2609		2712
2610	sub new {	2713	sub new {
2611	my $class = shift;	2714	my $class = shift;
2612		2715
2613	my $self = $class->SUPER::new (	2716	my $self = $class->SUPER::new (
2614	aspect => 1,	2717	aspect => 1,
		2718	can_events => 0,
2615	@_,	2719	@_,
2616	);	2720	);
2617		2721
2618	if ($self->{anim} && $self->{animspeed}) {	2722	if ($self->{anim} && $self->{animspeed}) {
2619	Scalar::Util::weaken (my $widget = $self);	2723	Scalar::Util::weaken (my $widget = $self);
…		…
2678	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2679	}	2783	}
2680		2784
2681	#############################################################################	2785	#############################################################################
2682		2786
2683	package CFClient::UI::InventoryItem;
2684
2685	our @ISA = CFClient::UI::HBox::;
2686
2687	sub _item_to_desc {
2688	my ($item) = @_;
2689
2690	my $desc =
2691	$item->{nrof} < 2
2692	? $item->{name}
2693	: "$item->{nrof} × $item->{name_pl}";
2694
2695	$item->{flags} & Crossfire::Protocol::F_OPEN
2696	and $desc .= " (open)";
2697	$item->{flags} & Crossfire::Protocol::F_APPLIED
2698	and $desc .= " (applied)";
2699	$item->{flags} & Crossfire::Protocol::F_UNPAID
2700	and $desc .= " (unpaid)";
2701	$item->{flags} & Crossfire::Protocol::F_MAGIC
2702	and $desc .= " (magic)";
2703	$item->{flags} & Crossfire::Protocol::F_CURSED
2704	and $desc .= " (cursed)";
2705	$item->{flags} & Crossfire::Protocol::F_DAMNED
2706	and $desc .= " (damned)";
2707	$item->{flags} & Crossfire::Protocol::F_LOCKED
2708	and $desc .= " *";
2709
2710	$desc
2711	}
2712
2713	sub new {
2714	my $class = shift;
2715
2716	my %args = @_;
2717
2718	my $item = delete $args{item};
2719
2720	my $desc = _item_to_desc ($item);
2721
2722	my $self = $class->SUPER::new (
2723	can_hover => 1,
2724	can_events => 1,
2725	tooltip => ((CFClient::UI::Label::escape $desc)
2726	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727	connect_button_down => sub {
2728	my ($self, $ev, $x, $y) = @_;
2729
2730	# todo: maybe put examine on 1? but should just be a tooltip :(
2731	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732	my $targ = $::CONN->{player}{tag};
2733
2734	if ($item->{container} == $::CONN->{player}{tag}) {
2735	$targ = $main::OPENCONT;
2736	}
2737
2738	$::CONN->send ("move $targ $item->{tag} 0");
2739	} elsif ($ev->{button} == 1) {
2740	$::CONN->send ("examine $item->{tag}");
2741	} elsif ($ev->{button} == 2) {
2742	$::CONN->send ("apply $item->{tag}");
2743	} elsif ($ev->{button} == 3) {
2744	my @menu_items = (
2745	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748	(
2749	$item->{flags} & Crossfire::Protocol::F_LOCKED
2750	? (
2751	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752	)
2753	: (
2754	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756	)
2757	),
2758	);
2759
2760	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761	}
2762
2763	1
2764	},
2765	%args
2766	);
2767
2768
2769	$self->add (new CFClient::UI::Face
2770	can_events => 0,
2771	face => $item->{face},
2772	anim => $item->{anim},
2773	animspeed => $item->{animspeed},
2774	);
2775
2776	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778	$self->{item} = $item;
2779
2780	$self->update_item;
2781
2782	$self
2783	}
2784
2785	sub update_item {
2786	my ($self) = @_;
2787
2788	my $desc = _item_to_desc ($self->{item});
2789
2790	$self->{name_lbl}->set_text ($desc);
2791	}
2792
2793	#############################################################################
2794
2795	package CFClient::UI::Inventory;
2796
2797	our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799	sub new {
2800	my $class = shift;
2801
2802	my $self = $class->SUPER::new (
2803	scrolled => (new CFClient::UI::Table),
2804	@_,
2805	);
2806
2807	$self
2808	}
2809
2810	sub set_items {
2811	my ($self, $items) = @_;
2812
2813	$self->{scrolled}->clear;
2814	return unless $items;
2815
2816	my @items = sort {
2817	($a->{type} <=> $b->{type})
2818	or ($a->{name} cmp $b->{name})
2819	} @$items;
2820
2821	$self->{real_items} = \@items;
2822
2823	for my $item (@items) {
2824	$item->{item} = $item;
2825	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826	$item->update_item ();
2827	}
2828
2829	my $i = 0;
2830	for (@items) {
2831	$self->{scrolled}->add (0, $i, $_);
2832	my $nrof = $_->{item}->{nrof} || 1;
2833	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834	}
2835
2836	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837	}
2838
2839	sub size_request {
2840	my ($self) = @_;
2841	($self->{req_w}, $self->{req_h});
2842	}
2843
2844	#############################################################################
2845
2846	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2847		2788
2848	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2849		2790
2850	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2881		2822
2882	# 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)
2883	sub popup {	2824	sub popup {
2884	my ($self, $ev) = @_;	2825	my ($self, $ev) = @_;
2885		2826
2886	$self->emit ("popdown");	2827	$self->_emit ("popdown");
2887		2828
2888	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2889	$GRAB = $self;	2830	$GRAB = $self;
2890	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2891		2832
2892	$self->show;	2833	$self->show;
2893	$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);
2894	}	2835	}
2895		2836
2896	sub mouse_motion {	2837	sub mouse_motion {
2897	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2898		2839
…		…
2906		2847
2907	if ($ev->{button} == $self->{button}) {	2848	if ($ev->{button} == $self->{button}) {
2908	undef $GRAB;	2849	undef $GRAB;
2909	$self->hide;	2850	$self->hide;
2910		2851
2911	$self->emit ("popdown");	2852	$self->_emit ("popdown");
2912	$self->{hover}[1]->() if $self->{hover};	2853	$self->{hover}[1]->() if $self->{hover};
2913	}	2854	}
2914	}	2855	}
2915		2856
2916	#############################################################################	2857	#############################################################################
…		…
2978	sub add {	2919	sub add {
2979	my ($self, $text, %arg) = @_;	2920	my ($self, $text, %arg) = @_;
2980		2921
2981	$text =~ s/^\s+//;	2922	$text =~ s/^\s+//;
2982	$text =~ s/\s+$//;	2923	$text =~ s/\s+$//;
		2924
		2925	return unless $text;
2983		2926
2984	my $timeout = time + ((delete $arg{timeout}) || 60);	2927	my $timeout = time + ((delete $arg{timeout}) || 60);
2985		2928
2986	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2929	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987		2930
…		…
3021	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
3022	}	2965	}
3023		2966
3024	#############################################################################	2967	#############################################################################
3025		2968
3026	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
3027		2970
3028	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030	use CFClient::OpenGL;
3031		2972
3032	sub new {	2973	sub new {
3033	my $class = shift;	2974	my $class = shift;
3034		2975
3035	$class->SUPER::new (	2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3036	@_,	2978	@_,
3037	)	2979	);
3038	}
3039		2980
3040	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 {
3041	my ($self, $x, $y, $w, $h) = @_;	3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3042		3130
3043	$self->{w} = $w;	3131	$self->clear_command_list;
3044	$self->{h} = $h;	3132	$self->{recording} = 0;
3045	}	3133	$self->{rec_btn}->set_text ("start recording");
3046		3134
3047	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 {
3048	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	}
3049		3153
3050	$self->size_allocate ($self->{w}, $self->{h})	3154	sub update_binding_widgets {
3051	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
3052	}	3277	}
3053		3278
3054	sub size_request {	3279	sub size_request {
3055	my ($self) = @_;	3280	my ($self) = @_;
3056		3281
3057	($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
3058	}	3297	}
3059		3298
3060	sub size_allocate {	3299	sub size_allocate {
3061	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
3062		3301
3063	for my $child ($self->children) {	3302	for my $child ($self->children) {
3064	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)};
3065		3304
3066	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3067	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3068		3307
3069	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3070	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
3071
3072	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074		3310
3075	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3076	}	3312	}
3077	}	3313	}
3078		3314
…		…
3089	}	3325	}
3090		3326
3091	sub update {	3327	sub update {
3092	my ($self) = @_;	3328	my ($self) = @_;
3093		3329
3094	$self->check_size;
3095	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3096	}	3331	}
3097		3332
3098	sub add {	3333	sub add {
3099	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3100		3335
3101	for (my @widgets = @children; my $w = pop @widgets; ) {
3102	push @widgets, $w->children;
3103	$w->{root} = $self;
3104	$w->{visible} = 1;
3105	}
3106
3107	for my $child (@children) {
3108	$child->{is_toplevel} = 1;	3336	$_->{is_toplevel} = 1
3109		3337	for @children;
3110	# integerise window positions
3111	$child->{x} = int $child->{x};
3112	$child->{y} = int $child->{y};
3113	}
3114		3338
3115	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3116	}	3340	}
3117		3341
3118	sub remove {	3342	sub remove {
3119	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3120		3344
3121	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3122		3349
3123	while (@children) {	3350	while (@children) {
3124	my $w = pop @children;	3351	my $w = pop @children;
3125	push @children, $w->children;	3352	push @children, $w->children;
3126	delete $w->{visible};	3353	$w->set_invisible;
3127	}	3354	}
3128	}	3355	}
3129		3356
3130	sub on_refresh {	3357	sub on_refresh {
3131	my ($self, $id, $cb) = @_;	3358	my ($self, $id, $cb) = @_;
…		…
3145	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3146	$_->()	3373	$_->()
3147	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3148	}	3375	}
3149		3376
3150	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
3151	my @queue = ([], []);	3378	my %queue;
		3379	my @queue;
		3380	my $widget;
3152		3381
3153	for (;;) {	3382	outer:
3154	if ($self->{check_size}) {	3383	while () {
3155	# heuristic: check containers last	3384	if (my $realloc = delete $self->{realloc}) {
3156	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3385	for $widget (values %$realloc) {
3157	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	}
3158	}	3392	}
3159		3393
3160	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3394	while () {
		3395	@queue or last outer;
3161		3396
3162	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3397	$widget = pop @{ $queue[-1] || [] }
3163	? @$widget{qw(user_w user_h)}	3398	and last;
3164	: $widget->size_request;
3165
3166	if (delete $widget->{force_alloc}
3167	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169		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}) {
3170	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3171	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3172		3417
3173	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3174		3419
3175	$widget->{parent}->check_size
3176	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	}
3177	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3178	}	3430	}
3179	}	3431	}
3180		3432
3181	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3182	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3183	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)};
3184		3441
3185	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3186	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3187		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
3188	$widget->{w} = $w;	3452	$widget->{w} = $w;
3189	$widget->{h} = $h;	3453	$widget->{h} = $h;
3190	$widget->size_allocate ($w, $h);	3454
3191	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3192	}	3457	}
3193	}	3458	}
3194		3459
3195	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3196	$_->()	3461	$_->()
3197	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3198	}	3463	}
		3464
3199		3465
3200	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3203		3469

Diff Legend

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