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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 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	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	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
157	$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.]+$/;
158	$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};
159	$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};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$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.]+$/;
162	$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};
163	$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};
164	$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
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	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	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
238	$self->focus_out;	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;
239	}	305	}
240		306
241	sub hide {	307	sub hide {
242	my ($self) = @_;	308	my ($self) = @_;
243		309
…		…
245		311
246	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
247	if $self->{parent};	313	if $self->{parent};
248	}	314	}
249		315
250	sub move {	316	sub move_abs {
251	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
252		318
253	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
254	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
255	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
256		322
257	$self->update;	323	$self->update;
258	}	324	}
259		325
260	sub set_size {	326	sub set_size {
261	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
262		328
263	$self->{user_w} = $w;	329	$self->{force_w} = $w;
264	$self->{user_h} = $h;	330	$self->{force_h} = $h;
265		331
266	$self->check_size;	332	$self->realloc;
267	}	333	}
268		334
269	sub size_request {	335	sub size_request {
270	require Carp;	336	require Carp;
271	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
273		339
274	sub configure {	340	sub configure {
275	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
276		342
277	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
278	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
279	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
280		348
281	# use alignment to adjust x, y	349	# use alignment to adjust x, y
282		350
283	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
284	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
285
286	($w, $h) = ($w2, $h2);
287	}	353	}
288		354
289	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
290	$self->{x} = $x;	356	$self->{x} = $x;
291	$self->{y} = $y;	357	$self->{y} = $y;
292	$self->update;	358	$self->update;
293	}	359	}
294		360
295	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296	$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;
297	}	368	}
298	}	369	}
299		370
300	sub size_allocate {	371	sub size_allocate {
301	# nothing to be done	372	# nothing to be done
302	}	373	}
303		374
304	sub reconfigure {
305	my ($self) = @_;
306
307	$self->check_size (1);
308	$self->update;
309	}
310
311	sub children {	375	sub children {
312	}	376	}
313		377
314	sub set_max_size {	378	sub set_max_size {
315	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
318	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
319	}	383	}
320		384
321	sub set_tooltip {	385	sub set_tooltip {
322	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
323		392
324	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
325		394
326	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
381	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
382		451
383	$self->focus_in;	452	$self->focus_in;
384	}	453	}
385		454
386	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
387	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
388	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
389	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
390	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
391		528
392	sub draw {	529	sub draw {
393	my ($self) = @_;	530	my ($self) = @_;
394		531
395	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	local $draw_x = $draw_x + $self->{x};
		535	local $draw_y = $draw_y + $self->{y};
		536
		537	return if $draw_x + $self->{w} < 0;
		538	return if $draw_x >= $draw_w;
		539	return if $draw_y + $self->{h} < 0;
		540	return if $draw_y >= $draw_h;
396		541
397	glPushMatrix;	542	glPushMatrix;
398	glTranslate $self->{x}, $self->{y}, 0;	543	glTranslate $self->{x}, $self->{y}, 0;
399	$self->_draw;	544	$self->_draw;
400	glPopMatrix;	545	glPopMatrix;
…		…
412	glVertex $x , $y + $self->{h};	557	glVertex $x , $y + $self->{h};
413	glEnd;	558	glEnd;
414	glDisable GL_BLEND;	559	glDisable GL_BLEND;
415	}	560	}
416		561
417	if ($ENV{PCLIENT_DEBUG}) {	562	if ($ENV{CFPLUS_DEBUG} & 1) {
418	glPushMatrix;	563	glPushMatrix;
419	glColor 1, 1, 0, 1;	564	glColor 1, 1, 0, 1;
420	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421	glBegin GL_LINE_LOOP;	566	glBegin GL_LINE_LOOP;
422	glVertex 0 , 0;	567	glVertex 0 , 0;
423	glVertex $self->{w}, 0;	568	glVertex $self->{w} - 1, 0;
424	glVertex $self->{w}, $self->{h};	569	glVertex $self->{w} - 1, $self->{h} - 1;
425	glVertex 0 , $self->{h};	570	glVertex 0 , $self->{h} - 1;
426	glEnd;	571	glEnd;
427	glPopMatrix;	572	glPopMatrix;
428	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429	}	574	}
430	}	575	}
431		576
432	sub _draw {	577	sub _draw {
433	my ($self) = @_;	578	my ($self) = @_;
434		579
435	warn "no draw defined for $self\n";	580	warn "no draw defined for $self\n";
436	}
437
438	sub find_widget {
439	my ($self, $x, $y) = @_;
440
441	return () unless $self->{can_events};
442
443	return $self
444	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447	()
448	}
449
450	sub set_parent {
451	my ($self, $parent) = @_;
452
453	Scalar::Util::weaken ($self->{parent} = $parent);
454
455	# TODO: req_w _does_change after ->reconfigure
456	$self->check_size
457	unless exists $self->{req_w};
458
459	$self->show;
460	}
461
462	sub check_size {
463	my ($self, $forced) = @_;
464
465	$self->{force_alloc} = 1 if $forced;
466	$CFClient::UI::ROOT->{check_size}{$self} = $self;
467	}
468
469	sub update {
470	my ($self) = @_;
471
472	$self->{parent}->update
473	if $self->{parent};
474	}
475
476	sub connect {
477	my ($self, $signal, $cb) = @_;
478
479	push @{ $self->{signal_cb}{$signal} }, $cb;
480	}
481
482	sub _emit {
483	my ($self, $signal, @args) = @_;
484
485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486	}
487
488	sub emit {
489	my ($self, $signal, @args) = @_;
490
491	$self->_emit ($signal, @args)
492	|| $self->$signal (@args);
493	}	581	}
494		582
495	sub DESTROY {	583	sub DESTROY {
496	my ($self) = @_;	584	my ($self) = @_;
497		585
…		…
555	my ($class, %arg) = @_;	643	my ($class, %arg) = @_;
556	$class->SUPER::new (can_events => 0, %arg);	644	$class->SUPER::new (can_events => 0, %arg);
557	}	645	}
558		646
559	sub size_request {	647	sub size_request {
560	(0, 0)	648	my ($self) = @_;
		649
		650	($self->{w} + 0, $self->{h} + 0)
561	}	651	}
562		652
563	sub draw { }	653	sub draw { }
564		654
565	#############################################################################	655	#############################################################################
…		…
594	$self->{children} = [	684	$self->{children} = [
595	sort { $a->{z} <=> $b->{z} }	685	sort { $a->{z} <=> $b->{z} }
596	@{$self->{children}}, @widgets	686	@{$self->{children}}, @widgets
597	];	687	];
598		688
599	$self->check_size (1);	689	$self->realloc;
600	$self->update;
601	}	690	}
602		691
603	sub children {	692	sub children {
604	@{ $_[0]{children} }	693	@{ $_[0]{children} }
605	}	694	}
…		…
610	delete $child->{parent};	699	delete $child->{parent};
611	$child->hide;	700	$child->hide;
612		701
613	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	702	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614		703
615	$self->check_size;	704	$self->realloc;
616	$self->update;
617	}	705	}
618		706
619	sub clear {	707	sub clear {
620	my ($self) = @_;	708	my ($self) = @_;
621		709
…		…
625	for (@$children) {	713	for (@$children) {
626	delete $_->{parent};	714	delete $_->{parent};
627	$_->hide;	715	$_->hide;
628	}	716	}
629		717
630	$self->check_size;	718	$self->realloc;
631	$self->update;
632	}	719	}
633		720
634	sub find_widget {	721	sub find_widget {
635	my ($self, $x, $y) = @_;	722	my ($self, $x, $y) = @_;
636		723
…		…
723	$self->SUPER::size_allocate ($w, $h);	810	$self->SUPER::size_allocate ($w, $h);
724	$self->update;	811	$self->update;
725	}	812	}
726		813
727	sub _render {	814	sub _render {
		815	my ($self) = @_;
		816
728	$_[0]{children}[0]->draw;	817	$self->{children}[0]->draw;
729	}	818	}
730		819
731	sub render_child {	820	sub render_child {
732	my ($self) = @_;	821	my ($self) = @_;
733		822
734	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	823	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735	glClearColor 0, 0, 0, 0;	824	glClearColor 0, 0, 0, 0;
736	glClear GL_COLOR_BUFFER_BIT;	825	glClear GL_COLOR_BUFFER_BIT;
737		826
		827	{
		828	package CFClient::UI::Base;
		829
		830	($draw_x, $draw_y, $draw_w, $draw_h) =
		831	(0, 0, $self->{w}, $self->{h});
		832	}
		833
738	$self->_render;	834	$self->_render;
739	};	835	};
740	}	836	}
741		837
742	sub _draw {	838	sub _draw {
743	my ($self) = @_;	839	my ($self) = @_;
744		840
745	my ($w, $h) = ($self->w, $self->h);	841	my ($w, $h) = @$self{qw(w h)};
746		842
747	my $tex = $self->{texture}	843	my $tex = $self->{texture}
748	or return;	844	or return;
749		845
750	glEnable GL_TEXTURE_2D;	846	glEnable GL_TEXTURE_2D;
…		…
760		856
761	package CFClient::UI::ViewPort;	857	package CFClient::UI::ViewPort;
762		858
763	our @ISA = CFClient::UI::Window::;	859	our @ISA = CFClient::UI::Window::;
764		860
		861	sub new {
		862	my $class = shift;
		863
		864	$class->SUPER::new (
		865	scroll_x => 0,
		866	scroll_y => 1,
		867	@_,
		868	)
		869	}
		870
765	sub size_request {	871	sub size_request {
766	my ($self) = @_;	872	my ($self) = @_;
767		873
768	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	874	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769		875
770	@$self{qw(child_w child_h)}	876	$w = 10 if $self->{scroll_x};
		877	$h = 10 if $self->{scroll_y};
		878
		879	($w, $h)
771	}	880	}
772		881
773	sub size_allocate {	882	sub size_allocate {
774	my ($self, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
775		884
776	my ($cw, $ch) = @$self{qw(child_w child_h)};	885	my $child = $self->child;
777	# $w = $self->{w};	886
		887	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		888	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		889
778	$self->child->configure (0, 0, $cw, $ch);	890	$self->child->configure (0, 0, $w, $h);
779	$self->update;	891	$self->update;
780	}	892	}
781		893
782	sub set_offset {	894	sub set_offset {
783	my ($self, $x, $y) = @_;	895	my ($self, $x, $y) = @_;
…		…
817	}	929	}
818		930
819	sub _render {	931	sub _render {
820	my ($self) = @_;	932	my ($self) = @_;
821		933
		934	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		935	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		936
822	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	937	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823		938
824	$self->SUPER::_render;	939	$self->SUPER::_render;
825	}	940	}
826		941
…		…
834	my $class = shift;	949	my $class = shift;
835		950
836	my $self;	951	my $self;
837		952
838	my $slider = new CFClient::UI::Slider	953	my $slider = new CFClient::UI::Slider
839	vertical => 1,	954	vertical => 1,
840	range => [0, 0, 1, 0.01], # HACK fix	955	range => [0, 0, 1, 0.01], # HACK fix
841	connect_changed => sub {	956	on_changed => sub {
842	$self->{vp}->set_offset (0, $_[1]);	957	$self->{vp}->set_offset (0, $_[1]);
843	},	958	},
844	;	959	;
845		960
846	$self = $class->SUPER::new (	961	$self = $class->SUPER::new (
…		…
852	$self->{vp}->add ($self->{scrolled});	967	$self->{vp}->add ($self->{scrolled});
853	$self->add ($self->{vp});	968	$self->add ($self->{vp});
854	$self->add ($self->{slider});	969	$self->add ($self->{slider});
855		970
856	$self	971	$self
		972	}
		973
		974	sub update {
		975	my ($self) = @_;
		976
		977	$self->SUPER::update;
		978
		979	# todo: overwrite size_allocate of child
		980	my $child = $self->{vp}->child;
		981	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857	}	982	}
858		983
859	sub size_allocate {	984	sub size_allocate {
860	my ($self, $w, $h) = @_;	985	my ($self, $w, $h) = @_;
861		986
…		…
914		1039
915	our @ISA = CFClient::UI::Bin::;	1040	our @ISA = CFClient::UI::Bin::;
916		1041
917	use CFClient::OpenGL;	1042	use CFClient::OpenGL;
918		1043
919	my @tex =	1044	my $bg =
		1045	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1046	mipmap => 1, wrap => 1;
		1047
		1048	my @border =
920	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1050	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922		1051
923	sub new {	1052	sub new {
924	my $class = shift;	1053	my $class = shift;
925
926	# TODO: user_x, user_y, overwrite moveto?
927		1054
928	my $self = $class->SUPER::new (	1055	my $self = $class->SUPER::new (
929	bg => [1, 1, 1, 1],	1056	bg => [1, 1, 1, 1],
930	border_bg => [1, 1, 1, 1],	1057	border_bg => [1, 1, 1, 1],
931	border => 0.6,	1058	border => 0.6,
932	is_toplevel => 1,
933	can_events => 1,	1059	can_events => 1,
		1060	min_w => 16,
		1061	min_h => 16,
934	@_	1062	@_
935	);	1063	);
936		1064
937	$self->{title} &&= new CFClient::UI::Label	1065	$self->{title} &&= new CFClient::UI::Label
938	align => 0,	1066	align => 0,
…		…
991	my ($ev, $x, $y) = @_;	1119	my ($ev, $x, $y) = @_;
992		1120
993	my $dx = $ev->{x} - $ox;	1121	my $dx = $ev->{x} - $ox;
994	my $dy = $ev->{y} - $oy;	1122	my $dy = $ev->{y} - $oy;
995		1123
996	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1126
		1127	$self->realloc;
998	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999	$self->check_size;
1000	};	1129	};
1001		1130
1002	} elsif ($lr ^ $td) {	1131	} elsif ($lr ^ $td) {
1003	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004	my ($bx, $by) = ($self->{x}, $self->{y});	1133	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1006	$self->{motion} = sub {	1135	$self->{motion} = sub {
1007	my ($ev, $x, $y) = @_;	1136	my ($ev, $x, $y) = @_;
1008		1137
1009	($x, $y) = ($ev->{x}, $ev->{y});	1138	($x, $y) = ($ev->{x}, $ev->{y});
1010		1139
1011	$self->move ($bx + $x - $ox, $by + $y - $oy);	1140	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012	$self->update;
1013	};	1141	};
1014	}	1142	}
1015	}	1143	}
1016		1144
1017	sub button_up {	1145	sub button_up {
…		…
1036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037		1165
1038	my $border = $self->border;	1166	my $border = $self->border;
1039		1167
1040	glColor @{ $self->{border_bg} };	1168	glColor @{ $self->{border_bg} };
1041	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1169	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1042	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1170	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1171	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1172	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045		1173
1046	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1174	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047	my $bg = $tex[0];	1175	glColor @{ $self->{bg} };
1048		1176
1049	# TODO: repeat texture not scale	1177	# TODO: repeat texture not scale
		1178	# solve this better(?)
1050	my $rep_x = $cw / $bg->{w};	1179	$bg->{s} = $cw / $bg->{w};
1051	my $rep_y = $ch / $bg->{h};	1180	$bg->{t} = $ch / $bg->{h};
1052
1053	glColor @{ $self->{bg} };
1054
1055	$bg->{s} = $rep_x;
1056	$bg->{t} = $rep_y;
1057	$bg->{wrap_mode} = 1;
1058	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059	}	1182	}
1060		1183
1061	glDisable GL_TEXTURE_2D;	1184	glDisable GL_TEXTURE_2D;
1062		1185
…		…
1078	sub new {	1201	sub new {
1079	my $class = shift;	1202	my $class = shift;
1080		1203
1081	$class->SUPER::new (	1204	$class->SUPER::new (
1082	col_expand => [],	1205	col_expand => [],
1083	@_	1206	@_,
1084	)	1207	)
		1208	}
		1209
		1210	sub children {
		1211	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085	}	1212	}
1086		1213
1087	sub add {	1214	sub add {
1088	my ($self, $x, $y, $child) = @_;	1215	my ($self, $x, $y, $child) = @_;
1089		1216
1090	$child->set_parent ($self);	1217	$child->set_parent ($self);
1091	$self->{children}[$y][$x] = $child;	1218	$self->{children}[$y][$x] = $child;
1092		1219
1093	$child->check_size;	1220	$self->realloc;
1094	}	1221	}
1095		1222
1096	sub children {
1097	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098	}
1099
1100	# TODO: move to container class maybe? send childs a signal on removal?	1223	# TODO: move to container class maybe? send children a signal on removal?
1101	sub clear {	1224	sub clear {
1102	my ($self) = @_;	1225	my ($self) = @_;
1103		1226
1104	my @children = $self->children;	1227	my @children = $self->children;
1105	delete $self->{children};	1228	delete $self->{children};
…		…
1107	for (@children) {	1230	for (@children) {
1108	delete $_->{parent};	1231	delete $_->{parent};
1109	$_->hide;	1232	$_->hide;
1110	}	1233	}
1111		1234
1112	$self->update;	1235	$self->realloc;
1113	}	1236	}
1114		1237
1115	sub get_wh {	1238	sub get_wh {
1116	my ($self) = @_;	1239	my ($self) = @_;
1117		1240
…		…
1148	sub size_allocate {	1271	sub size_allocate {
1149	my ($self, $w, $h) = @_;	1272	my ($self, $w, $h) = @_;
1150		1273
1151	my ($ws, $hs) = $self->get_wh;	1274	my ($ws, $hs) = $self->get_wh;
1152		1275
1153	my $req_w = sum @$ws;	1276	my $req_w = (sum @$ws) || 1;
1154	my $req_h = sum @$hs;	1277	my $req_h = (sum @$hs) || 1;
1155		1278
1156	# TODO: nicer code && do row_expand	1279	# TODO: nicer code && do row_expand
1157	my @col_expand = @{$self->{col_expand}};	1280	my @col_expand = @{$self->{col_expand}};
1158	@col_expand = (1) x @$ws unless @col_expand;	1281	@col_expand = (1) x @$ws unless @col_expand;
1159	my $col_expand = (sum @col_expand) || 1;	1282	my $col_expand = (sum @col_expand) || 1;
…		…
1213	}	1336	}
1214	}	1337	}
1215		1338
1216	#############################################################################	1339	#############################################################################
1217		1340
1218	package CFClient::UI::HBox;	1341	package CFClient::UI::Box;
1219
1220	# TODO: wrap into common Box base class
1221		1342
1222	our @ISA = CFClient::UI::Container::;	1343	our @ISA = CFClient::UI::Container::;
1223		1344
1224	sub size_request {	1345	sub size_request {
1225	my ($self) = @_;	1346	my ($self) = @_;
1226		1347
1227	my @alloc = map [$_->size_request], @{$self->{children}};	1348	$self->{vertical}
1228		1349	? (
1229	(	1350	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1230	(List::Util::sum map $_->[0], @alloc),	1351	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231	(List::Util::max map $_->[1], @alloc),	1352	)
1232	)	1353	: (
		1354	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1355	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1356	)
1233	}	1357	}
1234		1358
1235	sub size_allocate {	1359	sub size_allocate {
1236	my ($self, $w, $h) = @_;	1360	my ($self, $w, $h) = @_;
1237		1361
1238	($h, $w) = ($w, $h);	1362	my $space = $self->{vertical} ? $h : $w;
1239
1240	my $children = $self->{children};	1363	my $children = $self->{children};
1241		1364
1242	my @h = map $_->{req_w}, @$children;	1365	my @req;
1243		1366
1244	my $req_h = List::Util::sum @h;	1367	if ($self->{homogeneous}) {
1245		1368	@req = ($space / (@$children || 1)) x @$children;
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {	1369	} else {
		1370	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1371	my $req = List::Util::sum @req;
		1372
		1373	if ($req > $space) {
		1374	# ah well, not enough space
		1375	$_ *= $space / $req for @req;
		1376	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;	1377	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251	$exp ||= 1;
1252		1378
		1379	$space = ($space - $req) / $expand; # remaining space to give away
		1380
		1381	$req[$_] += $space * $children->[$_]{expand}
1253	for (0 .. $#$children) {	1382	for 0 .. $#$children;
1254	my $child = $children->[$_];
1255
1256	my $alloc_h = $h[$_];
1257	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258	$h[$_] = $alloc_h;
1259	}	1383	}
1260	}	1384	}
1261		1385
1262	CFClient::UI::harmonize \@h;	1386	CFClient::UI::harmonize \@req;
1263		1387
1264	my $y = 0;	1388	my $pos = 0;
1265	for (0 .. $#$children) {	1389	for (0 .. $#$children) {
1266	my $child = $children->[$_];
1267	my $h = $h[$_];	1390	my $alloc = $req[$_];
1268	$child->configure ($y, 0, $h, $w);	1391	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269		1392
1270	$y += $h;	1393	$pos += $alloc;
1271	}	1394	}
1272		1395
1273	1	1396	1
1274	}	1397	}
1275		1398
1276	#############################################################################	1399	#############################################################################
1277		1400
		1401	package CFClient::UI::HBox;
		1402
		1403	our @ISA = CFClient::UI::Box::;
		1404
		1405	sub new {
		1406	my $class = shift;
		1407
		1408	$class->SUPER::new (
		1409	vertical => 0,
		1410	@_,
		1411	)
		1412	}
		1413
		1414	#############################################################################
		1415
1278	package CFClient::UI::VBox;	1416	package CFClient::UI::VBox;
1279		1417
1280	# TODO: wrap into common Box base class
1281
1282	our @ISA = CFClient::UI::Container::;	1418	our @ISA = CFClient::UI::Box::;
1283		1419
1284	sub size_request {	1420	sub new {
1285	my ($self) = @_;	1421	my $class = shift;
1286		1422
1287	my @alloc = map [$_->size_request], @{$self->{children}};	1423	$class->SUPER::new (
1288		1424	vertical => 1,
1289	(	1425	@_,
1290	(List::Util::max map $_->[0], @alloc),
1291	(List::Util::sum map $_->[1], @alloc),
1292	)	1426	)
1293	}
1294
1295	sub size_allocate {
1296	my ($self, $w, $h) = @_;
1297
1298	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300	my $children = $self->{children};
1301
1302	my @h = map $_->{req_h}, @$children;
1303
1304	my $req_h = List::Util::sum @h;
1305
1306	if ($req_h > $h) {
1307	# ah well, not enough space
1308	$_ *= $h / $req_h for @h;
1309	} else {
1310	my $exp = List::Util::sum map $_->{expand}, @$children;
1311	$exp ||= 1;
1312
1313	for (0 .. $#$children) {
1314	my $child = $children->[$_];
1315
1316	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317	}
1318	}
1319
1320	CFClient::UI::harmonize \@h;
1321
1322	my $y = 0;
1323	for (0 .. $#$children) {
1324	my $child = $children->[$_];
1325	my $h = $h[$_];
1326	$child->configure (0, $y, $w, $h);
1327
1328	$y += $h;
1329	}
1330
1331	1
1332	}	1427	}
1333		1428
1334	#############################################################################	1429	#############################################################################
1335		1430
1336	package CFClient::UI::Label;	1431	package CFClient::UI::Label;
…		…
1353	ellipsise => 3, # end	1448	ellipsise => 3, # end
1354	layout => (new CFClient::Layout),	1449	layout => (new CFClient::Layout),
1355	fontsize => 1,	1450	fontsize => 1,
1356	align => -1,	1451	align => -1,
1357	valign => -1,	1452	valign => -1,
1358	padding => 2,	1453	padding_x => 2,
		1454	padding_y => 2,
1359	can_events => 0,	1455	can_events => 0,
1360	%arg	1456	%arg
1361	);	1457	);
1362		1458
1363	if (exists $self->{template}) {	1459	if (exists $self->{template}) {
…		…
1399	$self->{text} = "T$text";	1495	$self->{text} = "T$text";
1400		1496
1401	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402	$self->{layout}->set_text ($text);	1498	$self->{layout}->set_text ($text);
1403		1499
		1500	$self->realloc;
1404	$self->update;	1501	$self->update;
1405	$self->check_size;
1406	}	1502	}
1407		1503
1408	sub set_markup {	1504	sub set_markup {
1409	my ($self, $markup) = @_;	1505	my ($self, $markup) = @_;
1410		1506
…		…
1414	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415		1511
1416	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1512	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417	$self->{layout}->set_markup ($markup);	1513	$self->{layout}->set_markup ($markup);
1418		1514
		1515	$self->realloc;
1419	$self->update;	1516	$self->update;
1420	$self->check_size;
1421	}	1517	}
1422		1518
1423	sub size_request {	1519	sub size_request {
1424	my ($self) = @_;	1520	my ($self) = @_;
1425		1521
…		…
1439		1535
1440	$w = List::Util::max $w, $w2;	1536	$w = List::Util::max $w, $w2;
1441	$h = List::Util::max $h, $h2;	1537	$h = List::Util::max $h, $h2;
1442	}	1538	}
1443		1539
1444	(	1540	($w, $h)
1445	$w + $self->{padding} * 2,
1446	$h + $self->{padding} * 2,
1447	)
1448	}	1541	}
1449		1542
1450	sub size_allocate {	1543	sub size_allocate {
1451	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1452		1545
1453	delete $self->{texture};	1546	delete $self->{texture}
		1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454	}	1548	}
1455		1549
1456	sub set_fontsize {	1550	sub set_fontsize {
1457	my ($self, $fontsize) = @_;	1551	my ($self, $fontsize) = @_;
1458		1552
1459	$self->{fontsize} = $fontsize;	1553	$self->{fontsize} = $fontsize;
1460	delete $self->{texture};	1554	delete $self->{texture};
1461		1555
1462	$self->update;	1556	$self->realloc;
1463	$self->check_size;
1464	}	1557	}
1465		1558
1466	sub _draw {	1559	sub _draw {
1467	my ($self) = @_;	1560	my ($self) = @_;
1468		1561
…		…
1476	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478		1571
1479	my $tex = new_from_layout CFClient::Texture $self->{layout};	1572	my $tex = new_from_layout CFClient::Texture $self->{layout};
1480		1573
1481	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483	: ($self->{w} - $tex->{w}) * 0.5);	1576	: ($self->{w} - $tex->{w}) * 0.5);
1484		1577
1485	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487	: ($self->{h} - $tex->{h}) * 0.5);	1580	: ($self->{h} - $tex->{h}) * 0.5);
1488		1581
1489	$tex	1582	$tex
1490	};	1583	};
1491		1584
…		…
1548	sub set_text {	1641	sub set_text {
1549	my ($self, $text) = @_;	1642	my ($self, $text) = @_;
1550		1643
1551	$self->{cursor} = length $text;	1644	$self->{cursor} = length $text;
1552	$self->_set_text ($text);	1645	$self->_set_text ($text);
1553	$self->update;	1646
1554	$self->check_size;	1647	$self->realloc;
1555	}	1648	}
1556		1649
1557	sub get_text {	1650	sub get_text {
1558	$_[0]{text}	1651	$_[0]{text}
1559	}	1652	}
…		…
1562	my ($self) = @_;	1655	my ($self) = @_;
1563		1656
1564	my ($w, $h) = $self->SUPER::size_request;	1657	my ($w, $h) = $self->SUPER::size_request;
1565		1658
1566	($w + 1, $h) # add 1 for cursor	1659	($w + 1, $h) # add 1 for cursor
1567	}
1568
1569	sub size_allocate {
1570	my ($self, $w, $h) = @_;
1571
1572	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573	}	1660	}
1574		1661
1575	sub key_down {	1662	sub key_down {
1576	my ($self, $ev) = @_;	1663	my ($self, $ev) = @_;
1577		1664
…		…
1598	} elsif ($uni) {	1685	} elsif ($uni) {
1599	substr $text, $self->{cursor}++, 0, chr $uni;	1686	substr $text, $self->{cursor}++, 0, chr $uni;
1600	}	1687	}
1601		1688
1602	$self->_set_text ($text);	1689	$self->_set_text ($text);
1603	$self->update;	1690
1604	$self->check_size;	1691	$self->realloc;
1605	}	1692	}
1606		1693
1607	sub focus_in {	1694	sub focus_in {
1608	my ($self) = @_;	1695	my ($self) = @_;
1609		1696
…		…
1736		1823
1737	sub new {	1824	sub new {
1738	my $class = shift;	1825	my $class = shift;
1739		1826
1740	$class->SUPER::new (	1827	$class->SUPER::new (
1741	padding => 4,	1828	padding_x => 4,
		1829	padding_y => 4,
1742	fg => [1, 1, 1],	1830	fg => [1, 1, 1],
1743	active_fg => [0, 0, 1],	1831	active_fg => [0, 0, 1],
1744	can_hover => 1,	1832	can_hover => 1,
1745	align => 0,	1833	align => 0,
1746	valign => 0,	1834	valign => 0,
…		…
1793		1881
1794	sub new {	1882	sub new {
1795	my $class = shift;	1883	my $class = shift;
1796		1884
1797	$class->SUPER::new (	1885	$class->SUPER::new (
1798	padding => 2,	1886	padding_x => 2,
		1887	padding_y => 2,
1799	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1800	active_fg => [1, 1, 0],	1889	active_fg => [1, 1, 0],
1801	bg => [0, 0, 0, 0.2],	1890	bg => [0, 0, 0, 0.2],
1802	active_bg => [1, 1, 1, 0.5],	1891	active_bg => [1, 1, 1, 0.5],
1803	state => 0,	1892	state => 0,
…		…
1807	}	1896	}
1808		1897
1809	sub size_request {	1898	sub size_request {
1810	my ($self) = @_;	1899	my ($self) = @_;
1811		1900
1812	($self->{padding} * 2 + 6) x 2	1901	(6) x 2
1813	}	1902	}
1814		1903
1815	sub button_down {	1904	sub button_down {
1816	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1817		1906
1818	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820	$self->{state} = !$self->{state};	1909	$self->{state} = !$self->{state};
1821	$self->_emit (changed => $self->{state});	1910	$self->_emit (changed => $self->{state});
1822	}	1911	}
1823	}	1912	}
1824		1913
1825	sub _draw {	1914	sub _draw {
1826	my ($self) = @_;	1915	my ($self) = @_;
1827		1916
1828	$self->SUPER::_draw;	1917	$self->SUPER::_draw;
1829		1918
1830	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1919	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831		1920
1832	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1921	my ($w, $h) = @$self{qw(w h)};
		1922
		1923	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833		1924
1834	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1925	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835		1926
1836	my $tex = $self->{state} ? $tex[1] : $tex[0];	1927	my $tex = $self->{state} ? $tex[1] : $tex[0];
1837		1928
…		…
2102	fg => [1, 1, 1],	2193	fg => [1, 1, 1],
2103	active_fg => [0, 0, 0],	2194	active_fg => [0, 0, 0],
2104	bg => [0, 0, 0, 0.2],	2195	bg => [0, 0, 0, 0.2],
2105	active_bg => [1, 1, 1, 0.5],	2196	active_bg => [1, 1, 1, 0.5],
2106	range => [0, 0, 100, 10, 0],	2197	range => [0, 0, 100, 10, 0],
2107	req_w => $::WIDTH / 80,	2198	min_w => $::WIDTH / 80,
2108	req_h => $::WIDTH / 80,	2199	min_h => $::WIDTH / 80,
2109	vertical => 0,	2200	vertical => 0,
2110	can_hover => 1,	2201	can_hover => 1,
2111	inner_pad => 0.02,	2202	inner_pad => 0.02,
2112	@_	2203	@_
2113	);	2204	);
…		…
2116	$self->update;	2207	$self->update;
2117		2208
2118	$self	2209	$self
2119	}	2210	}
2120		2211
		2212	sub changed { }
		2213
2121	sub set_range {	2214	sub set_range {
2122	my ($self, $range) = @_;	2215	my ($self, $range) = @_;
2123		2216
2124	$self->{range} = $range;	2217	($range, $self->{range}) = ($self->{range}, $range);
2125		2218
2126	$self->update;	2219	$self->update
		2220	if "@$range" ne "@{$self->{range}}";
2127	}	2221	}
2128		2222
2129	sub set_value {	2223	sub set_value {
2130	my ($self, $value) = @_;	2224	my ($self, $value) = @_;
2131		2225
…		…
2150	}	2244	}
2151		2245
2152	sub size_request {	2246	sub size_request {
2153	my ($self) = @_;	2247	my ($self) = @_;
2154		2248
2155	my $w = $self->{req_w};	2249	($self->{req_w}, $self->{req_h})
2156	my $h = $self->{req_h};
2157
2158	$self->{vertical} ? ($h, $w) : ($w, $h)
2159	}	2250	}
2160		2251
2161	sub button_down {	2252	sub button_down {
2162	my ($self, $ev, $x, $y) = @_;	2253	my ($self, $ev, $x, $y) = @_;
2163		2254
…		…
2514		2605
2515	sub new {	2606	sub new {
2516	my $class = shift;	2607	my $class = shift;
2517		2608
2518	my $self = $class->SUPER::new (	2609	my $self = $class->SUPER::new (
2519	state => 0,	2610	state => 0,
2520	connect_activate => \&toggle_flopper,	2611	on_activate => \&toggle_flopper,
2521	@_	2612	@_
2522	);	2613	);
2523		2614
2524	if ($self->{state}) {
2525	$self->{state} = 0;
2526	$self->toggle_flopper;
2527	}
2528
2529	$self	2615	$self
2530	}	2616	}
2531		2617
2532	sub toggle_flopper {	2618	sub toggle_flopper {
2533	my ($self) = @_;	2619	my ($self) = @_;
2534		2620
2535	# TODO: use animation	2621	$self->{other}->toggle_visibility;
2536	if ($self->{state} = !$self->{state}) {
2537	$CFClient::UI::ROOT->add ($self->{other});
2538	$self->{other}->move ($self->coord2global (0, $self->{h}));
2539	$self->_emit ("open");
2540	} else {
2541	$CFClient::UI::ROOT->remove ($self->{other});
2542	$self->_emit ("close");
2543	}
2544
2545	$self->_emit (changed => $self->{state});
2546	}	2622	}
2547		2623
2548	#############################################################################	2624	#############################################################################
2549		2625
2550	package CFClient::UI::Tooltip;	2626	package CFClient::UI::Tooltip;
…		…
2563	}	2639	}
2564		2640
2565	sub set_tooltip_from {	2641	sub set_tooltip_from {
2566	my ($self, $widget) = @_;	2642	my ($self, $widget) = @_;
2567		2643
		2644	my $tooltip = $widget->{tooltip};
		2645
		2646	if ($ENV{CFPLUS_DEBUG} & 2) {
		2647	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2648	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2649	. "req $widget->{req_w} $widget->{req_h}\n"
		2650	. "visible $widget->{visible}";
		2651	}
		2652
2568	$self->add (new CFClient::UI::Label	2653	$self->add (new CFClient::UI::Label
2569	markup => $widget->{tooltip},	2654	markup => $tooltip,
2570	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2655	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571	fontsize => 0.8,	2656	fontsize => 0.8,
2572	fg => [0, 0, 0, 1],	2657	fg => [0, 0, 0, 1],
2573	ellipsise => 0,	2658	ellipsise => 0,
2574	font => ($widget->{tooltip_font} || $::FONT_PROP),	2659	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2585		2670
2586	sub size_allocate {	2671	sub size_allocate {
2587	my ($self, $w, $h) = @_;	2672	my ($self, $w, $h) = @_;
2588		2673
2589	$self->SUPER::size_allocate ($w - 4, $h - 4);	2674	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2675	}
		2676
		2677	sub visibility_change {
		2678	my ($self, $visible) = @_;
		2679
		2680	return unless $visible;
		2681
		2682	$self->{root}->on_post_alloc ("move_$self" => sub {
		2683	my $widget = $self->{owner}
		2684	or return;
		2685
		2686	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2687
		2688	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2689	if $x + $self->{w} > $::WIDTH;
		2690
		2691	$self->move_abs ($x, $y);
		2692	});
2590	}	2693	}
2591		2694
2592	sub _draw {	2695	sub _draw {
2593	my ($self) = @_;	2696	my ($self) = @_;
2594		2697
…		…
2611	glVertex $w, $h;	2714	glVertex $w, $h;
2612	glVertex $w, 0;	2715	glVertex $w, 0;
2613	glEnd;	2716	glEnd;
2614		2717
2615	glTranslate 2 - 0.375, 2 - 0.375;	2718	glTranslate 2 - 0.375, 2 - 0.375;
		2719
2616	$self->SUPER::_draw;	2720	$self->SUPER::_draw;
2617	}	2721	}
2618		2722
2619	#############################################################################	2723	#############################################################################
2620		2724
…		…
2626		2730
2627	sub new {	2731	sub new {
2628	my $class = shift;	2732	my $class = shift;
2629		2733
2630	my $self = $class->SUPER::new (	2734	my $self = $class->SUPER::new (
2631	aspect => 1,	2735	aspect => 1,
		2736	can_events => 0,
2632	@_,	2737	@_,
2633	);	2738	);
2634		2739
2635	if ($self->{anim} && $self->{animspeed}) {	2740	if ($self->{anim} && $self->{animspeed}) {
2636	Scalar::Util::weaken (my $widget = $self);	2741	Scalar::Util::weaken (my $widget = $self);
…		…
2695	$self->SUPER::DESTROY;	2800	$self->SUPER::DESTROY;
2696	}	2801	}
2697		2802
2698	#############################################################################	2803	#############################################################################
2699		2804
2700	package CFClient::UI::InventoryItem;
2701
2702	our @ISA = CFClient::UI::HBox::;
2703
2704	sub _item_to_desc {
2705	my ($item) = @_;
2706
2707	my $desc =
2708	$item->{nrof} < 2
2709	? $item->{name}
2710	: "$item->{nrof} × $item->{name_pl}";
2711
2712	$item->{flags} & Crossfire::Protocol::F_OPEN
2713	and $desc .= " (open)";
2714	$item->{flags} & Crossfire::Protocol::F_APPLIED
2715	and $desc .= " (applied)";
2716	$item->{flags} & Crossfire::Protocol::F_UNPAID
2717	and $desc .= " (unpaid)";
2718	$item->{flags} & Crossfire::Protocol::F_MAGIC
2719	and $desc .= " (magic)";
2720	$item->{flags} & Crossfire::Protocol::F_CURSED
2721	and $desc .= " (cursed)";
2722	$item->{flags} & Crossfire::Protocol::F_DAMNED
2723	and $desc .= " (damned)";
2724	$item->{flags} & Crossfire::Protocol::F_LOCKED
2725	and $desc .= " *";
2726
2727	$desc
2728	}
2729
2730	sub new {
2731	my $class = shift;
2732
2733	my %args = @_;
2734
2735	my $item = delete $args{item};
2736
2737	my $desc = _item_to_desc ($item);
2738
2739	my $self = $class->SUPER::new (
2740	can_hover => 1,
2741	can_events => 1,
2742	tooltip => ((CFClient::UI::Label::escape $desc)
2743	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744	connect_button_down => sub {
2745	my ($self, $ev, $x, $y) = @_;
2746
2747	# todo: maybe put examine on 1? but should just be a tooltip :(
2748	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749	my $targ = $::CONN->{player}{tag};
2750
2751	if ($item->{container} == $::CONN->{player}{tag}) {
2752	$targ = $main::OPENCONT;
2753	}
2754
2755	$::CONN->send ("move $targ $item->{tag} 0");
2756	} elsif ($ev->{button} == 1) {
2757	$::CONN->send ("examine $item->{tag}");
2758	} elsif ($ev->{button} == 2) {
2759	$::CONN->send ("apply $item->{tag}");
2760	} elsif ($ev->{button} == 3) {
2761	my @menu_items = (
2762	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765	(
2766	$item->{flags} & Crossfire::Protocol::F_LOCKED
2767	? (
2768	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769	)
2770	: (
2771	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773	)
2774	),
2775	);
2776
2777	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778	}
2779
2780	1
2781	},
2782	%args
2783	);
2784
2785
2786	$self->add (new CFClient::UI::Face
2787	can_events => 0,
2788	face => $item->{face},
2789	anim => $item->{anim},
2790	animspeed => $item->{animspeed},
2791	);
2792
2793	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795	$self->{item} = $item;
2796
2797	$self->update_item;
2798
2799	$self
2800	}
2801
2802	sub update_item {
2803	my ($self) = @_;
2804
2805	my $desc = _item_to_desc ($self->{item});
2806
2807	$self->{name_lbl}->set_text ($desc);
2808	}
2809
2810	#############################################################################
2811
2812	package CFClient::UI::Inventory;
2813
2814	our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816	sub new {
2817	my $class = shift;
2818
2819	my $self = $class->SUPER::new (
2820	scrolled => (new CFClient::UI::Table),
2821	@_,
2822	);
2823
2824	$self
2825	}
2826
2827	sub set_items {
2828	my ($self, $items) = @_;
2829
2830	$self->{scrolled}->clear;
2831	return unless $items;
2832
2833	my @items = sort {
2834	($a->{type} <=> $b->{type})
2835	or ($a->{name} cmp $b->{name})
2836	} @$items;
2837
2838	$self->{real_items} = \@items;
2839
2840	for my $item (@items) {
2841	$item->{item} = $item;
2842	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843	$item->update_item ();
2844	}
2845
2846	my $i = 0;
2847	for (@items) {
2848	$self->{scrolled}->add (0, $i, $_);
2849	my $nrof = $_->{item}->{nrof} || 1;
2850	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851	}
2852
2853	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854	}
2855
2856	sub size_request {
2857	my ($self) = @_;
2858	($self->{req_w}, $self->{req_h});
2859	}
2860
2861	#############################################################################
2862
2863	package CFClient::UI::Menu;	2805	package CFClient::UI::Menu;
2864		2806
2865	our @ISA = CFClient::UI::FancyFrame::;	2807	our @ISA = CFClient::UI::FancyFrame::;
2866		2808
2867	use CFClient::OpenGL;	2809	use CFClient::OpenGL;
…		…
2905	# maybe save $GRAB? must be careful about events...	2847	# maybe save $GRAB? must be careful about events...
2906	$GRAB = $self;	2848	$GRAB = $self;
2907	$self->{button} = $ev->{button};	2849	$self->{button} = $ev->{button};
2908		2850
2909	$self->show;	2851	$self->show;
2910	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2852	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911	}	2853	}
2912		2854
2913	sub mouse_motion {	2855	sub mouse_motion {
2914	my ($self, $ev, $x, $y) = @_;	2856	my ($self, $ev, $x, $y) = @_;
2915		2857
…		…
2995	sub add {	2937	sub add {
2996	my ($self, $text, %arg) = @_;	2938	my ($self, $text, %arg) = @_;
2997		2939
2998	$text =~ s/^\s+//;	2940	$text =~ s/^\s+//;
2999	$text =~ s/\s+$//;	2941	$text =~ s/\s+$//;
		2942
		2943	return unless $text;
3000		2944
3001	my $timeout = time + ((delete $arg{timeout}) || 60);	2945	my $timeout = time + ((delete $arg{timeout}) || 60);
3002		2946
3003	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2947	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004		2948
…		…
3038	$self->SUPER::reconfigure;	2982	$self->SUPER::reconfigure;
3039	}	2983	}
3040		2984
3041	#############################################################################	2985	#############################################################################
3042		2986
3043	package CFClient::UI::Root;	2987	package CFClient::UI::Inventory;
3044		2988
3045	our @ISA = CFClient::UI::Container::;	2989	our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047	use CFClient::OpenGL;
3048		2990
3049	sub new {	2991	sub new {
3050	my $class = shift;	2992	my $class = shift;
3051		2993
3052	$class->SUPER::new (	2994	my $self = $class->SUPER::new (
		2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3053	@_,	2996	@_,
3054	)	2997	);
3055	}
3056		2998
3057	sub configure {	2999	$self
		3000	}
		3001
		3002	sub set_items {
		3003	my ($self, $items) = @_;
		3004
		3005	$self->{scrolled}->clear;
		3006	return unless $items;
		3007
		3008	my @items = sort {
		3009	($a->{type} <=> $b->{type})
		3010	or ($a->{name} cmp $b->{name})
		3011	} @$items;
		3012
		3013	$self->{real_items} = \@items;
		3014
		3015	my $row = 0;
		3016	for my $item (@items) {
		3017	CFClient::Item::update_widgets $item;
		3018
		3019	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3020	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3021	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3022
		3023	$row++;
		3024	}
		3025	}
		3026
		3027	#############################################################################
		3028
		3029	package CFClient::UI::BindEditor;
		3030
		3031	our @ISA = CFClient::UI::FancyFrame::;
		3032
		3033	sub new {
		3034	my $class = shift;
		3035
		3036	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3037
		3038	$self->add (my $vb = new CFClient::UI::VBox);
		3039
		3040
		3041	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3042	text => "start recording",
		3043	tooltip => "Start/Stops recording of actions."
		3044	."All subsequent actions after the recording started will be captured."
		3045	."The actions are displayed after the record was stopped."
		3046	."To bind the action you have to click on the 'Bind' button",
		3047	on_activate => sub {
		3048	unless ($self->{recording}) {
		3049	$self->start;
		3050	} else {
		3051	$self->stop;
		3052	}
		3053	});
		3054
		3055	$vb->add (new CFClient::UI::Label text => "Actions:");
		3056	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3057
		3058	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3059	$vb->add (my $hb = new CFClient::UI::HBox);
		3060	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3061	$hb->add (new CFClient::UI::Button
		3062	text => "bind",
		3063	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3064	on_activate => sub {
		3065	$self->ask_for_bind;
		3066	});
		3067
		3068	$vb->add (my $hb = new CFClient::UI::HBox);
		3069	$hb->add (new CFClient::UI::Button
		3070	text => "ok",
		3071	expand => 1,
		3072	tooltip => "This closes the binding editor and saves the binding",
		3073	on_activate => sub {
		3074	$self->hide;
		3075	$self->commit;
		3076	});
		3077
		3078	$hb->add (new CFClient::UI::Button
		3079	text => "cancel",
		3080	expand => 1,
		3081	tooltip => "This closes the binding editor without saving",
		3082	on_activate => sub {
		3083	$self->hide;
		3084	$self->{binding_cancel}->()
		3085	if $self->{binding_cancel};
		3086	});
		3087
		3088	$self->update_binding_widgets;
		3089
		3090	$self
		3091	}
		3092
		3093	sub commit {
		3094	my ($self) = @_;
		3095	my ($mod, $sym, $cmds) = $self->get_binding;
		3096	if ($sym != 0 && @$cmds > 0) {
		3097	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3098	."'. Don't forget 'Save Config'!");
		3099	$self->{binding_change}->($mod, $sym, $cmds)
		3100	if $self->{binding_change};
		3101	} else {
		3102	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3103	$self->{binding_cancel}->()
		3104	if $self->{binding_cancel};
		3105	}
		3106	}
		3107
		3108	sub start {
		3109	my ($self) = @_;
		3110
		3111	$self->{rec_btn}->set_text ("stop recording");
		3112	$self->{recording} = 1;
		3113	$self->clear_command_list;
		3114	$::CONN->start_record if $::CONN;
		3115	}
		3116
		3117	sub stop {
		3118	my ($self) = @_;
		3119
		3120	$self->{rec_btn}->set_text ("start recording");
		3121	$self->{recording} = 0;
		3122
		3123	my $rec;
		3124	$rec = $::CONN->stop_record if $::CONN;
		3125	return unless ref $rec eq 'ARRAY';
		3126	$self->set_command_list ($rec);
		3127	}
		3128
		3129	# if $commit is true, the binding will be set after the user entered a key combo
		3130	sub ask_for_bind {
		3131	my ($self, $commit) = @_;
		3132
		3133	CFClient::Binder::open_binding_dialog (sub {
		3134	my ($mod, $sym) = @_;
		3135	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3136	$self->update_binding_widgets;
		3137	$self->commit if $commit;
		3138	});
		3139	}
		3140
		3141	# $mod and $sym are the modifiers and key symbol
		3142	# $cmds is a array ref of strings (the commands)
		3143	# $cb is the callback that is executed on OK
		3144	# $ccb is the callback that is executed on CANCEL and
		3145	# when the binding was unsuccessful on OK
		3146	sub set_binding {
3058	my ($self, $x, $y, $w, $h) = @_;	3147	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3059		3148
3060	$self->{w} = $w;	3149	$self->clear_command_list;
3061	$self->{h} = $h;	3150	$self->{recording} = 0;
3062	}	3151	$self->{rec_btn}->set_text ("start recording");
3063		3152
3064	sub check_size {	3153	$self->{binding} = [$mod, $sym];
		3154	$self->{commands} = $cmds;
		3155
		3156	$self->{binding_change} = $cb;
		3157	$self->{binding_cancel} = $ccb;
		3158
		3159	$self->update_binding_widgets;
		3160	}
		3161
		3162	# this is a shortcut method that asks for a binding
		3163	# and then just binds it.
		3164	sub do_quick_binding {
3065	my ($self) = @_;	3165	my ($self, $cmds) = @_;
		3166	$self->set_binding (undef, undef, $cmds, sub {
		3167	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3168	});
		3169	$self->ask_for_bind (1);
		3170	}
3066		3171
3067	$self->size_allocate ($self->{w}, $self->{h})	3172	sub update_binding_widgets {
3068	if $self->{w};	3173	my ($self) = @_;
		3174	my ($mod, $sym, $cmds) = $self->get_binding;
		3175	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3176	$self->set_command_list ($cmds);
		3177	}
		3178
		3179	sub get_binding {
		3180	my ($self) = @_;
		3181	return (
		3182	$self->{binding}->[0],
		3183	$self->{binding}->[1],
		3184	[ grep { defined $_ } @{$self->{commands}} ]
		3185	);
		3186	}
		3187
		3188	sub clear_command_list {
		3189	my ($self) = @_;
		3190	$self->{cmdbox}->clear ();
		3191	}
		3192
		3193	sub set_command_list {
		3194	my ($self, $cmds) = @_;
		3195
		3196	$self->{cmdbox}->clear ();
		3197	$self->{commands} = $cmds;
		3198
		3199	my $idx = 0;
		3200
		3201	for (@$cmds) {
		3202	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3203
		3204	my $i = $idx;
		3205	$hb->add (new CFClient::UI::Label text => $_);
		3206	$hb->add (new CFClient::UI::Button
		3207	text => "delete",
		3208	tooltip => "Deletes the action from the record",
		3209	on_activate => sub {
		3210	$self->{cmdbox}->remove ($hb);
		3211	$cmds->[$i] = undef;
		3212	});
		3213
		3214
		3215	$idx++
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::SpellList;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (new CFClient::UI::ScrolledWindow
		3231	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3232
		3233	$self;
		3234	}
		3235
		3236	# XXX: Do sorting? Argl...
		3237	sub add_spell {
		3238	my ($self, $spell) = @_;
		3239	$self->{spells}->{$spell->{name}} = $spell;
		3240
		3241	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3242	face => $spell->{face},
		3243	can_hover => 1,
		3244	can_events => 1,
		3245	tooltip => $spell->{message});
		3246
		3247	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3248	text => $spell->{name},
		3249	can_hover => 1,
		3250	can_events => 1,
		3251	tooltip => $spell->{message},
		3252	expand => 1);
		3253
		3254	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3255	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3256	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3257	expand => 1);
		3258
		3259	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3260	text => "bind to key",
		3261	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3262	}
		3263
		3264	sub rebuild_spell_list {
		3265	my ($self) = @_;
		3266	$self->{tbl_idx} = 0;
		3267	$self->add_spell ($_) for values %{$self->{spells}};
		3268	}
		3269
		3270	sub remove_spell {
		3271	my ($self, $spell) = @_;
		3272	delete $self->{spells}->{$spell->{name}};
		3273	$self->rebuild_spell_list;
		3274	}
		3275
		3276	#############################################################################
		3277
		3278	package CFClient::UI::Root;
		3279
		3280	our @ISA = CFClient::UI::Container::;
		3281
		3282	use CFClient::OpenGL;
		3283
		3284	sub new {
		3285	my $class = shift;
		3286
		3287	my $self = $class->SUPER::new (
		3288	visible => 1,
		3289	@_,
		3290	);
		3291
		3292	Scalar::Util::weaken ($self->{root} = $self);
		3293
		3294	$self
3069	}	3295	}
3070		3296
3071	sub size_request {	3297	sub size_request {
3072	my ($self) = @_;	3298	my ($self) = @_;
3073		3299
3074	($self->{w}, $self->{h})	3300	($self->{w}, $self->{h})
		3301	}
		3302
		3303	sub _to_pixel {
		3304	my ($coord, $size, $max) = @_;
		3305
		3306	$coord =
		3307	$coord eq "center" ? ($max - $size) * 0.5
		3308	: $coord eq "max" ? $max
		3309	: $coord;
		3310
		3311	$coord = 0 if $coord < 0;
		3312	$coord = $max - $size if $coord > $max - $size;
		3313
		3314	int $coord + 0.5
3075	}	3315	}
3076		3316
3077	sub size_allocate {	3317	sub size_allocate {
3078	my ($self, $w, $h) = @_;	3318	my ($self, $w, $h) = @_;
3079		3319
3080	for my $child ($self->children) {	3320	for my $child ($self->children) {
3081	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3321	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082		3322
3083	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3323	$X = $child->{force_x} if exists $child->{force_x};
3084	if exists $child->{req_x};	3324	$Y = $child->{force_y} if exists $child->{force_y};
3085		3325
3086	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3326	$X = _to_pixel $X, $W, $self->{w};
3087	if exists $child->{req_y};	3327	$Y = _to_pixel $Y, $H, $self->{h};
3088
3089	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091		3328
3092	$child->configure ($X, $Y, $W, $H);	3329	$child->configure ($X, $Y, $W, $H);
3093	}	3330	}
3094	}	3331	}
3095		3332
…		…
3106	}	3343	}
3107		3344
3108	sub update {	3345	sub update {
3109	my ($self) = @_;	3346	my ($self) = @_;
3110		3347
3111	$self->check_size;
3112	$::WANT_REFRESH++;	3348	$::WANT_REFRESH++;
3113	}	3349	}
3114		3350
3115	sub add {	3351	sub add {
3116	my ($self, @children) = @_;	3352	my ($self, @children) = @_;
3117		3353
3118	for (my @widgets = @children; my $w = pop @widgets; ) {
3119	push @widgets, $w->children;
3120	$w->{root} = $self;
3121	$w->{visible} = 1;
3122	}
3123
3124	for my $child (@children) {
3125	$child->{is_toplevel} = 1;	3354	$_->{is_toplevel} = 1
3126		3355	for @children;
3127	# integerise window positions
3128	$child->{x} = int $child->{x};
3129	$child->{y} = int $child->{y};
3130	}
3131		3356
3132	$self->SUPER::add (@children);	3357	$self->SUPER::add (@children);
3133	}	3358	}
3134		3359
3135	sub remove {	3360	sub remove {
3136	my ($self, @children) = @_;	3361	my ($self, @children) = @_;
3137		3362
3138	$self->SUPER::remove (@children);	3363	$self->SUPER::remove (@children);
		3364
		3365	delete $self->{is_toplevel}
		3366	for @children;
3139		3367
3140	while (@children) {	3368	while (@children) {
3141	my $w = pop @children;	3369	my $w = pop @children;
3142	push @children, $w->children;	3370	push @children, $w->children;
3143	$w->set_invisible;	3371	$w->set_invisible;
…		…
3162	while ($self->{refresh_hook}) {	3390	while ($self->{refresh_hook}) {
3163	$_->()	3391	$_->()
3164	for values %{delete $self->{refresh_hook}};	3392	for values %{delete $self->{refresh_hook}};
3165	}	3393	}
3166		3394
3167	if ($self->{check_size}) {	3395	if ($self->{realloc}) {
3168	my @queue = ([], []);	3396	my %queue;
		3397	my @queue;
		3398	my $widget;
3169		3399
3170	for (;;) {	3400	outer:
3171	if ($self->{check_size}) {	3401	while () {
3172	# heuristic: check containers last	3402	if (my $realloc = delete $self->{realloc}) {
3173	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3403	for $widget (values %$realloc) {
3174	for values %{delete $self->{check_size}}	3404	$widget->{visible} or next; # do not resize invisible widgets
		3405
		3406	$queue{$widget+0}++ and next; # duplicates are common
		3407
		3408	push @{ $queue[$widget->{visible}] }, $widget;
		3409	}
3175	}	3410	}
3176		3411
3177	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3412	while () {
		3413	@queue or last outer;
3178		3414
3179	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3415	$widget = pop @{ $queue[-1] || [] }
3180	? @$widget{qw(user_w user_h)}	3416	and last;
3181	: $widget->size_request;
3182
3183	if (delete $widget->{force_alloc}
3184	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186		3417
		3418	pop @queue;
		3419	}
		3420
		3421	delete $queue{$widget+0};
		3422
		3423	my ($w, $h) = $widget->size_request;
		3424
		3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3427
		3428	$w = $widget->{force_w} if exists $widget->{force_w};
		3429	$h = $widget->{force_h} if exists $widget->{force_h};
		3430
		3431	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3432	|| delete $widget->{force_realloc}) {
3187	$widget->{req_w} = $w;	3433	$widget->{req_w} = $w;
3188	$widget->{req_h} = $h;	3434	$widget->{req_h} = $h;
3189		3435
3190	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3436	$self->{size_alloc}{$widget+0} = $widget;
3191		3437
3192	$widget->{parent}->check_size
3193	if $widget->{parent};	3438	if (my $parent = $widget->{parent}) {
		3439	$self->{realloc}{$parent+0} = $parent
		3440	unless $queue{$parent+0};
		3441
		3442	$parent->{force_size_alloc} = 1;
		3443	$self->{size_alloc}{$parent+0} = $parent;
		3444	}
3194	}	3445	}
		3446
		3447	delete $self->{realloc}{$widget+0};
3195	}	3448	}
3196	}	3449	}
3197		3450
3198	while ($self->{size_alloc}) {	3451	while (my $size_alloc = delete $self->{size_alloc}) {
3199	for (values %{delete $self->{size_alloc}}) {	3452	my @queue = sort { $b->{visible} <=> $a->{visible} }
3200	my ($widget, $w, $h) = @$_;	3453	values %$size_alloc;
		3454
		3455	while () {
		3456	my $widget = pop @queue || last;
		3457
		3458	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201		3459
3202	$w = 0 if $w < 0;	3460	$w = 0 if $w < 0;
3203	$h = 0 if $h < 0;	3461	$h = 0 if $h < 0;
3204		3462
		3463	$w = int $w + 0.5;
		3464	$h = int $h + 0.5;
		3465
		3466	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3467	$widget->{old_w} = $widget->{w};
		3468	$widget->{old_h} = $widget->{h};
		3469
3205	$widget->{w} = $w;	3470	$widget->{w} = $w;
3206	$widget->{h} = $h;	3471	$widget->{h} = $h;
		3472
3207	$widget->emit (size_allocate => $w, $h);	3473	$widget->emit (size_allocate => $w, $h);
		3474	}
3208	}	3475	}
3209	}	3476	}
3210		3477
3211	while ($self->{post_alloc_hook}) {	3478	while ($self->{post_alloc_hook}) {
3212	$_->()	3479	$_->()
3213	for values %{delete $self->{post_alloc_hook}};	3480	for values %{delete $self->{post_alloc_hook}};
3214	}	3481	}
		3482
3215		3483
3216	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218	glClear GL_COLOR_BUFFER_BIT;	3486	glClear GL_COLOR_BUFFER_BIT;
3219		3487
…		…
3221	glLoadIdentity;	3489	glLoadIdentity;
3222	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223	glMatrixMode GL_MODELVIEW;	3491	glMatrixMode GL_MODELVIEW;
3224	glLoadIdentity;	3492	glLoadIdentity;
3225		3493
		3494	{
		3495	package CFClient::UI::Base;
		3496
		3497	($draw_x, $draw_y, $draw_w, $draw_h) =
		3498	(0, 0, $self->{w}, $self->{h});
		3499	}
		3500
3226	$self->_draw;	3501	$self->_draw;
3227	}	3502	}
3228		3503
3229	#############################################################################	3504	#############################################################################
3230		3505

Diff Legend

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