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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$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.]+$/;
178	$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};
179	$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};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$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.]+$/;
182	$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};
183	$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};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	return unless $self->{visible};	272	return unless $self->{visible};
259		273
260	# broken show/hide model	274	$_->set_invisible for $self->children;
261		275
262	delete $self->{root};	276	delete $self->{root};
263	delete $self->{visible};	277	delete $self->{visible};
264		278
265	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
266	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
267		281
268	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
269	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
270		284
271	$self->focus_out;	285	$self->focus_out;
272		286
273	$self->emit (visibility_change => 0);	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;
274	}	305	}
275		306
276	sub hide {	307	sub hide {
277	my ($self) = @_;	308	my ($self) = @_;
278		309
…		…
280		311
281	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
282	if $self->{parent};	313	if $self->{parent};
283	}	314	}
284		315
285	sub move {	316	sub move_abs {
286	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
287		318
288	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
289	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
290	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
291		322
292	$self->update;	323	$self->update;
293	}	324	}
294		325
295	sub set_size {	326	sub set_size {
296	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
297		328
298	$self->{user_w} = $w;	329	$self->{force_w} = $w;
299	$self->{user_h} = $h;	330	$self->{force_h} = $h;
300		331
301	$self->check_size;	332	$self->realloc;
302	}	333	}
303		334
304	sub size_request {	335	sub size_request {
305	require Carp;	336	require Carp;
306	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
308		339
309	sub configure {	340	sub configure {
310	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
311		342
312	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
313	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
314	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
315		348
316	# use alignment to adjust x, y	349	# use alignment to adjust x, y
317		350
318	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
319	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
320
321	($w, $h) = ($w2, $h2);
322	}	353	}
323		354
324	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
325	$self->{x} = $x;	356	$self->{x} = $x;
326	$self->{y} = $y;	357	$self->{y} = $y;
327	$self->update;	358	$self->update;
328	}	359	}
329		360
330	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331	$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;
332	}	368	}
333	}	369	}
334		370
335	sub size_allocate {	371	sub size_allocate {
336	# nothing to be done	372	# nothing to be done
337	}
338
339	sub reconfigure {
340	my ($self) = @_;
341
342	$self->check_size (1);
343	$self->update;
344	}	373	}
345		374
346	sub children {	375	sub children {
347	}	376	}
348		377
…		…
410		439
411	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412	unless $FOCUS;	441	unless $FOCUS;
413	}	442	}
414		443
415	sub mouse_motion { }	444	sub mouse_motion { 0 }
416	sub button_up { }	445	sub button_up { 0 }
417	sub key_down { }	446	sub key_down { 0 }
418	sub key_up { }	447	sub key_up { 0 }
419		448
420	sub button_down {	449	sub button_down {
421	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
422		451
423	$self->focus_in;	452	$self->focus_in;
424	}
425		453
426	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
427	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
428	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456
429	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub find_widget {
430	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		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	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self+0};
		504
		505	$self->{root}{realloc}{$self+0} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	delete $self->{req_h};
		510	}
		511	}
		512
		513	sub update {
		514	my ($self) = @_;
		515
		516	$self->{parent}->update
		517	if $self->{parent};
		518	}
		519
		520	sub reconfigure {
		521	my ($self) = @_;
		522
		523	$self->realloc;
		524	$self->update;
		525	}
		526
		527	# using global variables seems a bit hacky, but passing through all drawing
		528	# functions seems pointless.
		529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
431		530
432	sub draw {	531	sub draw {
433	my ($self) = @_;	532	my ($self) = @_;
434		533
435	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
		535
		536	# update screen rectangle
		537	local $draw_x = $draw_x + $self->{x};
		538	local $draw_y = $draw_y + $self->{y};
		539	local $draw_w = $draw_x + $self->{w};
		540	local $draw_h = $draw_y + $self->{h};
		541
		542	# skip widgets that are entirely outside the drawing area
		543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
436		545
437	glPushMatrix;	546	glPushMatrix;
438	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
439	$self->_draw;	548	$self->_draw;
440	glPopMatrix;	549	glPopMatrix;
…		…
452	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
453	glEnd;	562	glEnd;
454	glDisable GL_BLEND;	563	glDisable GL_BLEND;
455	}	564	}
456		565
457	if ($ENV{PCLIENT_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
458	glPushMatrix;	567	glPushMatrix;
459	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
461	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
462	glVertex 0 , 0;	571	glVertex 0 , 0;
…		…
473	my ($self) = @_;	582	my ($self) = @_;
474		583
475	warn "no draw defined for $self\n";	584	warn "no draw defined for $self\n";
476	}	585	}
477		586
478	sub find_widget {
479	my ($self, $x, $y) = @_;
480
481	return () unless $self->{can_events};
482
483	return $self
484	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487	()
488	}
489
490	sub set_parent {
491	my ($self, $parent) = @_;
492
493	Scalar::Util::weaken ($self->{parent} = $parent);
494
495	if ($parent->{visible} || 1) {
496	$self->{root} = $parent->{root};
497	$self->{visible} = $parent->{visible} + 1;
498
499	$self->emit (visibility_change => 1)
500	unless $self->{parent}{visible};
501	}
502
503	# TODO: req_w _does_change after ->reconfigure
504	$self->check_size
505	unless exists $self->{req_w};
506
507	$self->show;
508	}
509
510	sub check_size {
511	my ($self, $forced) = @_;
512
513	$self->{force_alloc} = 1 if $forced;
514	$CFClient::UI::ROOT->{check_size}{$self} = $self;
515	}
516
517	sub update {
518	my ($self) = @_;
519
520	$self->{parent}->update
521	if $self->{parent};
522	}
523
524	sub connect {
525	my ($self, $signal, $cb) = @_;
526
527	push @{ $self->{signal_cb}{$signal} }, $cb;
528	}
529
530	sub _emit {
531	my ($self, $signal, @args) = @_;
532
533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534	}
535
536	sub emit {
537	my ($self, $signal, @args) = @_;
538
539	$self->_emit ($signal, @args)
540	|| $self->$signal (@args);
541	}
542
543	sub visibility_change {
544	#my ($self, $visible) = @_;
545	}
546
547	sub DESTROY {	587	sub DESTROY {
548	my ($self) = @_;	588	my ($self) = @_;
549		589
550	delete $WIDGET{$self+0};	590	delete $WIDGET{$self+0};
551	#$self->deactivate;	591	#$self->deactivate;
…		…
607	my ($class, %arg) = @_;	647	my ($class, %arg) = @_;
608	$class->SUPER::new (can_events => 0, %arg);	648	$class->SUPER::new (can_events => 0, %arg);
609	}	649	}
610		650
611	sub size_request {	651	sub size_request {
612	(0, 0)	652	my ($self) = @_;
		653
		654	($self->{w} + 0, $self->{h} + 0)
613	}	655	}
614		656
615	sub draw { }	657	sub draw { }
616		658
617	#############################################################################	659	#############################################################################
…		…
646	$self->{children} = [	688	$self->{children} = [
647	sort { $a->{z} <=> $b->{z} }	689	sort { $a->{z} <=> $b->{z} }
648	@{$self->{children}}, @widgets	690	@{$self->{children}}, @widgets
649	];	691	];
650		692
651	$self->check_size (1);	693	$self->realloc;
652	$self->update;
653	}	694	}
654		695
655	sub children {	696	sub children {
656	@{ $_[0]{children} }	697	@{ $_[0]{children} }
657	}	698	}
…		…
662	delete $child->{parent};	703	delete $child->{parent};
663	$child->hide;	704	$child->hide;
664		705
665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	706	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666		707
667	$self->check_size (1);	708	$self->realloc;
668	$self->update;
669	}	709	}
670		710
671	sub clear {	711	sub clear {
672	my ($self) = @_;	712	my ($self) = @_;
673		713
…		…
677	for (@$children) {	717	for (@$children) {
678	delete $_->{parent};	718	delete $_->{parent};
679	$_->hide;	719	$_->hide;
680	}	720	}
681		721
682	$self->check_size;	722	$self->realloc;
683	$self->update;
684	}	723	}
685		724
686	sub find_widget {	725	sub find_widget {
687	my ($self, $x, $y) = @_;	726	my ($self, $x, $y) = @_;
688		727
…		…
775	$self->SUPER::size_allocate ($w, $h);	814	$self->SUPER::size_allocate ($w, $h);
776	$self->update;	815	$self->update;
777	}	816	}
778		817
779	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
780	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
781	}	822	}
782		823
783	sub render_child {	824	sub render_child {
784	my ($self) = @_;	825	my ($self) = @_;
785		826
786	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	827	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
787	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
788	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
789		830
		831	{
		832	package CFClient::UI::Base;
		833
		834	($draw_x, $draw_y, $draw_w, $draw_h) =
		835	(0, 0, $self->{w}, $self->{h});
		836	}
		837
790	$self->_render;	838	$self->_render;
791	};	839	};
792	}	840	}
793		841
794	sub _draw {	842	sub _draw {
795	my ($self) = @_;	843	my ($self) = @_;
796		844
797	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
798		846
799	my $tex = $self->{texture}	847	my $tex = $self->{texture}
800	or return;	848	or return;
801		849
802	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
825	}	873	}
826		874
827	sub size_request {	875	sub size_request {
828	my ($self) = @_;	876	my ($self) = @_;
829		877
830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831		879
832	@$self{qw(child_w child_h)}	880	$w = 10 if $self->{scroll_x};
		881	$h = 10 if $self->{scroll_y};
		882
		883	($w, $h)
833	}	884	}
834		885
835	sub size_allocate {	886	sub size_allocate {
836	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
837		888
		889	my $child = $self->child;
		890
838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840		893
841	$self->child->configure (0, 0, $w, $h);	894	$self->child->configure (0, 0, $w, $h);
842	$self->update;	895	$self->update;
843	}	896	}
844		897
…		…
879	}	932	}
880	}	933	}
881		934
882	sub _render {	935	sub _render {
883	my ($self) = @_;	936	my ($self) = @_;
		937
		938	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		939	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
884		940
885	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886		942
887	$self->SUPER::_render;	943	$self->SUPER::_render;
888	}	944	}
…		…
987		1043
988	our @ISA = CFClient::UI::Bin::;	1044	our @ISA = CFClient::UI::Bin::;
989		1045
990	use CFClient::OpenGL;	1046	use CFClient::OpenGL;
991		1047
992	my @tex =	1048	my $bg =
		1049	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1050	mipmap => 1, wrap => 1;
		1051
		1052	my @border =
993	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1054	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995		1055
996	sub new {	1056	sub new {
997	my $class = shift;	1057	my ($class, %arg) = @_;
998		1058
999	# TODO: user_x, user_y, overwrite moveto?	1059	my $title = delete $arg{title};
1000		1060
1001	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
1002	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
1003	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
1004	border => 0.6,	1064	border => 0.6,
1005	is_toplevel => 1,
1006	can_events => 1,	1065	can_events => 1,
1007	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
1008	);	1069	);
1009		1070
1010	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
1011	align => 0,	1072	align => 0,
1012	valign => 1,	1073	valign => 1,
1013	text => $self->{title},	1074	text => $title,
1014	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
1015		1077
1016	$self	1078	$self
		1079	}
		1080
		1081	sub add {
		1082	my ($self, @widgets) = @_;
		1083
		1084	$self->SUPER::add (@widgets);
		1085	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1017	}	1086	}
1018		1087
1019	sub border {	1088	sub border {
1020	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
1021	}	1090	}
1022		1091
1023	sub size_request {	1092	sub size_request {
1024	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
1025		1097
1026	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
1027		1099
1028	(	1100	(
1029	$w + $self->border * 2,	1101	$w + $self->border * 2,
…		…
1032	}	1104	}
1033		1105
1034	sub size_allocate {	1106	sub size_allocate {
1035	my ($self, $w, $h) = @_;	1107	my ($self, $w, $h) = @_;
1036		1108
		1109	if ($self->{title}) {
		1110	$self->{title}{w} = $w;
		1111	$self->{title}{h} = $h;
		1112	$self->{title}->size_allocate ($w, $h);
		1113	}
		1114
		1115	my $border = $self->border;
		1116
1037	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
1038	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
1039		1119
1040	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041	if $self->{title};
1042
1043	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
1044	}	1121	}
1045		1122
1046	sub button_down {	1123	sub button_down {
1047	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
1048		1125
…		…
1064	my ($ev, $x, $y) = @_;	1141	my ($ev, $x, $y) = @_;
1065		1142
1066	my $dx = $ev->{x} - $ox;	1143	my $dx = $ev->{x} - $ox;
1067	my $dy = $ev->{y} - $oy;	1144	my $dy = $ev->{y} - $oy;
1068		1145
1069	$self->{user_x} = $wx + $dx * $mx;
1070	$self->{user_y} = $wy + $dy * $my;
1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073	$self->move ($self->{user_x}, $self->{user_y});	1148
1074	$self->check_size;	1149	$self->realloc;
		1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1075	};	1151	};
1076		1152
1077	} elsif ($lr ^ $td) {	1153	} elsif ($lr ^ $td) {
1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079	my ($bx, $by) = ($self->{x}, $self->{y});	1155	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1081	$self->{motion} = sub {	1157	$self->{motion} = sub {
1082	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1083		1159
1084	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1085		1161
1086	$self->{user_x} = $bx + $x - $ox;	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087	$self->{user_y} = $by + $y - $oy;
1088	$self->move ($self->{user_x}, $self->{user_y});
1089	$self->update;
1090	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1091	}	1168	1
1092	}	1169	}
1093		1170
1094	sub button_up {	1171	sub button_up {
1095	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1096		1173
1097	delete $self->{motion};	1174	!!delete $self->{motion}
1098	}	1175	}
1099		1176
1100	sub mouse_motion {	1177	sub mouse_motion {
1101	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1102		1179
1103	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1104	}	1183	}
1105		1184
1106	sub _draw {	1185	sub _draw {
1107	my ($self) = @_;	1186	my ($self) = @_;
1108		1187
		1188	my $child = $self->{children}[0];
		1189
1109	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1110	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1111		1192
1112	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1113	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114		1195
1115	my $border = $self->border;	1196	my $border = $self->border;
1116		1197
1117	glColor @{ $self->{border_bg} };	1198	glColor @{ $self->{border_bg} };
1118	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1199	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1119	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1200	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1201	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1202	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122		1203
1123	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1204	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124	my $bg = $tex[0];	1205	glColor @{ $self->{bg} };
1125		1206
1126	# TODO: repeat texture not scale	1207	# TODO: repeat texture not scale
		1208	# solve this better(?)
1127	my $rep_x = $cw / $bg->{w};	1209	$bg->{s} = $cw / $bg->{w};
1128	my $rep_y = $ch / $bg->{h};	1210	$bg->{t} = $ch / $bg->{h};
1129
1130	glColor @{ $self->{bg} };
1131
1132	$bg->{s} = $rep_x;
1133	$bg->{t} = $rep_y;
1134	$bg->{wrap_mode} = 1;
1135	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136	}	1212	}
1137		1213
1138	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1139		1215
1140	$self->{title}->draw if $self->{title};
1141
1142	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1143	}	1222	}
1144		1223
1145	#############################################################################	1224	#############################################################################
1146		1225
1147	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1169	my ($self, $x, $y, $child) = @_;	1248	my ($self, $x, $y, $child) = @_;
1170		1249
1171	$child->set_parent ($self);	1250	$child->set_parent ($self);
1172	$self->{children}[$y][$x] = $child;	1251	$self->{children}[$y][$x] = $child;
1173		1252
1174	$self->check_size (1);	1253	$self->realloc;
1175	}	1254	}
1176		1255
1177	# TODO: move to container class maybe? send children a signal on removal?	1256	# TODO: move to container class maybe? send children a signal on removal?
1178	sub clear {	1257	sub clear {
1179	my ($self) = @_;	1258	my ($self) = @_;
…		…
1184	for (@children) {	1263	for (@children) {
1185	delete $_->{parent};	1264	delete $_->{parent};
1186	$_->hide;	1265	$_->hide;
1187	}	1266	}
1188		1267
1189	$self->check_size (1);	1268	$self->realloc;
1190	$self->update;
1191	}	1269	}
1192		1270
1193	sub get_wh {	1271	sub get_wh {
1194	my ($self) = @_;	1272	my ($self) = @_;
1195		1273
…		…
1291	}	1369	}
1292	}	1370	}
1293		1371
1294	#############################################################################	1372	#############################################################################
1295		1373
1296	package CFClient::UI::HBox;	1374	package CFClient::UI::Box;
1297
1298	# TODO: wrap into common Box base class
1299		1375
1300	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Container::;
1301		1377
1302	sub size_request {	1378	sub size_request {
1303	my ($self) = @_;	1379	my ($self) = @_;
1304		1380
1305	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$self->{vertical}
1306		1382	? (
1307	(	1383	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1308	(List::Util::sum map $_->[0], @alloc),	1384	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309	(List::Util::max map $_->[1], @alloc),	1385	)
1310	)	1386	: (
		1387	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1388	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1389	)
1311	}	1390	}
1312		1391
1313	sub size_allocate {	1392	sub size_allocate {
1314	my ($self, $w, $h) = @_;	1393	my ($self, $w, $h) = @_;
1315		1394
1316	($h, $w) = ($w, $h);	1395	my $space = $self->{vertical} ? $h : $w;
1317
1318	my $children = $self->{children};	1396	my $children = $self->{children};
1319		1397
1320	my @h = map $_->{req_w}, @$children;	1398	my @req;
1321		1399
1322	my $req_h = List::Util::sum @h;	1400	if ($self->{homogeneous}) {
1323		1401	@req = ($space / (@$children || 1)) x @$children;
1324	if ($req_h > $h) {
1325	# ah well, not enough space
1326	$_ *= $h / $req_h for @h;
1327	} else {	1402	} else {
		1403	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1404	my $req = List::Util::sum @req;
		1405
		1406	if ($req > $space) {
		1407	# ah well, not enough space
		1408	$_ *= $space / $req for @req;
		1409	} else {
1328	my $exp = List::Util::sum map $_->{expand}, @$children;	1410	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329	$exp ||= 1;
1330		1411
		1412	$space = ($space - $req) / $expand; # remaining space to give away
		1413
		1414	$req[$_] += $space * $children->[$_]{expand}
1331	for (0 .. $#$children) {	1415	for 0 .. $#$children;
1332	my $child = $children->[$_];
1333
1334	my $alloc_h = $h[$_];
1335	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336	$h[$_] = $alloc_h;
1337	}	1416	}
1338	}	1417	}
1339		1418
1340	CFClient::UI::harmonize \@h;	1419	CFClient::UI::harmonize \@req;
1341		1420
1342	my $y = 0;	1421	my $pos = 0;
1343	for (0 .. $#$children) {	1422	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];	1423	my $alloc = $req[$_];
1346	$child->configure ($y, 0, $h, $w);	1424	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347		1425
1348	$y += $h;	1426	$pos += $alloc;
1349	}	1427	}
1350		1428
1351	1	1429	1
1352	}	1430	}
1353		1431
1354	#############################################################################	1432	#############################################################################
1355		1433
		1434	package CFClient::UI::HBox;
		1435
		1436	our @ISA = CFClient::UI::Box::;
		1437
		1438	sub new {
		1439	my $class = shift;
		1440
		1441	$class->SUPER::new (
		1442	vertical => 0,
		1443	@_,
		1444	)
		1445	}
		1446
		1447	#############################################################################
		1448
1356	package CFClient::UI::VBox;	1449	package CFClient::UI::VBox;
1357		1450
1358	# TODO: wrap into common Box base class
1359
1360	our @ISA = CFClient::UI::Container::;	1451	our @ISA = CFClient::UI::Box::;
1361		1452
1362	sub size_request {	1453	sub new {
1363	my ($self) = @_;	1454	my $class = shift;
1364		1455
1365	my @alloc = map [$_->size_request], @{$self->{children}};	1456	$class->SUPER::new (
1366		1457	vertical => 1,
1367	(	1458	@_,
1368	(List::Util::max map $_->[0], @alloc),
1369	(List::Util::sum map $_->[1], @alloc),
1370	)	1459	)
1371	}
1372
1373	sub size_allocate {
1374	my ($self, $w, $h) = @_;
1375
1376	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378	my $children = $self->{children};
1379
1380	my @h = map $_->{req_h}, @$children;
1381
1382	my $req_h = List::Util::sum @h;
1383
1384	if ($req_h > $h) {
1385	# ah well, not enough space
1386	$_ *= $h / $req_h for @h;
1387	} else {
1388	my $exp = List::Util::sum map $_->{expand}, @$children;
1389	$exp ||= 1;
1390
1391	for (0 .. $#$children) {
1392	my $child = $children->[$_];
1393
1394	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395	}
1396	}
1397
1398	CFClient::UI::harmonize \@h;
1399
1400	my $y = 0;
1401	for (0 .. $#$children) {
1402	my $child = $children->[$_];
1403	my $h = $h[$_];
1404	$child->configure (0, $y, $w, $h);
1405
1406	$y += $h;
1407	}
1408
1409	1
1410	}	1460	}
1411		1461
1412	#############################################################################	1462	#############################################################################
1413		1463
1414	package CFClient::UI::Label;	1464	package CFClient::UI::Label;
…		…
1431	ellipsise => 3, # end	1481	ellipsise => 3, # end
1432	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1433	fontsize => 1,	1483	fontsize => 1,
1434	align => -1,	1484	align => -1,
1435	valign => -1,	1485	valign => -1,
1436	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1437	can_events => 0,	1488	can_events => 0,
1438	%arg	1489	%arg
1439	);	1490	);
1440		1491
1441	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1477	$self->{text} = "T$text";	1528	$self->{text} = "T$text";
1478		1529
1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480	$self->{layout}->set_text ($text);	1531	$self->{layout}->set_text ($text);
1481		1532
		1533	$self->realloc;
1482	$self->update;	1534	$self->update;
1483	$self->check_size;
1484	}	1535	}
1485		1536
1486	sub set_markup {	1537	sub set_markup {
1487	my ($self, $markup) = @_;	1538	my ($self, $markup) = @_;
1488		1539
…		…
1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1543	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493		1544
1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1545	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495	$self->{layout}->set_markup ($markup);	1546	$self->{layout}->set_markup ($markup);
1496		1547
		1548	$self->realloc;
1497	$self->update;	1549	$self->update;
1498	$self->check_size;
1499	}	1550	}
1500		1551
1501	sub size_request {	1552	sub size_request {
1502	my ($self) = @_;	1553	my ($self) = @_;
1503		1554
…		…
1517		1568
1518	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1519	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1520	}	1571	}
1521		1572
1522	(	1573	($w, $h)
1523	$w + $self->{padding} * 2,
1524	$h + $self->{padding} * 2,
1525	)
1526	}	1574	}
1527		1575
1528	sub size_allocate {	1576	sub size_allocate {
1529	my ($self, $w, $h) = @_;	1577	my ($self, $w, $h) = @_;
1530		1578
		1579	delete $self->{ox};
		1580
1531	delete $self->{texture};	1581	delete $self->{texture}
		1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532	}	1583	}
1533		1584
1534	sub set_fontsize {	1585	sub set_fontsize {
1535	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1536		1587
1537	$self->{fontsize} = $fontsize;	1588	$self->{fontsize} = $fontsize;
1538	delete $self->{texture};	1589	delete $self->{texture};
1539		1590
1540	$self->update;	1591	$self->realloc;
1541	$self->check_size;
1542	}	1592	}
1543		1593
1544	sub _draw {	1594	sub _draw {
1545	my ($self) = @_;	1595	my ($self) = @_;
1546		1596
…		…
1552	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1553	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556		1606
1557	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1558		1609
		1610	unless (exists $self->{ox}) {
1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1562		1614
1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1566
1567	$tex
1568	};	1618	};
1569		1619
1570	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572		1622
…		…
1626	sub set_text {	1676	sub set_text {
1627	my ($self, $text) = @_;	1677	my ($self, $text) = @_;
1628		1678
1629	$self->{cursor} = length $text;	1679	$self->{cursor} = length $text;
1630	$self->_set_text ($text);	1680	$self->_set_text ($text);
1631	$self->update;	1681
1632	$self->check_size;	1682	$self->realloc;
1633	}	1683	}
1634		1684
1635	sub get_text {	1685	sub get_text {
1636	$_[0]{text}	1686	$_[0]{text}
1637	}	1687	}
…		…
1667	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1668	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1669	$self->_emit ('escape');	1719	$self->_emit ('escape');
1670	} elsif ($uni) {	1720	} elsif ($uni) {
1671	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1672	}	1724	}
1673		1725
1674	$self->_set_text ($text);	1726	$self->_set_text ($text);
1675	$self->update;	1727
1676	$self->check_size;	1728	$self->realloc;
		1729
		1730	1
1677	}	1731	}
1678		1732
1679	sub focus_in {	1733	sub focus_in {
1680	my ($self) = @_;	1734	my ($self) = @_;
1681		1735
…		…
1696	utf8::encode $text;	1750	utf8::encode $text;
1697	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1698		1752
1699	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1700	$self->update;	1754	$self->update;
		1755
		1756	1
1701	}	1757	}
1702		1758
1703	sub mouse_motion {	1759	sub mouse_motion {
1704	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1705	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1761	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1762
		1763	0
1706	}	1764	}
1707		1765
1708	sub _draw {	1766	sub _draw {
1709	my ($self) = @_;	1767	my ($self) = @_;
1710		1768
…		…
1787	} else {	1845	} else {
1788	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1789	}	1847	}
1790		1848
1791	} else {	1849	} else {
1792	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1793	}	1853	1
1794
1795	}	1854	}
1796		1855
1797	#############################################################################	1856	#############################################################################
1798		1857
1799	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1808		1867
1809	sub new {	1868	sub new {
1810	my $class = shift;	1869	my $class = shift;
1811		1870
1812	$class->SUPER::new (	1871	$class->SUPER::new (
1813	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1814	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1815	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1816	can_hover => 1,	1876	can_hover => 1,
1817	align => 0,	1877	align => 0,
1818	valign => 0,	1878	valign => 0,
…		…
1827	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1828		1888
1829	$self->emit ("activate")	1889	$self->emit ("activate")
1830	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1831	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1832	}	1894	}
1833		1895
1834	sub _draw {	1896	sub _draw {
1835	my ($self) = @_;	1897	my ($self) = @_;
1836		1898
…		…
1865		1927
1866	sub new {	1928	sub new {
1867	my $class = shift;	1929	my $class = shift;
1868		1930
1869	$class->SUPER::new (	1931	$class->SUPER::new (
1870	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1871	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1872	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1873	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1874	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1875	state => 0,	1938	state => 0,
…		…
1879	}	1942	}
1880		1943
1881	sub size_request {	1944	sub size_request {
1882	my ($self) = @_;	1945	my ($self) = @_;
1883		1946
1884	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1885	}	1948	}
1886		1949
1887	sub button_down {	1950	sub button_down {
1888	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1889		1952
1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1893	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1894	}	1961	1
1895	}	1962	}
1896		1963
1897	sub _draw {	1964	sub _draw {
1898	my ($self) = @_;	1965	my ($self) = @_;
1899		1966
1900	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1901		1968
1902	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903		1970
1904	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1971	my ($w, $h) = @$self{qw(w h)};
		1972
		1973	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905		1974
1906	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907		1976
1908	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1909		1978
…		…
2174	fg => [1, 1, 1],	2243	fg => [1, 1, 1],
2175	active_fg => [0, 0, 0],	2244	active_fg => [0, 0, 0],
2176	bg => [0, 0, 0, 0.2],	2245	bg => [0, 0, 0, 0.2],
2177	active_bg => [1, 1, 1, 0.5],	2246	active_bg => [1, 1, 1, 0.5],
2178	range => [0, 0, 100, 10, 0],	2247	range => [0, 0, 100, 10, 0],
2179	req_w => $::WIDTH / 80,	2248	min_w => $::WIDTH / 80,
2180	req_h => $::WIDTH / 80,	2249	min_h => $::WIDTH / 80,
2181	vertical => 0,	2250	vertical => 0,
2182	can_hover => 1,	2251	can_hover => 1,
2183	inner_pad => 0.02,	2252	inner_pad => 0.02,
2184	@_	2253	@_
2185	);	2254	);
…		…
2188	$self->update;	2257	$self->update;
2189		2258
2190	$self	2259	$self
2191	}	2260	}
2192		2261
		2262	sub changed { }
		2263
2193	sub set_range {	2264	sub set_range {
2194	my ($self, $range) = @_;	2265	my ($self, $range) = @_;
2195		2266
2196	($range, $self->{range}) = ($self->{range}, $range);	2267	($range, $self->{range}) = ($self->{range}, $range);
2197		2268
…		…
2223	}	2294	}
2224		2295
2225	sub size_request {	2296	sub size_request {
2226	my ($self) = @_;	2297	my ($self) = @_;
2227		2298
2228	my $w = $self->{req_w};	2299	($self->{req_w}, $self->{req_h})
2229	my $h = $self->{req_h};
2230
2231	$self->{vertical} ? ($h, $w) : ($w, $h)
2232	}	2300	}
2233		2301
2234	sub button_down {	2302	sub button_down {
2235	my ($self, $ev, $x, $y) = @_;	2303	my ($self, $ev, $x, $y) = @_;
2236		2304
2237	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2238		2306
2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240		2308
2241	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2242	}	2310	}
2243		2311
2244	sub mouse_motion {	2312	sub mouse_motion {
2245	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2246		2314
…		…
2250	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2251		2319
2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253		2321
2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2322	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2323	} else {
		2324	return 0;
		2325	}
		2326
2255	}	2327	1
2256	}	2328	}
2257		2329
2258	sub update {	2330	sub update {
2259	my ($self) = @_;	2331	my ($self) = @_;
2260		2332
…		…
2592	state => 0,	2664	state => 0,
2593	on_activate => \&toggle_flopper,	2665	on_activate => \&toggle_flopper,
2594	@_	2666	@_
2595	);	2667	);
2596		2668
2597	if ($self->{state}) {
2598	$self->{state} = 0;
2599	$self->toggle_flopper;
2600	}
2601
2602	$self	2669	$self
2603	}	2670	}
2604		2671
2605	sub toggle_flopper {	2672	sub toggle_flopper {
2606	my ($self) = @_;	2673	my ($self) = @_;
2607		2674
2608	# TODO: use animation	2675	$self->{other}->toggle_visibility;
2609	if ($self->{state} = !$self->{state}) {
2610	$CFClient::UI::ROOT->add ($self->{other});
2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2612	$self->_emit ("open");
2613	} else {
2614	$CFClient::UI::ROOT->remove ($self->{other});
2615	$self->_emit ("close");
2616	}
2617
2618	$self->_emit (changed => $self->{state});
2619	}	2676	}
2620		2677
2621	#############################################################################	2678	#############################################################################
2622		2679
2623	package CFClient::UI::Tooltip;	2680	package CFClient::UI::Tooltip;
…		…
2636	}	2693	}
2637		2694
2638	sub set_tooltip_from {	2695	sub set_tooltip_from {
2639	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2640		2697
		2698	my $tooltip = $widget->{tooltip};
		2699
		2700	if ($ENV{CFPLUS_DEBUG} & 2) {
		2701	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2702	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2703	. "req $widget->{req_w} $widget->{req_h}\n"
		2704	. "visible $widget->{visible}";
		2705	}
		2706
2641	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2642	markup => $widget->{tooltip},	2708	markup => $tooltip,
2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644	fontsize => 0.8,	2710	fontsize => 0.8,
2645	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2646	ellipsise => 0,	2712	ellipsise => 0,
2647	font => ($widget->{tooltip_font} || $::FONT_PROP),	2713	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2658		2724
2659	sub size_allocate {	2725	sub size_allocate {
2660	my ($self, $w, $h) = @_;	2726	my ($self, $w, $h) = @_;
2661		2727
2662	$self->SUPER::size_allocate ($w - 4, $h - 4);	2728	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2729	}
		2730
		2731	sub visibility_change {
		2732	my ($self, $visible) = @_;
		2733
		2734	return unless $visible;
		2735
		2736	$self->{root}->on_post_alloc ("move_$self" => sub {
		2737	my $widget = $self->{owner}
		2738	or return;
		2739
		2740	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2741
		2742	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2743	if $x + $self->{w} > $::WIDTH;
		2744
		2745	$self->move_abs ($x, $y);
		2746	});
2663	}	2747	}
2664		2748
2665	sub _draw {	2749	sub _draw {
2666	my ($self) = @_;	2750	my ($self) = @_;
2667		2751
…		…
2684	glVertex $w, $h;	2768	glVertex $w, $h;
2685	glVertex $w, 0;	2769	glVertex $w, 0;
2686	glEnd;	2770	glEnd;
2687		2771
2688	glTranslate 2 - 0.375, 2 - 0.375;	2772	glTranslate 2 - 0.375, 2 - 0.375;
		2773
2689	$self->SUPER::_draw;	2774	$self->SUPER::_draw;
2690	}	2775	}
2691		2776
2692	#############################################################################	2777	#############################################################################
2693		2778
…		…
2769	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2770	}	2855	}
2771		2856
2772	#############################################################################	2857	#############################################################################
2773		2858
2774	package CFClient::UI::Inventory;
2775
2776	our @ISA = CFClient::UI::ScrolledWindow::;
2777
2778	sub new {
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813
2814	sub size_request {
2815	my ($self) = @_;
2816	($self->{req_w}, $self->{req_h});
2817	}
2818
2819	#############################################################################
2820
2821	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2822		2860
2823	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2824		2862
2825	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2863	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2864	$GRAB = $self;	2902	$GRAB = $self;
2865	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2866		2904
2867	$self->show;	2905	$self->show;
2868	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2906	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869	}	2907	}
2870		2908
2871	sub mouse_motion {	2909	sub mouse_motion {
2872	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2873		2911
2874	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2875	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2877	}	2917	}
2878		2918
2879	sub button_up {	2919	sub button_up {
2880	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2881		2921
…		…
2883	undef $GRAB;	2923	undef $GRAB;
2884	$self->hide;	2924	$self->hide;
2885		2925
2886	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2887	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2888	}	2932	1
2889	}	2933	}
2890		2934
2891	#############################################################################	2935	#############################################################################
2892		2936
2893	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2998	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
2999	}	3043	}
3000		3044
3001	#############################################################################	3045	#############################################################################
3002		3046
3003	package CFClient::UI::Root;	3047	package CFClient::UI::Inventory;
3004		3048
3005	our @ISA = CFClient::UI::Container::;	3049	our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007	use CFClient::OpenGL;
3008		3050
3009	sub new {	3051	sub new {
3010	my $class = shift;	3052	my $class = shift;
3011		3053
3012	$class->SUPER::new (	3054	my $self = $class->SUPER::new (
		3055	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3056	@_,
		3057	);
		3058
		3059	$self
		3060	}
		3061
		3062	sub set_items {
		3063	my ($self, $items) = @_;
		3064
		3065	$self->{scrolled}->clear;
		3066	return unless $items;
		3067
		3068	my @items = sort {
		3069	($a->{type} <=> $b->{type})
		3070	or ($a->{name} cmp $b->{name})
		3071	} @$items;
		3072
		3073	$self->{real_items} = \@items;
		3074
		3075	my $row = 0;
		3076	for my $item (@items) {
		3077	CFClient::Item::update_widgets $item;
		3078
		3079	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3080	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3081	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3082
		3083	$row++;
		3084	}
		3085	}
		3086
		3087	#############################################################################
		3088
		3089	package CFClient::UI::BindEditor;
		3090
		3091	our @ISA = CFClient::UI::FancyFrame::;
		3092
		3093	sub new {
		3094	my $class = shift;
		3095
		3096	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3097
		3098	$self->add (my $vb = new CFClient::UI::VBox);
		3099
		3100
		3101	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3102	text => "start recording",
		3103	tooltip => "Start/Stops recording of actions."
		3104	."All subsequent actions after the recording started will be captured."
		3105	."The actions are displayed after the record was stopped."
		3106	."To bind the action you have to click on the 'Bind' button",
		3107	on_activate => sub {
		3108	unless ($self->{recording}) {
		3109	$self->start;
		3110	} else {
		3111	$self->stop;
		3112	}
		3113	});
		3114
		3115	$vb->add (new CFClient::UI::Label text => "Actions:");
		3116	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3117
		3118	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3119	$vb->add (my $hb = new CFClient::UI::HBox);
		3120	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3121	$hb->add (new CFClient::UI::Button
		3122	text => "bind",
		3123	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3124	on_activate => sub {
		3125	$self->ask_for_bind;
		3126	});
		3127
		3128	$vb->add (my $hb = new CFClient::UI::HBox);
		3129	$hb->add (new CFClient::UI::Button
		3130	text => "ok",
		3131	expand => 1,
		3132	tooltip => "This closes the binding editor and saves the binding",
		3133	on_activate => sub {
		3134	$self->hide;
		3135	$self->commit;
		3136	});
		3137
		3138	$hb->add (new CFClient::UI::Button
		3139	text => "cancel",
		3140	expand => 1,
		3141	tooltip => "This closes the binding editor without saving",
		3142	on_activate => sub {
		3143	$self->hide;
		3144	$self->{binding_cancel}->()
		3145	if $self->{binding_cancel};
		3146	});
		3147
		3148	$self->update_binding_widgets;
		3149
		3150	$self
		3151	}
		3152
		3153	sub commit {
		3154	my ($self) = @_;
		3155	my ($mod, $sym, $cmds) = $self->get_binding;
		3156	if ($sym != 0 && @$cmds > 0) {
		3157	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3158	."'. Don't forget 'Save Config'!");
		3159	$self->{binding_change}->($mod, $sym, $cmds)
		3160	if $self->{binding_change};
		3161	} else {
		3162	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3163	$self->{binding_cancel}->()
		3164	if $self->{binding_cancel};
		3165	}
		3166	}
		3167
		3168	sub start {
		3169	my ($self) = @_;
		3170
		3171	$self->{rec_btn}->set_text ("stop recording");
		3172	$self->{recording} = 1;
		3173	$self->clear_command_list;
		3174	$::CONN->start_record if $::CONN;
		3175	}
		3176
		3177	sub stop {
		3178	my ($self) = @_;
		3179
		3180	$self->{rec_btn}->set_text ("start recording");
		3181	$self->{recording} = 0;
		3182
		3183	my $rec;
		3184	$rec = $::CONN->stop_record if $::CONN;
		3185	return unless ref $rec eq 'ARRAY';
		3186	$self->set_command_list ($rec);
		3187	}
		3188
		3189
		3190	sub ask_for_bind_and_commit {
		3191	my ($self) = @_;
		3192	$self->ask_for_bind (1);
		3193	}
		3194
		3195	sub ask_for_bind {
		3196	my ($self, $commit) = @_;
		3197
		3198	CFClient::Binder::open_binding_dialog (sub {
		3199	my ($mod, $sym) = @_;
		3200	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3201	$self->update_binding_widgets;
		3202	$self->commit if $commit;
		3203	});
		3204	}
		3205
		3206	# $mod and $sym are the modifiers and key symbol
		3207	# $cmds is a array ref of strings (the commands)
		3208	# $cb is the callback that is executed on OK
		3209	# $ccb is the callback that is executed on CANCEL and
		3210	# when the binding was unsuccessful on OK
		3211	sub set_binding {
		3212	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3213
		3214	$self->clear_command_list;
		3215	$self->{recording} = 0;
		3216	$self->{rec_btn}->set_text ("start recording");
		3217
		3218	$self->{binding} = [$mod, $sym];
		3219	$self->{commands} = $cmds;
		3220
		3221	$self->{binding_change} = $cb;
		3222	$self->{binding_cancel} = $ccb;
		3223
		3224	$self->update_binding_widgets;
		3225	}
		3226
		3227	# this is a shortcut method that asks for a binding
		3228	# and then just binds it.
		3229	sub do_quick_binding {
		3230	my ($self, $cmds) = @_;
		3231	$self->set_binding (undef, undef, $cmds, sub {
		3232	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3233	});
		3234	$self->ask_for_bind (1);
		3235	}
		3236
		3237	sub update_binding_widgets {
		3238	my ($self) = @_;
		3239	my ($mod, $sym, $cmds) = $self->get_binding;
		3240	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3241	$self->set_command_list ($cmds);
		3242	}
		3243
		3244	sub get_binding {
		3245	my ($self) = @_;
		3246	return (
		3247	$self->{binding}->[0],
		3248	$self->{binding}->[1],
		3249	[ grep { defined $_ } @{$self->{commands}} ]
		3250	);
		3251	}
		3252
		3253	sub clear_command_list {
		3254	my ($self) = @_;
		3255	$self->{cmdbox}->clear ();
		3256	}
		3257
		3258	sub set_command_list {
		3259	my ($self, $cmds) = @_;
		3260
		3261	$self->{cmdbox}->clear ();
		3262	$self->{commands} = $cmds;
		3263
		3264	my $idx = 0;
		3265
		3266	for (@$cmds) {
		3267	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3268
		3269	my $i = $idx;
		3270	$hb->add (new CFClient::UI::Label text => $_);
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "delete",
		3273	tooltip => "Deletes the action from the record",
		3274	on_activate => sub {
		3275	$self->{cmdbox}->remove ($hb);
		3276	$cmds->[$i] = undef;
		3277	});
		3278
		3279
		3280	$idx++
		3281	}
		3282	}
		3283
		3284	#############################################################################
		3285
		3286	package CFClient::UI::SpellList;
		3287
		3288	our @ISA = CFClient::UI::FancyFrame::;
		3289
		3290	sub new {
		3291	my $class = shift;
		3292
		3293	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3294
		3295	$self->add (new CFClient::UI::ScrolledWindow
		3296	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3297
		3298	$self;
		3299	}
		3300
		3301	# XXX: Do sorting? Argl...
		3302	sub add_spell {
		3303	my ($self, $spell) = @_;
		3304	$self->{spells}->{$spell->{name}} = $spell;
		3305
		3306	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3307	face => $spell->{face},
		3308	can_hover => 1,
		3309	can_events => 1,
		3310	tooltip => $spell->{message});
		3311
		3312	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3313	text => $spell->{name},
		3314	can_hover => 1,
		3315	can_events => 1,
		3316	tooltip => $spell->{message},
		3317	expand => 1);
		3318
		3319	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3320	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3321	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3322	expand => 1);
		3323
		3324	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3325	text => "bind to key",
		3326	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3327	}
		3328
		3329	sub rebuild_spell_list {
		3330	my ($self) = @_;
		3331	$self->{tbl_idx} = 0;
		3332	$self->add_spell ($_) for values %{$self->{spells}};
		3333	}
		3334
		3335	sub remove_spell {
		3336	my ($self, $spell) = @_;
		3337	delete $self->{spells}->{$spell->{name}};
		3338	$self->rebuild_spell_list;
		3339	}
		3340
		3341	#############################################################################
		3342
		3343	package CFClient::UI::Root;
		3344
		3345	our @ISA = CFClient::UI::Container::;
		3346
		3347	use CFClient::OpenGL;
		3348
		3349	sub new {
		3350	my $class = shift;
		3351
		3352	my $self = $class->SUPER::new (
3013	visible => 1,	3353	visible => 1,
3014	@_,	3354	@_,
3015	)	3355	);
3016	}
3017		3356
3018	sub configure {	3357	Scalar::Util::weaken ($self->{root} = $self);
3019	my ($self, $x, $y, $w, $h) = @_;
3020		3358
3021	$self->{w} = $w;	3359	$self
3022	$self->{h} = $h;
3023	}
3024
3025	sub check_size {
3026	my ($self) = @_;
3027
3028	$self->size_allocate ($self->{w}, $self->{h})
3029	if $self->{w};
3030	}	3360	}
3031		3361
3032	sub size_request {	3362	sub size_request {
3033	my ($self) = @_;	3363	my ($self) = @_;
3034		3364
3035	($self->{w}, $self->{h})	3365	($self->{w}, $self->{h})
		3366	}
		3367
		3368	sub _to_pixel {
		3369	my ($coord, $size, $max) = @_;
		3370
		3371	$coord =
		3372	$coord eq "center" ? ($max - $size) * 0.5
		3373	: $coord eq "max" ? $max
		3374	: $coord;
		3375
		3376	$coord = 0 if $coord < 0;
		3377	$coord = $max - $size if $coord > $max - $size;
		3378
		3379	int $coord + 0.5
3036	}	3380	}
3037		3381
3038	sub size_allocate {	3382	sub size_allocate {
3039	my ($self, $w, $h) = @_;	3383	my ($self, $w, $h) = @_;
3040		3384
3041	for my $child ($self->children) {	3385	for my $child ($self->children) {
3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3386	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043		3387
3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3388	$X = $child->{force_x} if exists $child->{force_x};
3045	if exists $child->{req_x};	3389	$Y = $child->{force_y} if exists $child->{force_y};
3046		3390
3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3391	$X = _to_pixel $X, $W, $self->{w};
3048	if exists $child->{req_y};	3392	$Y = _to_pixel $Y, $H, $self->{h};
3049
3050	$X = $self->{user_x} if exists $self->{user_x};
3051	$Y = $self->{user_y} if exists $self->{user_y};
3052
3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055		3393
3056	$child->configure ($X, $Y, $W, $H);	3394	$child->configure ($X, $Y, $W, $H);
3057	}	3395	}
3058	}	3396	}
3059		3397
…		…
3070	}	3408	}
3071		3409
3072	sub update {	3410	sub update {
3073	my ($self) = @_;	3411	my ($self) = @_;
3074		3412
3075	$self->check_size;
3076	$::WANT_REFRESH++;	3413	$::WANT_REFRESH++;
3077	}	3414	}
3078		3415
3079	sub add {	3416	sub add {
3080	my ($self, @children) = @_;	3417	my ($self, @children) = @_;
3081		3418
3082	for (my @widgets = @children; my $w = pop @widgets; ) {
3083	push @widgets, $w->children;
3084	$w->{root} = $self;
3085	$w->{visible} = $self->{visible} + 1;
3086	}
3087
3088	for my $child (@children) {
3089	$child->{is_toplevel} = 1;	3419	$_->{is_toplevel} = 1
3090		3420	for @children;
3091	# integerise window positions
3092	$child->{x} = int $child->{x};
3093	$child->{y} = int $child->{y};
3094	}
3095		3421
3096	$self->SUPER::add (@children);	3422	$self->SUPER::add (@children);
3097	}	3423	}
3098		3424
3099	sub remove {	3425	sub remove {
3100	my ($self, @children) = @_;	3426	my ($self, @children) = @_;
3101		3427
3102	$self->SUPER::remove (@children);	3428	$self->SUPER::remove (@children);
		3429
		3430	delete $self->{is_toplevel}
		3431	for @children;
3103		3432
3104	while (@children) {	3433	while (@children) {
3105	my $w = pop @children;	3434	my $w = pop @children;
3106	push @children, $w->children;	3435	push @children, $w->children;
3107	$w->set_invisible;	3436	$w->set_invisible;
…		…
3126	while ($self->{refresh_hook}) {	3455	while ($self->{refresh_hook}) {
3127	$_->()	3456	$_->()
3128	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3129	}	3458	}
3130		3459
3131	if ($self->{check_size}) {	3460	if ($self->{realloc}) {
		3461	my %queue;
3132	my @queue;	3462	my @queue;
		3463	my $widget;
3133		3464
3134	for (;;) {	3465	outer:
3135	if ($self->{check_size}) {	3466	while () {
3136	#TODO use array-of-depth approach	3467	if (my $realloc = delete $self->{realloc}) {
		3468	for $widget (values %$realloc) {
		3469	$widget->{visible} or next; # do not resize invisible widgets
3137		3470
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3471	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{check_size}};	3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3140	}	3475	}
3141		3476
		3477	while () {
		3478	@queue or last outer;
		3479
3142	my $widget = pop @queue || last;	3480	$widget = pop @{ $queue[-1] || [] }
3143		3481	and last;
3144	defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147	? @$widget{qw(user_w user_h)}
3148	: $widget->size_request;
3149
3150	if (delete $widget->{force_alloc}
3151	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153		3482
		3483	pop @queue;
		3484	}
		3485
		3486	delete $queue{$widget+0};
		3487
		3488	my ($w, $h) = $widget->size_request;
		3489
		3490	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3491	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3492
		3493	$w = $widget->{force_w} if exists $widget->{force_w};
		3494	$h = $widget->{force_h} if exists $widget->{force_h};
		3495
		3496	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3497	|| delete $widget->{force_realloc}) {
3154	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3155	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3156		3500
3157	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3501	$self->{size_alloc}{$widget+0} = $widget;
3158		3502
3159	$widget->{parent}->check_size
3160	if $widget->{parent};	3503	if (my $parent = $widget->{parent}) {
		3504	$self->{realloc}{$parent+0} = $parent
		3505	unless $queue{$parent+0};
		3506
		3507	$parent->{force_size_alloc} = 1;
		3508	$self->{size_alloc}{$parent+0} = $parent;
		3509	}
3161	}	3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3162	}	3513	}
3163	}	3514	}
3164		3515
3165	while ($self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3166	for (values %{delete $self->{size_alloc}}) {	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3167	my ($widget, $w, $h) = @$_;	3518	values %$size_alloc;
		3519
		3520	while () {
		3521	my $widget = pop @queue || last;
		3522
		3523	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168		3524
3169	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3170	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3171		3527
		3528	$w = int $w + 0.5;
		3529	$h = int $h + 0.5;
		3530
		3531	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3532	$widget->{old_w} = $widget->{w};
		3533	$widget->{old_h} = $widget->{h};
		3534
3172	$widget->{w} = $w;	3535	$widget->{w} = $w;
3173	$widget->{h} = $h;	3536	$widget->{h} = $h;
		3537
3174	$widget->emit (size_allocate => $w, $h);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3175	}	3540	}
3176	}	3541	}
3177		3542
3178	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3179	$_->()	3544	$_->()
3180	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3181	}	3546	}
		3547
3182		3548
3183	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3186		3552
…		…
3188	glLoadIdentity;	3554	glLoadIdentity;
3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3191	glLoadIdentity;	3557	glLoadIdentity;
3192		3558
		3559	{
		3560	package CFClient::UI::Base;
		3561
		3562	($draw_x, $draw_y, $draw_w, $draw_h) =
		3563	(0, 0, $self->{w}, $self->{h});
		3564	}
		3565
3193	$self->_draw;	3566	$self->_draw;
3194	}	3567	}
3195		3568
3196	#############################################################################	3569	#############################################################################
3197		3570

Diff Legend

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