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.243 by root, Sat May 27 20:46:54 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	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$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;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$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;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	373	}
341		374
342	sub children {	375	sub children {
343	}	376	}
344		377
…		…
406		439
407	$::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
408	unless $FOCUS;	441	unless $FOCUS;
409	}	442	}
410		443
411	sub mouse_motion { }	444	sub mouse_motion { 0 }
412	sub button_up { }	445	sub button_up { 0 }
413	sub key_down { }	446	sub key_down { 0 }
414	sub key_up { }	447	sub key_up { 0 }
415		448
416	sub button_down {	449	sub button_down {
417	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
418		451
419	$self->focus_in;	452	$self->focus_in;
420	}
421		453
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub find_widget {
426	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
427		530
428	sub draw {	531	sub draw {
429	my ($self) = @_;	532	my ($self) = @_;
430		533
431	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);
432		545
433	glPushMatrix;	546	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	548	$self->_draw;
436	glPopMatrix;	549	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
449	glEnd;	562	glEnd;
450	glDisable GL_BLEND;	563	glDisable GL_BLEND;
451	}	564	}
452		565
453	if ($ENV{PCLIENT_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	567	glPushMatrix;
455	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	571	glVertex 0 , 0;
…		…
469	my ($self) = @_;	582	my ($self) = @_;
470		583
471	warn "no draw defined for $self\n";	584	warn "no draw defined for $self\n";
472	}	585	}
473		586
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	587	sub DESTROY {
535	my ($self) = @_;	588	my ($self) = @_;
536		589
537	delete $WIDGET{$self+0};	590	delete $WIDGET{$self+0};
538	#$self->deactivate;	591	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	647	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	648	$class->SUPER::new (can_events => 0, %arg);
596	}	649	}
597		650
598	sub size_request {	651	sub size_request {
599	(0, 0)	652	my ($self) = @_;
		653
		654	($self->{w} + 0, $self->{h} + 0)
600	}	655	}
601		656
602	sub draw { }	657	sub draw { }
603		658
604	#############################################################################	659	#############################################################################
…		…
633	$self->{children} = [	688	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	689	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	690	@{$self->{children}}, @widgets
636	];	691	];
637		692
638	$self->check_size (1);	693	$self->realloc;
639	$self->update;
640	}	694	}
641		695
642	sub children {	696	sub children {
643	@{ $_[0]{children} }	697	@{ $_[0]{children} }
644	}	698	}
…		…
649	delete $child->{parent};	703	delete $child->{parent};
650	$child->hide;	704	$child->hide;
651		705
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	706	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		707
654	$self->check_size (1);	708	$self->realloc;
655	$self->update;
656	}	709	}
657		710
658	sub clear {	711	sub clear {
659	my ($self) = @_;	712	my ($self) = @_;
660		713
…		…
664	for (@$children) {	717	for (@$children) {
665	delete $_->{parent};	718	delete $_->{parent};
666	$_->hide;	719	$_->hide;
667	}	720	}
668		721
669	$self->check_size;	722	$self->realloc;
670	$self->update;
671	}	723	}
672		724
673	sub find_widget {	725	sub find_widget {
674	my ($self, $x, $y) = @_;	726	my ($self, $x, $y) = @_;
675		727
…		…
762	$self->SUPER::size_allocate ($w, $h);	814	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	815	$self->update;
764	}	816	}
765		817
766	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
767	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
768	}	822	}
769		823
770	sub render_child {	824	sub render_child {
771	my ($self) = @_;	825	my ($self) = @_;
772		826
773	$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 {
774	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
776		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
777	$self->_render;	838	$self->_render;
778	};	839	};
779	}	840	}
780		841
781	sub _draw {	842	sub _draw {
782	my ($self) = @_;	843	my ($self) = @_;
783		844
784	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
785		846
786	my $tex = $self->{texture}	847	my $tex = $self->{texture}
787	or return;	848	or return;
788		849
789	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
812	}	873	}
813		874
814	sub size_request {	875	sub size_request {
815	my ($self) = @_;	876	my ($self) = @_;
816		877
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		879
819	@$self{qw(child_w child_h)}	880	$w = 10 if $self->{scroll_x};
		881	$h = 10 if $self->{scroll_y};
		882
		883	($w, $h)
820	}	884	}
821		885
822	sub size_allocate {	886	sub size_allocate {
823	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
824		888
		889	my $child = $self->child;
		890
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		893
828	$self->child->configure (0, 0, $w, $h);	894	$self->child->configure (0, 0, $w, $h);
829	$self->update;	895	$self->update;
830	}	896	}
831		897
…		…
866	}	932	}
867	}	933	}
868		934
869	sub _render {	935	sub _render {
870	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};
871		940
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		942
874	$self->SUPER::_render;	943	$self->SUPER::_render;
875	}	944	}
…		…
974		1043
975	our @ISA = CFClient::UI::Bin::;	1044	our @ISA = CFClient::UI::Bin::;
976		1045
977	use CFClient::OpenGL;	1046	use CFClient::OpenGL;
978		1047
979	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 =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	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);
982		1055
983	sub new {	1056	sub new {
984	my $class = shift;	1057	my ($class, %arg) = @_;
985		1058
986	# TODO: user_x, user_y, overwrite moveto?	1059	my $title = delete $arg{title};
987		1060
988	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1064	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1065	can_events => 1,
994	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
995	);	1069	);
996		1070
997	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
998	align => 0,	1072	align => 0,
999	valign => 1,	1073	valign => 1,
1000	text => $self->{title},	1074	text => $title,
1001	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
1002		1077
1003	$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};
1004	}	1086	}
1005		1087
1006	sub border {	1088	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
1008	}	1090	}
1009		1091
1010	sub size_request {	1092	sub size_request {
1011	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
1012		1097
1013	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
1014		1099
1015	(	1100	(
1016	$w + $self->border * 2,	1101	$w + $self->border * 2,
…		…
1019	}	1104	}
1020		1105
1021	sub size_allocate {	1106	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1107	my ($self, $w, $h) = @_;
1023		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
1024	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
1026		1119
1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028	if $self->{title};
1029
1030	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
1031	}	1121	}
1032		1122
1033	sub button_down {	1123	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
1035		1125
…		…
1051	my ($ev, $x, $y) = @_;	1141	my ($ev, $x, $y) = @_;
1052		1142
1053	my $dx = $ev->{x} - $ox;	1143	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1144	my $dy = $ev->{y} - $oy;
1055		1145
1056	$self->{user_x} = $wx + $dx * $mx;
1057	$self->{user_y} = $wy + $dy * $my;
1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060	$self->move ($self->{user_x}, $self->{user_y});	1148
1061	$self->check_size;	1149	$self->realloc;
		1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062	};	1151	};
1063		1152
1064	} elsif ($lr ^ $td) {	1153	} elsif ($lr ^ $td) {
1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066	my ($bx, $by) = ($self->{x}, $self->{y});	1155	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1068	$self->{motion} = sub {	1157	$self->{motion} = sub {
1069	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1070		1159
1071	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1072		1161
1073	$self->{user_x} = $bx + $x - $ox;	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074	$self->{user_y} = $by + $y - $oy;
1075	$self->move ($self->{user_x}, $self->{user_y});
1076	$self->update;
1077	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1078	}	1168	1
1079	}	1169	}
1080		1170
1081	sub button_up {	1171	sub button_up {
1082	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1083		1173
1084	delete $self->{motion};	1174	!!delete $self->{motion}
1085	}	1175	}
1086		1176
1087	sub mouse_motion {	1177	sub mouse_motion {
1088	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1089		1179
1090	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1091	}	1183	}
1092		1184
1093	sub _draw {	1185	sub _draw {
1094	my ($self) = @_;	1186	my ($self) = @_;
1095		1187
		1188	my $child = $self->{children}[0];
		1189
1096	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1097	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1098		1192
1099	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1195
1102	my $border = $self->border;	1196	my $border = $self->border;
1103		1197
1104	glColor @{ $self->{border_bg} };	1198	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1199	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1200	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1201	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1202	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1203
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1204	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1205	glColor @{ $self->{bg} };
1112		1206
1113	# TODO: repeat texture not scale	1207	# TODO: repeat texture not scale
		1208	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1209	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1210	$bg->{t} = $ch / $bg->{h};
1116
1117	glColor @{ $self->{bg} };
1118
1119	$bg->{s} = $rep_x;
1120	$bg->{t} = $rep_y;
1121	$bg->{wrap_mode} = 1;
1122	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1212	}
1124		1213
1125	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1126		1215
1127	$self->{title}->draw if $self->{title};
1128
1129	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1130	}	1222	}
1131		1223
1132	#############################################################################	1224	#############################################################################
1133		1225
1134	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1156	my ($self, $x, $y, $child) = @_;	1248	my ($self, $x, $y, $child) = @_;
1157		1249
1158	$child->set_parent ($self);	1250	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1251	$self->{children}[$y][$x] = $child;
1160		1252
1161	$self->check_size (1);	1253	$self->realloc;
1162	}	1254	}
1163		1255
1164	# 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?
1165	sub clear {	1257	sub clear {
1166	my ($self) = @_;	1258	my ($self) = @_;
…		…
1171	for (@children) {	1263	for (@children) {
1172	delete $_->{parent};	1264	delete $_->{parent};
1173	$_->hide;	1265	$_->hide;
1174	}	1266	}
1175		1267
1176	$self->check_size (1);	1268	$self->realloc;
1177	$self->update;
1178	}	1269	}
1179		1270
1180	sub get_wh {	1271	sub get_wh {
1181	my ($self) = @_;	1272	my ($self) = @_;
1182		1273
…		…
1278	}	1369	}
1279	}	1370	}
1280		1371
1281	#############################################################################	1372	#############################################################################
1282		1373
1283	package CFClient::UI::HBox;	1374	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1375
1287	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Container::;
1288		1377
1289	sub size_request {	1378	sub size_request {
1290	my ($self) = @_;	1379	my ($self) = @_;
1291		1380
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$self->{vertical}
1293		1382	? (
1294	(	1383	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1384	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1385	)
1297	)	1386	: (
		1387	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1388	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1389	)
1298	}	1390	}
1299		1391
1300	sub size_allocate {	1392	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1393	my ($self, $w, $h) = @_;
1302		1394
1303	($h, $w) = ($w, $h);	1395	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1396	my $children = $self->{children};
1306		1397
1307	my @h = map $_->{req_w}, @$children;	1398	my @req;
1308		1399
1309	my $req_h = List::Util::sum @h;	1400	if ($self->{homogeneous}) {
1310		1401	@req = ($space / (@$children || 1)) x @$children;
1311	if ($req_h > $h) {
1312	# ah well, not enough space
1313	$_ *= $h / $req_h for @h;
1314	} 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 {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1410	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1411
		1412	$space = ($space - $req) / $expand; # remaining space to give away
		1413
		1414	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1415	for 0 .. $#$children;
1319	my $child = $children->[$_];
1320
1321	my $alloc_h = $h[$_];
1322	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323	$h[$_] = $alloc_h;
1324	}	1416	}
1325	}	1417	}
1326		1418
1327	CFClient::UI::harmonize \@h;	1419	CFClient::UI::harmonize \@req;
1328		1420
1329	my $y = 0;	1421	my $pos = 0;
1330	for (0 .. $#$children) {	1422	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1423	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1424	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1425
1335	$y += $h;	1426	$pos += $alloc;
1336	}	1427	}
1337		1428
1338	1	1429	1
1339	}	1430	}
1340		1431
1341	#############################################################################	1432	#############################################################################
1342		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
1343	package CFClient::UI::VBox;	1449	package CFClient::UI::VBox;
1344		1450
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1451	our @ISA = CFClient::UI::Box::;
1348		1452
1349	sub size_request {	1453	sub new {
1350	my ($self) = @_;	1454	my $class = shift;
1351		1455
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1456	$class->SUPER::new (
1353		1457	vertical => 1,
1354	(	1458	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1459	)
1358	}
1359
1360	sub size_allocate {
1361	my ($self, $w, $h) = @_;
1362
1363	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365	my $children = $self->{children};
1366
1367	my @h = map $_->{req_h}, @$children;
1368
1369	my $req_h = List::Util::sum @h;
1370
1371	if ($req_h > $h) {
1372	# ah well, not enough space
1373	$_ *= $h / $req_h for @h;
1374	} else {
1375	my $exp = List::Util::sum map $_->{expand}, @$children;
1376	$exp ||= 1;
1377
1378	for (0 .. $#$children) {
1379	my $child = $children->[$_];
1380
1381	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382	}
1383	}
1384
1385	CFClient::UI::harmonize \@h;
1386
1387	my $y = 0;
1388	for (0 .. $#$children) {
1389	my $child = $children->[$_];
1390	my $h = $h[$_];
1391	$child->configure (0, $y, $w, $h);
1392
1393	$y += $h;
1394	}
1395
1396	1
1397	}	1460	}
1398		1461
1399	#############################################################################	1462	#############################################################################
1400		1463
1401	package CFClient::UI::Label;	1464	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1481	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1420	fontsize => 1,	1483	fontsize => 1,
1421	align => -1,	1484	align => -1,
1422	valign => -1,	1485	valign => -1,
1423	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1424	can_events => 0,	1488	can_events => 0,
1425	%arg	1489	%arg
1426	);	1490	);
1427		1491
1428	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1528	$self->{text} = "T$text";
1465		1529
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1531	$self->{layout}->set_text ($text);
1468		1532
		1533	$self->realloc;
1469	$self->update;	1534	$self->update;
1470	$self->check_size;
1471	}	1535	}
1472		1536
1473	sub set_markup {	1537	sub set_markup {
1474	my ($self, $markup) = @_;	1538	my ($self, $markup) = @_;
1475		1539
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1543	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1544
1481	$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;
1482	$self->{layout}->set_markup ($markup);	1546	$self->{layout}->set_markup ($markup);
1483		1547
		1548	$self->realloc;
1484	$self->update;	1549	$self->update;
1485	$self->check_size;
1486	}	1550	}
1487		1551
1488	sub size_request {	1552	sub size_request {
1489	my ($self) = @_;	1553	my ($self) = @_;
1490		1554
…		…
1504		1568
1505	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1507	}	1571	}
1508		1572
1509	(	1573	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1574	}
1514		1575
1515	sub size_allocate {	1576	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1577	my ($self, $w, $h) = @_;
1517		1578
		1579	delete $self->{ox};
		1580
1518	delete $self->{texture};	1581	delete $self->{texture}
		1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519	}	1583	}
1520		1584
1521	sub set_fontsize {	1585	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1523		1587
1524	$self->{fontsize} = $fontsize;	1588	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1589	delete $self->{texture};
1526		1590
1527	$self->update;	1591	$self->realloc;
1528	$self->check_size;
1529	}	1592	}
1530		1593
1531	sub _draw {	1594	sub _draw {
1532	my ($self) = @_;	1595	my ($self) = @_;
1533		1596
…		…
1539	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1540	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1606
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1545		1609
		1610	unless (exists $self->{ox}) {
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1549		1614
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1553
1554	$tex
1555	};	1618	};
1556		1619
1557	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1558	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559		1622
…		…
1613	sub set_text {	1676	sub set_text {
1614	my ($self, $text) = @_;	1677	my ($self, $text) = @_;
1615		1678
1616	$self->{cursor} = length $text;	1679	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1680	$self->_set_text ($text);
1618	$self->update;	1681
1619	$self->check_size;	1682	$self->realloc;
1620	}	1683	}
1621		1684
1622	sub get_text {	1685	sub get_text {
1623	$_[0]{text}	1686	$_[0]{text}
1624	}	1687	}
…		…
1654	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1655	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1656	$self->_emit ('escape');	1719	$self->_emit ('escape');
1657	} elsif ($uni) {	1720	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1659	}	1724	}
1660		1725
1661	$self->_set_text ($text);	1726	$self->_set_text ($text);
1662	$self->update;	1727
1663	$self->check_size;	1728	$self->realloc;
		1729
		1730	1
1664	}	1731	}
1665		1732
1666	sub focus_in {	1733	sub focus_in {
1667	my ($self) = @_;	1734	my ($self) = @_;
1668		1735
…		…
1683	utf8::encode $text;	1750	utf8::encode $text;
1684	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1685		1752
1686	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1687	$self->update;	1754	$self->update;
		1755
		1756	1
1688	}	1757	}
1689		1758
1690	sub mouse_motion {	1759	sub mouse_motion {
1691	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1692	# 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
1693	}	1764	}
1694		1765
1695	sub _draw {	1766	sub _draw {
1696	my ($self) = @_;	1767	my ($self) = @_;
1697		1768
…		…
1774	} else {	1845	} else {
1775	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1776	}	1847	}
1777		1848
1778	} else {	1849	} else {
1779	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1780	}	1853	1
1781
1782	}	1854	}
1783		1855
1784	#############################################################################	1856	#############################################################################
1785		1857
1786	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1795		1867
1796	sub new {	1868	sub new {
1797	my $class = shift;	1869	my $class = shift;
1798		1870
1799	$class->SUPER::new (	1871	$class->SUPER::new (
1800	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1801	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1803	can_hover => 1,	1876	can_hover => 1,
1804	align => 0,	1877	align => 0,
1805	valign => 0,	1878	valign => 0,
…		…
1814	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1815		1888
1816	$self->emit ("activate")	1889	$self->emit ("activate")
1817	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1818	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1819	}	1894	}
1820		1895
1821	sub _draw {	1896	sub _draw {
1822	my ($self) = @_;	1897	my ($self) = @_;
1823		1898
…		…
1852		1927
1853	sub new {	1928	sub new {
1854	my $class = shift;	1929	my $class = shift;
1855		1930
1856	$class->SUPER::new (	1931	$class->SUPER::new (
1857	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1858	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1938	state => 0,
…		…
1866	}	1942	}
1867		1943
1868	sub size_request {	1944	sub size_request {
1869	my ($self) = @_;	1945	my ($self) = @_;
1870		1946
1871	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1872	}	1948	}
1873		1949
1874	sub button_down {	1950	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1876		1952
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1881	}	1961	1
1882	}	1962	}
1883		1963
1884	sub _draw {	1964	sub _draw {
1885	my ($self) = @_;	1965	my ($self) = @_;
1886		1966
1887	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1888		1968
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1970
1891	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;
1892		1974
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1976
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1978
…		…
2161	fg => [1, 1, 1],	2243	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2244	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2245	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2246	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2247	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2248	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2249	min_h => $::WIDTH / 80,
2168	vertical => 0,	2250	vertical => 0,
2169	can_hover => 1,	2251	can_hover => 1,
2170	inner_pad => 0.02,	2252	inner_pad => 0.02,
2171	@_	2253	@_
2172	);	2254	);
…		…
2175	$self->update;	2257	$self->update;
2176		2258
2177	$self	2259	$self
2178	}	2260	}
2179		2261
		2262	sub changed { }
		2263
2180	sub set_range {	2264	sub set_range {
2181	my ($self, $range) = @_;	2265	my ($self, $range) = @_;
2182		2266
2183	($range, $self->{range}) = ($self->{range}, $range);	2267	($range, $self->{range}) = ($self->{range}, $range);
2184		2268
…		…
2210	}	2294	}
2211		2295
2212	sub size_request {	2296	sub size_request {
2213	my ($self) = @_;	2297	my ($self) = @_;
2214		2298
2215	my $w = $self->{req_w};	2299	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2300	}
2220		2301
2221	sub button_down {	2302	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2303	my ($self, $ev, $x, $y) = @_;
2223		2304
2224	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2225		2306
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2308
2228	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2229	}	2310	}
2230		2311
2231	sub mouse_motion {	2312	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2233		2314
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2319
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2321
2241	$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
2242	}	2327	1
2243	}	2328	}
2244		2329
2245	sub update {	2330	sub update {
2246	my ($self) = @_;	2331	my ($self) = @_;
2247		2332
…		…
2579	state => 0,	2664	state => 0,
2580	on_activate => \&toggle_flopper,	2665	on_activate => \&toggle_flopper,
2581	@_	2666	@_
2582	);	2667	);
2583		2668
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2669	$self
2590	}	2670	}
2591		2671
2592	sub toggle_flopper {	2672	sub toggle_flopper {
2593	my ($self) = @_;	2673	my ($self) = @_;
2594		2674
2595	# TODO: use animation	2675	$self->{other}->toggle_visibility;
2596	if ($self->{state} = !$self->{state}) {
2597	$CFClient::UI::ROOT->add ($self->{other});
2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2599	$self->_emit ("open");
2600	} else {
2601	$CFClient::UI::ROOT->remove ($self->{other});
2602	$self->_emit ("close");
2603	}
2604
2605	$self->_emit (changed => $self->{state});
2606	}	2676	}
2607		2677
2608	#############################################################################	2678	#############################################################################
2609		2679
2610	package CFClient::UI::Tooltip;	2680	package CFClient::UI::Tooltip;
…		…
2623	}	2693	}
2624		2694
2625	sub set_tooltip_from {	2695	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2627		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
2628	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2708	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2710	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2712	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2713	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2724
2646	sub size_allocate {	2725	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2726	my ($self, $w, $h) = @_;
2648		2727
2649	$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	});
2650	}	2747	}
2651		2748
2652	sub _draw {	2749	sub _draw {
2653	my ($self) = @_;	2750	my ($self) = @_;
2654		2751
…		…
2671	glVertex $w, $h;	2768	glVertex $w, $h;
2672	glVertex $w, 0;	2769	glVertex $w, 0;
2673	glEnd;	2770	glEnd;
2674		2771
2675	glTranslate 2 - 0.375, 2 - 0.375;	2772	glTranslate 2 - 0.375, 2 - 0.375;
		2773
2676	$self->SUPER::_draw;	2774	$self->SUPER::_draw;
2677	}	2775	}
2678		2776
2679	#############################################################################	2777	#############################################################################
2680		2778
…		…
2756	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2757	}	2855	}
2758		2856
2759	#############################################################################	2857	#############################################################################
2760		2858
2761	package CFClient::UI::Inventory;
2762
2763	our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765	sub new {
2766	my $class = shift;
2767
2768	my $self = $class->SUPER::new (
2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770	@_,
2771	);
2772
2773	$self
2774	}
2775
2776	sub set_items {
2777	my ($self, $items) = @_;
2778
2779	$self->{scrolled}->clear;
2780	return unless $items;
2781
2782	my @items = sort {
2783	($a->{type} <=> $b->{type})
2784	or ($a->{name} cmp $b->{name})
2785	} @$items;
2786
2787	$self->{real_items} = \@items;
2788
2789	my $row = 0;
2790	for my $item (@items) {
2791	CFClient::Item::update_widgets $item;
2792
2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797	$row++;
2798	}
2799	}
2800
2801	sub size_request {
2802	my ($self) = @_;
2803	($self->{req_w}, $self->{req_h});
2804	}
2805
2806	#############################################################################
2807
2808	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2809		2860
2810	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2811		2862
2812	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2850	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2902	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2853		2904
2854	$self->show;	2905	$self->show;
2855	$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);
2856	}	2907	}
2857		2908
2858	sub mouse_motion {	2909	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2860		2911
2861	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2862	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2864	}	2917	}
2865		2918
2866	sub button_up {	2919	sub button_up {
2867	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2868		2921
…		…
2870	undef $GRAB;	2923	undef $GRAB;
2871	$self->hide;	2924	$self->hide;
2872		2925
2873	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2874	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2875	}	2932	1
2876	}	2933	}
2877		2934
2878	#############################################################################	2935	#############################################################################
2879		2936
2880	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2985	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
2986	}	3043	}
2987		3044
2988	#############################################################################	3045	#############################################################################
2989		3046
2990	package CFClient::UI::Root;	3047	package CFClient::UI::Inventory;
2991		3048
2992	our @ISA = CFClient::UI::Container::;	3049	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		3050
2996	sub new {	3051	sub new {
2997	my $class = shift;	3052	my $class = shift;
2998		3053
2999	$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 (
3000	visible => 1,	3353	visible => 1,
3001	@_,	3354	@_,
3002	)	3355	);
3003	}
3004		3356
3005	sub configure {	3357	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3358
3008	$self->{w} = $w;	3359	$self
3009	$self->{h} = $h;
3010	}
3011
3012	sub check_size {
3013	my ($self) = @_;
3014
3015	$self->size_allocate ($self->{w}, $self->{h})
3016	if $self->{w};
3017	}	3360	}
3018		3361
3019	sub size_request {	3362	sub size_request {
3020	my ($self) = @_;	3363	my ($self) = @_;
3021		3364
3022	($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
3023	}	3380	}
3024		3381
3025	sub size_allocate {	3382	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3383	my ($self, $w, $h) = @_;
3027		3384
3028	for my $child ($self->children) {	3385	for my $child ($self->children) {
3029	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)};
3030		3387
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3388	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3389	$Y = $child->{force_y} if exists $child->{force_y};
3033		3390
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3391	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3392	$Y = _to_pixel $Y, $H, $self->{h};
3036
3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039		3393
3040	$child->configure ($X, $Y, $W, $H);	3394	$child->configure ($X, $Y, $W, $H);
3041	}	3395	}
3042	}	3396	}
3043		3397
…		…
3054	}	3408	}
3055		3409
3056	sub update {	3410	sub update {
3057	my ($self) = @_;	3411	my ($self) = @_;
3058		3412
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3413	$::WANT_REFRESH++;
3061	}	3414	}
3062		3415
3063	sub add {	3416	sub add {
3064	my ($self, @children) = @_;	3417	my ($self, @children) = @_;
3065		3418
3066	for (my @widgets = @children; my $w = pop @widgets; ) {
3067	push @widgets, $w->children;
3068	$w->{root} = $self;
3069	$w->{visible} = $self->{visible} + 1;
3070	}
3071
3072	for my $child (@children) {
3073	$child->{is_toplevel} = 1;	3419	$_->{is_toplevel} = 1
3074		3420	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3421
3080	$self->SUPER::add (@children);	3422	$self->SUPER::add (@children);
3081	}	3423	}
3082		3424
3083	sub remove {	3425	sub remove {
3084	my ($self, @children) = @_;	3426	my ($self, @children) = @_;
3085		3427
3086	$self->SUPER::remove (@children);	3428	$self->SUPER::remove (@children);
		3429
		3430	delete $self->{is_toplevel}
		3431	for @children;
3087		3432
3088	while (@children) {	3433	while (@children) {
3089	my $w = pop @children;	3434	my $w = pop @children;
3090	push @children, $w->children;	3435	push @children, $w->children;
3091	$w->set_invisible;	3436	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3455	while ($self->{refresh_hook}) {
3111	$_->()	3456	$_->()
3112	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3113	}	3458	}
3114		3459
3115	if ($self->{check_size}) {	3460	if ($self->{realloc}) {
		3461	my %queue;
3116	my @queue;	3462	my @queue;
		3463	my $widget;
3117		3464
3118	for (;;) {	3465	outer:
3119	if ($self->{check_size}) {	3466	while () {
3120	#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
3121		3470
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3471	$queue{$widget+0}++ and next; # duplicates are common
3123	@queue, values %{delete $self->{check_size}};	3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3124	}	3475	}
3125		3476
		3477	while () {
		3478	@queue or last outer;
		3479
3126	my $widget = pop @queue || last;	3480	$widget = pop @{ $queue[-1] || [] }
3127		3481	and last;
3128	defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131	? @$widget{qw(user_w user_h)}
3132	: $widget->size_request;
3133
3134	if (delete $widget->{force_alloc}
3135	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137		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}) {
3138	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3140		3500
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3501	$self->{size_alloc}{$widget+0} = $widget;
3142		3502
3143	$widget->{parent}->check_size
3144	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	}
3145	}	3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3146	}	3513	}
3147	}	3514	}
3148		3515
3149	while ($self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	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)};
3152		3524
3153	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3155		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
3156	$widget->{w} = $w;	3535	$widget->{w} = $w;
3157	$widget->{h} = $h;	3536	$widget->{h} = $h;
		3537
3158	$widget->emit (size_allocate => $w, $h);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3159	}	3540	}
3160	}	3541	}
3161		3542
3162	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3163	$_->()	3544	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3165	}	3546	}
		3547
3166		3548
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3170		3552
…		…
3172	glLoadIdentity;	3554	glLoadIdentity;
3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3175	glLoadIdentity;	3557	glLoadIdentity;
3176		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
3177	$self->_draw;	3566	$self->_draw;
3178	}	3567	}
3179		3568
3180	#############################################################################	3569	#############################################################################
3181		3570

Diff Legend

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