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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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	}
227
228	sub toggle_visibility {
229	my ($self) = @_;
230
231	if ($self->{visible}) {
232	$self->hide;
233	} else {
234	$self->show;
235	}
236	}	237	}
237		238
238	sub destroy {	239	sub destroy {
239	my ($self) = @_;	240	my ($self) = @_;
240		241
…		…
242	%$self = ();	243	%$self = ();
243	}	244	}
244		245
245	sub show {	246	sub show {
246	my ($self) = @_;	247	my ($self) = @_;
		248
247	return if $self->{parent};	249	return if $self->{parent};
248		250
249	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
250	}	252	}
251		253
252	sub show_centered {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
		256
254	return if $self->{parent};	257	return if $self->{visible};
255		258
256	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
257		261
258	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
259	"centered $self" => sub {	263
260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
261	},	265
262	);	266	$_->set_visible for $self->children;
263	}	267	}
264		268
265	sub set_invisible {	269	sub set_invisible {
266	my ($self) = @_;	270	my ($self) = @_;
267		271
268	return unless $self->{visible};	272	return unless $self->{visible};
269		273
270	# broken show/hide model	274	$_->set_invisible for $self->children;
271		275
272	delete $self->{root};	276	delete $self->{root};
273	delete $self->{visible};	277	delete $self->{visible};
274		278
275	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
276	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
277		281
278	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
279	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
280		284
281	$self->focus_out;	285	$self->focus_out;
282		286
283	$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;
284	}	305	}
285		306
286	sub hide {	307	sub hide {
287	my ($self) = @_;	308	my ($self) = @_;
288		309
…		…
290		311
291	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
292	if $self->{parent};	313	if $self->{parent};
293	}	314	}
294		315
295	sub move {	316	sub move_abs {
296	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
297		318
298	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
299	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
300	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
301		322
302	$self->update;	323	$self->update;
303	}	324	}
304		325
305	sub set_size {	326	sub set_size {
306	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
307		328
308	$self->{user_w} = $w;	329	$self->{force_w} = $w;
309	$self->{user_h} = $h;	330	$self->{force_h} = $h;
310		331
311	$self->check_size;	332	$self->realloc;
312	}	333	}
313		334
314	sub size_request {	335	sub size_request {
315	require Carp;	336	require Carp;
316	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
318		339
319	sub configure {	340	sub configure {
320	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
321		342
322	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
323	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
324	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
325		348
326	# use alignment to adjust x, y	349	# use alignment to adjust x, y
327		350
328	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
329	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
330
331	($w, $h) = ($w2, $h2);
332	}	353	}
333		354
334	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
335	$self->{x} = $x;	356	$self->{x} = $x;
336	$self->{y} = $y;	357	$self->{y} = $y;
337	$self->update;	358	$self->update;
338	}	359	}
339		360
340	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341	$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;
342	}	368	}
343	}	369	}
344		370
345	sub size_allocate {	371	sub size_allocate {
346	# nothing to be done	372	# nothing to be done
347	}	373	}
348		374
349	sub reconfigure {
350	my ($self) = @_;
351
352	$self->check_size (1);
353	$self->update;
354	}
355
356	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
357	}	381	}
358		382
359	sub set_max_size {	383	sub set_max_size {
360	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
361		385
…		…
420		444
421	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422	unless $FOCUS;	446	unless $FOCUS;
423	}	447	}
424		448
425	sub mouse_motion { }	449	sub mouse_motion { 0 }
426	sub button_up { }	450	sub button_up { 0 }
427	sub key_down { }	451	sub key_down { 0 }
428	sub key_up { }	452	sub key_up { 0 }
429		453
430	sub button_down {	454	sub button_down {
431	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
432		456
433	$self->focus_in;	457	$self->focus_in;
434	}
435		458
436	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
437	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
438	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
439	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
440	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
441		535
442	sub draw {	536	sub draw {
443	my ($self) = @_;	537	my ($self) = @_;
444		538
445	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
446		550
447	glPushMatrix;	551	glPushMatrix;
448	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
449	$self->_draw;	553	$self->_draw;
450	glPopMatrix;	554	glPopMatrix;
…		…
462	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
463	glEnd;	567	glEnd;
464	glDisable GL_BLEND;	568	glDisable GL_BLEND;
465	}	569	}
466		570
467	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
468	glPushMatrix;	572	glPushMatrix;
469	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
471	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
472	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
483	my ($self) = @_;	587	my ($self) = @_;
484		588
485	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
486	}	590	}
487		591
488	sub find_widget {
489	my ($self, $x, $y) = @_;
490
491	return () unless $self->{can_events};
492
493	return $self
494	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497	()
498	}
499
500	sub set_parent {
501	my ($self, $parent) = @_;
502
503	Scalar::Util::weaken ($self->{parent} = $parent);
504
505	if ($parent->{visible} || 1) {
506	$self->{root} = $parent->{root};
507	$self->{visible} = $parent->{visible} + 1;
508
509	$self->emit (visibility_change => 1)
510	unless $self->{parent}{visible};
511	}
512
513	# TODO: req_w _does_change after ->reconfigure
514	$self->check_size
515	unless exists $self->{req_w};
516
517	$self->show;
518	}
519
520	sub check_size {
521	my ($self, $forced) = @_;
522
523	$self->{force_alloc} = 1 if $forced;
524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
525	}
526
527	sub update {
528	my ($self) = @_;
529
530	$self->{parent}->update
531	if $self->{parent};
532	}
533
534	sub connect {
535	my ($self, $signal, $cb) = @_;
536
537	push @{ $self->{signal_cb}{$signal} }, $cb;
538	}
539
540	sub _emit {
541	my ($self, $signal, @args) = @_;
542
543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544	}
545
546	sub emit {
547	my ($self, $signal, @args) = @_;
548
549	$self->_emit ($signal, @args)
550	|| $self->$signal (@args);
551	}
552
553	sub visibility_change {
554	#my ($self, $visible) = @_;
555	}
556
557	sub DESTROY {	592	sub DESTROY {
558	my ($self) = @_;	593	my ($self) = @_;
559		594
560	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
561	#$self->deactivate;	596	#$self->deactivate;
…		…
617	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
618	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
619	}	654	}
620		655
621	sub size_request {	656	sub size_request {
622	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
623	}	660	}
624		661
625	sub draw { }	662	sub draw { }
626		663
627	#############################################################################	664	#############################################################################
…		…
631	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
632		669
633	sub new {	670	sub new {
634	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
635		672
636	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
637		674
638	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
639	children => [],	676	children => [],
640	can_events => 0,	677	can_events => 0,
641	%arg,	678	%arg,
642	);	679	);
		680
643	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
644		683
645	$self	684	$self
646	}	685	}
647		686
648	sub add {	687	sub add {
…		…
656	$self->{children} = [	695	$self->{children} = [
657	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
658	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
659	];	698	];
660		699
661	$self->check_size (1);	700	$self->realloc;
662	$self->update;
663	}	701	}
664		702
665	sub children {	703	sub children {
666	@{ $_[0]{children} }	704	@{ $_[0]{children} }
667	}	705	}
…		…
672	delete $child->{parent};	710	delete $child->{parent};
673	$child->hide;	711	$child->hide;
674		712
675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676		714
677	$self->check_size (1);	715	$self->realloc;
678	$self->update;
679	}	716	}
680		717
681	sub clear {	718	sub clear {
682	my ($self) = @_;	719	my ($self) = @_;
683		720
…		…
687	for (@$children) {	724	for (@$children) {
688	delete $_->{parent};	725	delete $_->{parent};
689	$_->hide;	726	$_->hide;
690	}	727	}
691		728
692	$self->check_size;	729	$self->realloc;
693	$self->update;
694	}	730	}
695		731
696	sub find_widget {	732	sub find_widget {
697	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
698		734
699	$x -= $self->{x};	735	$x -= $self->{x};
700	$y -= $self->{y};	736	$y -= $self->{y};
701		737
702	my $res;	738	my $res;
703		739
704	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
705	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
706	and return $res;	742	and return $res;
707	}	743	}
708		744
709	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
758	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
759	}	795	}
760		796
761	#############################################################################	797	#############################################################################
762		798
		799	# back-buffered drawing area
		800
763	package CFClient::UI::Window;	801	package CFClient::UI::Window;
764		802
765	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
766		804
767	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
785	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	824	$self->update;
787	}	825	}
788		826
789	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
790	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
791	}	831	}
792		832
793	sub render_child {	833	sub render_child {
794	my ($self) = @_;	834	my ($self) = @_;
795		835
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
799		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
800	$self->_render;	847	$self->_render;
801	};	848	};
802	}	849	}
803		850
804	sub _draw {	851	sub _draw {
805	my ($self) = @_;	852	my ($self) = @_;
806		853
807	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
808		855
809	my $tex = $self->{texture}	856	my $tex = $self->{texture}
810	or return;	857	or return;
811		858
812	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
835	}	882	}
836		883
837	sub size_request {	884	sub size_request {
838	my ($self) = @_;	885	my ($self) = @_;
839		886
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		888
842	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
843	}	893	}
844		894
845	sub size_allocate {	895	sub size_allocate {
846	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
847		897
		898	my $child = $self->child;
		899
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		902
851	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
852	$self->update;	904	$self->update;
853	}	905	}
854		906
…		…
890	}	942	}
891		943
892	sub _render {	944	sub _render {
893	my ($self) = @_;	945	my ($self) = @_;
894		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		951
897	$self->SUPER::_render;	952	$self->SUPER::_render;
898	}	953	}
899		954
…		…
902	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
903		958
904	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
905		960
906	sub new {	961	sub new {
907	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
908		965
909	my $self;	966	my $self;
910		967
911	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
912	vertical => 1,	969	vertical => 1,
…		…
917	;	974	;
918		975
919	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
920	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
921	slider => $slider,	978	slider => $slider,
922	@_,	979	%arg,
923	);	980	);
924		981
925	$self->{vp}->add ($self->{scrolled});
926	$self->add ($self->{vp});
927	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
928		984
929	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
930	}	992	}
931		993
932	sub update {	994	sub update {
933	my ($self) = @_;	995	my ($self) = @_;
934		996
…		…
997		1059
998	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
999		1061
1000	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
1001		1063
1002	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1071
1006	sub new {	1072	sub new {
1007	my $class = shift;	1073	my ($class, %arg) = @_;
1008		1074
1009	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
1010		1076
1011	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1080	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1081	can_events => 1,
1017	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1018	);	1085	);
1019		1086
1020	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1021	align => 0,	1088	align => 0,
1022	valign => 1,	1089	valign => 1,
1023	text => $self->{title},	1090	text => $title,
1024	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1025		1093
1026	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027	}	1102	}
1028		1103
1029	sub border {	1104	sub border {
1030	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1031	}	1106	}
1032		1107
1033	sub size_request {	1108	sub size_request {
1034	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1035		1113
1036	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1037		1115
1038	(	1116	(
1039	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1042	}	1120	}
1043		1121
1044	sub size_allocate {	1122	sub size_allocate {
1045	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1046		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
1047	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1048	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1049		1135
1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051	if $self->{title};
1052
1053	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1054	}	1137	}
1055		1138
1056	sub button_down {	1139	sub button_down {
1057	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1058		1141
…		…
1074	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1075		1158
1076	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1078		1161
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1164
1084	$self->check_size;	1165	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1166	$self->realloc;
1085	};	1167	};
1086		1168
1087	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1173	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1093		1175
1094	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1095		1177
1096	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;	1179	# HACK: the next line is required to enforce placement
1098	$self->move ($self->{user_x}, $self->{user_y});	1180	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099	$self->update;
1100	};	1181	};
		1182	} else {
		1183	return 0;
		1184	}
		1185
1101	}	1186	1
1102	}	1187	}
1103		1188
1104	sub button_up {	1189	sub button_up {
1105	my ($self, $ev, $x, $y) = @_;	1190	my ($self, $ev, $x, $y) = @_;
1106		1191
1107	delete $self->{motion};	1192	!!delete $self->{motion}
1108	}	1193	}
1109		1194
1110	sub mouse_motion {	1195	sub mouse_motion {
1111	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1112		1197
1113	$self->{motion}->($ev, $x, $y) if $self->{motion};	1198	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1199
		1200	!!$self->{motion}
1114	}	1201	}
1115		1202
1116	sub _draw {	1203	sub _draw {
1117	my ($self) = @_;	1204	my ($self) = @_;
1118		1205
		1206	my $child = $self->{children}[0];
		1207
1119	my ($w, $h ) = ($self->{w}, $self->{h});	1208	my ($w, $h ) = ($self->{w}, $self->{h});
1120	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1209	my ($cw, $ch) = ($child->{w}, $child->{h});
1121		1210
1122	glEnable GL_TEXTURE_2D;	1211	glEnable GL_TEXTURE_2D;
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1213
1125	my $border = $self->border;	1214	my $border = $self->border;
1126		1215
1127	glColor @{ $self->{border_bg} };	1216	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1217	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1218	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1219	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1220	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1221
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1222	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1223	glColor @{ $self->{bg} };
1135		1224
1136	# TODO: repeat texture not scale	1225	# TODO: repeat texture not scale
		1226	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1227	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1228	$bg->{t} = $ch / $bg->{h};
1139
1140	glColor @{ $self->{bg} };
1141
1142	$bg->{s} = $rep_x;
1143	$bg->{t} = $rep_y;
1144	$bg->{wrap_mode} = 1;
1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1229	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1230	}
1147		1231
1148	glDisable GL_TEXTURE_2D;	1232	glDisable GL_TEXTURE_2D;
1149		1233
1150	$self->{title}->draw if $self->{title};
1151
1152	$self->child->draw;	1234	$child->draw;
		1235
		1236	if ($self->{title}) {
		1237	glTranslate 0, $border - $self->{h};
		1238	$self->{title}->_draw;
		1239	}
1153	}	1240	}
1154		1241
1155	#############################################################################	1242	#############################################################################
1156		1243
1157	package CFClient::UI::Table;	1244	package CFClient::UI::Table;
…		…
1179	my ($self, $x, $y, $child) = @_;	1266	my ($self, $x, $y, $child) = @_;
1180		1267
1181	$child->set_parent ($self);	1268	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1269	$self->{children}[$y][$x] = $child;
1183		1270
1184	$self->check_size (1);	1271	$self->realloc;
1185	}	1272	}
1186		1273
1187	# TODO: move to container class maybe? send children a signal on removal?	1274	# TODO: move to container class maybe? send children a signal on removal?
1188	sub clear {	1275	sub clear {
1189	my ($self) = @_;	1276	my ($self) = @_;
…		…
1194	for (@children) {	1281	for (@children) {
1195	delete $_->{parent};	1282	delete $_->{parent};
1196	$_->hide;	1283	$_->hide;
1197	}	1284	}
1198		1285
1199	$self->check_size (1);	1286	$self->realloc;
1200	$self->update;
1201	}	1287	}
1202		1288
1203	sub get_wh {	1289	sub get_wh {
1204	my ($self) = @_;	1290	my ($self) = @_;
1205		1291
…		…
1301	}	1387	}
1302	}	1388	}
1303		1389
1304	#############################################################################	1390	#############################################################################
1305		1391
1306	package CFClient::UI::HBox;	1392	package CFClient::UI::Box;
1307
1308	# TODO: wrap into common Box base class
1309		1393
1310	our @ISA = CFClient::UI::Container::;	1394	our @ISA = CFClient::UI::Container::;
1311		1395
1312	sub size_request {	1396	sub size_request {
1313	my ($self) = @_;	1397	my ($self) = @_;
1314		1398
1315	my @alloc = map [$_->size_request], @{$self->{children}};	1399	$self->{vertical}
1316		1400	? (
1317	(	1401	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1318	(List::Util::sum map $_->[0], @alloc),	1402	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319	(List::Util::max map $_->[1], @alloc),	1403	)
1320	)	1404	: (
		1405	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1406	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1407	)
1321	}	1408	}
1322		1409
1323	sub size_allocate {	1410	sub size_allocate {
1324	my ($self, $w, $h) = @_;	1411	my ($self, $w, $h) = @_;
1325		1412
1326	($h, $w) = ($w, $h);	1413	my $space = $self->{vertical} ? $h : $w;
1327
1328	my $children = $self->{children};	1414	my $children = $self->{children};
1329		1415
1330	my @h = map $_->{req_w}, @$children;	1416	my @req;
1331		1417
1332	my $req_h = List::Util::sum @h;	1418	if ($self->{homogeneous}) {
1333		1419	@req = ($space / (@$children || 1)) x @$children;
1334	if ($req_h > $h) {
1335	# ah well, not enough space
1336	$_ *= $h / $req_h for @h;
1337	} else {	1420	} else {
		1421	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1422	my $req = List::Util::sum @req;
		1423
		1424	if ($req > $space) {
		1425	# ah well, not enough space
		1426	$_ *= $space / $req for @req;
		1427	} else {
1338	my $exp = List::Util::sum map $_->{expand}, @$children;	1428	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339	$exp ||= 1;
1340		1429
		1430	$space = ($space - $req) / $expand; # remaining space to give away
		1431
		1432	$req[$_] += $space * $children->[$_]{expand}
1341	for (0 .. $#$children) {	1433	for 0 .. $#$children;
1342	my $child = $children->[$_];
1343
1344	my $alloc_h = $h[$_];
1345	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346	$h[$_] = $alloc_h;
1347	}	1434	}
1348	}	1435	}
1349		1436
1350	CFClient::UI::harmonize \@h;	1437	CFClient::UI::harmonize \@req;
1351		1438
1352	my $y = 0;	1439	my $pos = 0;
1353	for (0 .. $#$children) {	1440	for (0 .. $#$children) {
1354	my $child = $children->[$_];
1355	my $h = $h[$_];	1441	my $alloc = $req[$_];
1356	$child->configure ($y, 0, $h, $w);	1442	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357		1443
1358	$y += $h;	1444	$pos += $alloc;
1359	}	1445	}
1360		1446
1361	1	1447	1
1362	}	1448	}
1363		1449
1364	#############################################################################	1450	#############################################################################
1365		1451
		1452	package CFClient::UI::HBox;
		1453
		1454	our @ISA = CFClient::UI::Box::;
		1455
		1456	sub new {
		1457	my $class = shift;
		1458
		1459	$class->SUPER::new (
		1460	vertical => 0,
		1461	@_,
		1462	)
		1463	}
		1464
		1465	#############################################################################
		1466
1366	package CFClient::UI::VBox;	1467	package CFClient::UI::VBox;
1367		1468
1368	# TODO: wrap into common Box base class
1369
1370	our @ISA = CFClient::UI::Container::;	1469	our @ISA = CFClient::UI::Box::;
1371		1470
1372	sub size_request {	1471	sub new {
1373	my ($self) = @_;	1472	my $class = shift;
1374		1473
1375	my @alloc = map [$_->size_request], @{$self->{children}};	1474	$class->SUPER::new (
1376		1475	vertical => 1,
1377	(	1476	@_,
1378	(List::Util::max map $_->[0], @alloc),
1379	(List::Util::sum map $_->[1], @alloc),
1380	)	1477	)
1381	}
1382
1383	sub size_allocate {
1384	my ($self, $w, $h) = @_;
1385
1386	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388	my $children = $self->{children};
1389
1390	my @h = map $_->{req_h}, @$children;
1391
1392	my $req_h = List::Util::sum @h;
1393
1394	if ($req_h > $h) {
1395	# ah well, not enough space
1396	$_ *= $h / $req_h for @h;
1397	} else {
1398	my $exp = List::Util::sum map $_->{expand}, @$children;
1399	$exp ||= 1;
1400
1401	for (0 .. $#$children) {
1402	my $child = $children->[$_];
1403
1404	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405	}
1406	}
1407
1408	CFClient::UI::harmonize \@h;
1409
1410	my $y = 0;
1411	for (0 .. $#$children) {
1412	my $child = $children->[$_];
1413	my $h = $h[$_];
1414	$child->configure (0, $y, $w, $h);
1415
1416	$y += $h;
1417	}
1418
1419	1
1420	}	1478	}
1421		1479
1422	#############################################################################	1480	#############################################################################
1423		1481
1424	package CFClient::UI::Label;	1482	package CFClient::UI::Label;
…		…
1441	ellipsise => 3, # end	1499	ellipsise => 3, # end
1442	layout => (new CFClient::Layout),	1500	layout => (new CFClient::Layout),
1443	fontsize => 1,	1501	fontsize => 1,
1444	align => -1,	1502	align => -1,
1445	valign => -1,	1503	valign => -1,
1446	padding => 2,	1504	padding_x => 2,
		1505	padding_y => 2,
1447	can_events => 0,	1506	can_events => 0,
1448	%arg	1507	%arg
1449	);	1508	);
1450		1509
1451	if (exists $self->{template}) {	1510	if (exists $self->{template}) {
…		…
1487	$self->{text} = "T$text";	1546	$self->{text} = "T$text";
1488		1547
1489	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1548	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490	$self->{layout}->set_text ($text);	1549	$self->{layout}->set_text ($text);
1491		1550
		1551	$self->realloc;
1492	$self->update;	1552	$self->update;
1493	$self->check_size;
1494	}	1553	}
1495		1554
1496	sub set_markup {	1555	sub set_markup {
1497	my ($self, $markup) = @_;	1556	my ($self, $markup) = @_;
1498		1557
…		…
1502	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1561	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503		1562
1504	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1563	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505	$self->{layout}->set_markup ($markup);	1564	$self->{layout}->set_markup ($markup);
1506		1565
		1566	$self->realloc;
1507	$self->update;	1567	$self->update;
1508	$self->check_size;
1509	}	1568	}
1510		1569
1511	sub size_request {	1570	sub size_request {
1512	my ($self) = @_;	1571	my ($self) = @_;
1513		1572
…		…
1527		1586
1528	$w = List::Util::max $w, $w2;	1587	$w = List::Util::max $w, $w2;
1529	$h = List::Util::max $h, $h2;	1588	$h = List::Util::max $h, $h2;
1530	}	1589	}
1531		1590
1532	(	1591	($w, $h)
1533	$w + $self->{padding} * 2,
1534	$h + $self->{padding} * 2,
1535	)
1536	}	1592	}
1537		1593
1538	sub size_allocate {	1594	sub size_allocate {
1539	my ($self, $w, $h) = @_;	1595	my ($self, $w, $h) = @_;
1540		1596
		1597	delete $self->{ox};
		1598
1541	delete $self->{texture};	1599	delete $self->{texture}
		1600	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542	}	1601	}
1543		1602
1544	sub set_fontsize {	1603	sub set_fontsize {
1545	my ($self, $fontsize) = @_;	1604	my ($self, $fontsize) = @_;
1546		1605
1547	$self->{fontsize} = $fontsize;	1606	$self->{fontsize} = $fontsize;
1548	delete $self->{texture};	1607	delete $self->{texture};
1549		1608
1550	$self->update;	1609	$self->realloc;
1551	$self->check_size;
1552	}	1610	}
1553		1611
1554	sub _draw {	1612	sub _draw {
1555	my ($self) = @_;	1613	my ($self) = @_;
1556		1614
…		…
1562	$self->{layout}->set_width ($self->{w});	1620	$self->{layout}->set_width ($self->{w});
1563	$self->{layout}->set_ellipsise ($self->{ellipsise});	1621	$self->{layout}->set_ellipsise ($self->{ellipsise});
1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1622	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1623	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566		1624
1567	my $tex = new_from_layout CFClient::Texture $self->{layout};	1625	new_from_layout CFClient::Texture $self->{layout}
		1626	};
1568		1627
		1628	unless (exists $self->{ox}) {
1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1629	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1630	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571	: ($self->{w} - $tex->{w}) * 0.5);	1631	: ($self->{w} - $tex->{w}) * 0.5);
1572		1632
1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1633	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575	: ($self->{h} - $tex->{h}) * 0.5);	1635	: ($self->{h} - $tex->{h}) * 0.5);
1576
1577	$tex
1578	};	1636	};
1579		1637
1580	glEnable GL_TEXTURE_2D;	1638	glEnable GL_TEXTURE_2D;
1581	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582		1640
…		…
1620		1678
1621	delete $self->{cur_h};	1679	delete $self->{cur_h};
1622		1680
1623	return if $self->{text} eq $text;	1681	return if $self->{text} eq $text;
1624		1682
1625	delete $self->{texture};
1626
1627	$self->{last_activity} = $::NOW;	1683	$self->{last_activity} = $::NOW;
1628	$self->{text} = $text;	1684	$self->{text} = $text;
1629		1685
1630	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1631	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1632		1688
1633	$self->_emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
		1690	$self->update;
1634	}	1691	}
1635		1692
1636	sub set_text {	1693	sub set_text {
1637	my ($self, $text) = @_;	1694	my ($self, $text) = @_;
1638		1695
1639	$self->{cursor} = length $text;	1696	$self->{cursor} = length $text;
1640	$self->_set_text ($text);	1697	$self->_set_text ($text);
1641	$self->update;	1698
1642	$self->check_size;	1699	$self->realloc;
1643	}	1700	}
1644		1701
1645	sub get_text {	1702	sub get_text {
1646	$_[0]{text}	1703	$_[0]{text}
1647	}	1704	}
…		…
1677	$self->{cursor} = length $text;	1734	$self->{cursor} = length $text;
1678	} elsif ($uni == 27) {	1735	} elsif ($uni == 27) {
1679	$self->_emit ('escape');	1736	$self->_emit ('escape');
1680	} elsif ($uni) {	1737	} elsif ($uni) {
1681	substr $text, $self->{cursor}++, 0, chr $uni;	1738	substr $text, $self->{cursor}++, 0, chr $uni;
		1739	} else {
		1740	return 0;
1682	}	1741	}
1683		1742
1684	$self->_set_text ($text);	1743	$self->_set_text ($text);
1685	$self->update;	1744
1686	$self->check_size;	1745	$self->realloc;
		1746
		1747	1
1687	}	1748	}
1688		1749
1689	sub focus_in {	1750	sub focus_in {
1690	my ($self) = @_;	1751	my ($self) = @_;
1691		1752
…		…
1706	utf8::encode $text;	1767	utf8::encode $text;
1707	$self->{cursor} = length substr $text, 0, $idx;	1768	$self->{cursor} = length substr $text, 0, $idx;
1708		1769
1709	$self->_set_text ($self->{text});	1770	$self->_set_text ($self->{text});
1710	$self->update;	1771	$self->update;
		1772
		1773	1
1711	}	1774	}
1712		1775
1713	sub mouse_motion {	1776	sub mouse_motion {
1714	my ($self, $ev, $x, $y) = @_;	1777	my ($self, $ev, $x, $y) = @_;
1715	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1778	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1779
		1780	0
1716	}	1781	}
1717		1782
1718	sub _draw {	1783	sub _draw {
1719	my ($self) = @_;	1784	my ($self) = @_;
1720		1785
…		…
1797	} else {	1862	} else {
1798	$self->set_text ($self->{history_saveback});	1863	$self->set_text ($self->{history_saveback});
1799	}	1864	}
1800		1865
1801	} else {	1866	} else {
1802	$self->SUPER::key_down ($ev);	1867	return $self->SUPER::key_down ($ev)
		1868	}
		1869
1803	}	1870	1
1804
1805	}	1871	}
1806		1872
1807	#############################################################################	1873	#############################################################################
1808		1874
1809	package CFClient::UI::Button;	1875	package CFClient::UI::Button;
…		…
1818		1884
1819	sub new {	1885	sub new {
1820	my $class = shift;	1886	my $class = shift;
1821		1887
1822	$class->SUPER::new (	1888	$class->SUPER::new (
1823	padding => 4,	1889	padding_x => 4,
		1890	padding_y => 4,
1824	fg => [1, 1, 1],	1891	fg => [1, 1, 1],
1825	active_fg => [0, 0, 1],	1892	active_fg => [0, 0, 1],
1826	can_hover => 1,	1893	can_hover => 1,
1827	align => 0,	1894	align => 0,
1828	valign => 0,	1895	valign => 0,
…		…
1837	my ($self, $ev, $x, $y) = @_;	1904	my ($self, $ev, $x, $y) = @_;
1838		1905
1839	$self->emit ("activate")	1906	$self->emit ("activate")
1840	if $x >= 0 && $x < $self->{w}	1907	if $x >= 0 && $x < $self->{w}
1841	&& $y >= 0 && $y < $self->{h};	1908	&& $y >= 0 && $y < $self->{h};
		1909
		1910	1
1842	}	1911	}
1843		1912
1844	sub _draw {	1913	sub _draw {
1845	my ($self) = @_;	1914	my ($self) = @_;
1846		1915
…		…
1875		1944
1876	sub new {	1945	sub new {
1877	my $class = shift;	1946	my $class = shift;
1878		1947
1879	$class->SUPER::new (	1948	$class->SUPER::new (
1880	padding => 2,	1949	padding_x => 2,
		1950	padding_y => 2,
1881	fg => [1, 1, 1],	1951	fg => [1, 1, 1],
1882	active_fg => [1, 1, 0],	1952	active_fg => [1, 1, 0],
1883	bg => [0, 0, 0, 0.2],	1953	bg => [0, 0, 0, 0.2],
1884	active_bg => [1, 1, 1, 0.5],	1954	active_bg => [1, 1, 1, 0.5],
1885	state => 0,	1955	state => 0,
…		…
1889	}	1959	}
1890		1960
1891	sub size_request {	1961	sub size_request {
1892	my ($self) = @_;	1962	my ($self) = @_;
1893		1963
1894	($self->{padding} * 2 + 6) x 2	1964	(6) x 2
1895	}	1965	}
1896		1966
1897	sub button_down {	1967	sub button_down {
1898	my ($self, $ev, $x, $y) = @_;	1968	my ($self, $ev, $x, $y) = @_;
1899		1969
1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1970	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1971	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902	$self->{state} = !$self->{state};	1972	$self->{state} = !$self->{state};
1903	$self->_emit (changed => $self->{state});	1973	$self->_emit (changed => $self->{state});
		1974	} else {
		1975	return 0
		1976	}
		1977
1904	}	1978	1
1905	}	1979	}
1906		1980
1907	sub _draw {	1981	sub _draw {
1908	my ($self) = @_;	1982	my ($self) = @_;
1909		1983
1910	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
1911		1985
1912	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1986	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913		1987
1914	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1988	my ($w, $h) = @$self{qw(w h)};
		1989
		1990	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915		1991
1916	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1992	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917		1993
1918	my $tex = $self->{state} ? $tex[1] : $tex[0];	1994	my $tex = $self->{state} ? $tex[1] : $tex[0];
1919		1995
…		…
2184	fg => [1, 1, 1],	2260	fg => [1, 1, 1],
2185	active_fg => [0, 0, 0],	2261	active_fg => [0, 0, 0],
2186	bg => [0, 0, 0, 0.2],	2262	bg => [0, 0, 0, 0.2],
2187	active_bg => [1, 1, 1, 0.5],	2263	active_bg => [1, 1, 1, 0.5],
2188	range => [0, 0, 100, 10, 0],	2264	range => [0, 0, 100, 10, 0],
2189	req_w => $::WIDTH / 80,	2265	min_w => $::WIDTH / 80,
2190	req_h => $::WIDTH / 80,	2266	min_h => $::WIDTH / 80,
2191	vertical => 0,	2267	vertical => 0,
2192	can_hover => 1,	2268	can_hover => 1,
2193	inner_pad => 0.02,	2269	inner_pad => 0.02,
2194	@_	2270	@_
2195	);	2271	);
…		…
2198	$self->update;	2274	$self->update;
2199		2275
2200	$self	2276	$self
2201	}	2277	}
2202		2278
		2279	sub changed { }
		2280
2203	sub set_range {	2281	sub set_range {
2204	my ($self, $range) = @_;	2282	my ($self, $range) = @_;
2205		2283
2206	($range, $self->{range}) = ($self->{range}, $range);	2284	($range, $self->{range}) = ($self->{range}, $range);
2207		2285
…		…
2233	}	2311	}
2234		2312
2235	sub size_request {	2313	sub size_request {
2236	my ($self) = @_;	2314	my ($self) = @_;
2237		2315
2238	my $w = $self->{req_w};	2316	($self->{req_w}, $self->{req_h})
2239	my $h = $self->{req_h};
2240
2241	$self->{vertical} ? ($h, $w) : ($w, $h)
2242	}	2317	}
2243		2318
2244	sub button_down {	2319	sub button_down {
2245	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2246		2321
2247	$self->SUPER::button_down ($ev, $x, $y);	2322	$self->SUPER::button_down ($ev, $x, $y);
2248		2323
2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2324	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250		2325
2251	$self->mouse_motion ($ev, $x, $y);	2326	$self->mouse_motion ($ev, $x, $y)
2252	}	2327	}
2253		2328
2254	sub mouse_motion {	2329	sub mouse_motion {
2255	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2256		2331
…		…
2260	my (undef, $lo, $hi, $page) = @{$self->{range}};	2335	my (undef, $lo, $hi, $page) = @{$self->{range}};
2261		2336
2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2337	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263		2338
2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2339	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2340	} else {
		2341	return 0;
		2342	}
		2343
2265	}	2344	1
2266	}	2345	}
2267		2346
2268	sub update {	2347	sub update {
2269	my ($self) = @_;	2348	my ($self) = @_;
2270		2349
2271	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2350	delete $self->{knob_w};
		2351	$self->SUPER::update;
		2352	}
		2353
		2354	sub _draw {
		2355	my ($self) = @_;
		2356
		2357	unless ($self->{knob_w}) {
2272	$self->set_value ($self->{range}[0]);	2358	$self->set_value ($self->{range}[0]);
2273		2359
2274	my ($value, $lo, $hi, $page) = @{$self->{range}};	2360	my ($value, $lo, $hi, $page) = @{$self->{range}};
2275	my $range = ($hi - $page - $lo) || 1e-100;	2361	my $range = ($hi - $page - $lo) || 1e-100;
2276		2362
…		…
2282	$value = ($value - $lo) / $range;	2368	$value = ($value - $lo) / $range;
2283	$value = $value * $self->{scale} + $self->{offset};	2369	$value = $value * $self->{scale} + $self->{offset};
2284		2370
2285	$self->{knob_x} = $value - $knob_w * 0.5;	2371	$self->{knob_x} = $value - $knob_w * 0.5;
2286	$self->{knob_w} = $knob_w;	2372	$self->{knob_w} = $knob_w;
2287	});	2373	}
2288
2289	$self->SUPER::update;
2290	}
2291
2292	sub _draw {
2293	my ($self) = @_;
2294		2374
2295	$self->SUPER::_draw ();	2375	$self->SUPER::_draw ();
2296		2376
2297	glScale $self->{w}, $self->{h};	2377	glScale $self->{w}, $self->{h};
2298		2378
…		…
2631	}	2711	}
2632		2712
2633	sub set_tooltip_from {	2713	sub set_tooltip_from {
2634	my ($self, $widget) = @_;	2714	my ($self, $widget) = @_;
2635		2715
		2716	my $tooltip = $widget->{tooltip};
		2717
		2718	if ($ENV{CFPLUS_DEBUG} & 2) {
		2719	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2721	. "req $widget->{req_w} $widget->{req_h}\n"
		2722	. "visible $widget->{visible}";
		2723	}
		2724
2636	$self->add (new CFClient::UI::Label	2725	$self->add (new CFClient::UI::Label
2637	markup => $widget->{tooltip},	2726	markup => $tooltip,
2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2727	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639	fontsize => 0.8,	2728	fontsize => 0.8,
2640	fg => [0, 0, 0, 1],	2729	fg => [0, 0, 0, 1],
2641	ellipsise => 0,	2730	ellipsise => 0,
2642	font => ($widget->{tooltip_font} || $::FONT_PROP),	2731	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2653		2742
2654	sub size_allocate {	2743	sub size_allocate {
2655	my ($self, $w, $h) = @_;	2744	my ($self, $w, $h) = @_;
2656		2745
2657	$self->SUPER::size_allocate ($w - 4, $h - 4);	2746	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2747	}
		2748
		2749	sub visibility_change {
		2750	my ($self, $visible) = @_;
		2751
		2752	return unless $visible;
		2753
		2754	$self->{root}->on_post_alloc ("move_$self" => sub {
		2755	my $widget = $self->{owner}
		2756	or return;
		2757
		2758	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2759
		2760	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2761	if $x + $self->{w} > $::WIDTH;
		2762
		2763	$self->move_abs ($x, $y);
		2764	});
2658	}	2765	}
2659		2766
2660	sub _draw {	2767	sub _draw {
2661	my ($self) = @_;	2768	my ($self) = @_;
2662		2769
…		…
2679	glVertex $w, $h;	2786	glVertex $w, $h;
2680	glVertex $w, 0;	2787	glVertex $w, 0;
2681	glEnd;	2788	glEnd;
2682		2789
2683	glTranslate 2 - 0.375, 2 - 0.375;	2790	glTranslate 2 - 0.375, 2 - 0.375;
		2791
2684	$self->SUPER::_draw;	2792	$self->SUPER::_draw;
2685	}	2793	}
2686		2794
2687	#############################################################################	2795	#############################################################################
2688		2796
…		…
2764	$self->SUPER::DESTROY;	2872	$self->SUPER::DESTROY;
2765	}	2873	}
2766		2874
2767	#############################################################################	2875	#############################################################################
2768		2876
2769	package CFClient::UI::Inventory;	2877	package CFClient::UI::Buttonbar;
2770		2878
2771	our @ISA = CFClient::UI::ScrolledWindow::;	2879	our @ISA = CFClient::UI::HBox::;
2772		2880
2773	sub new {	2881	# TODO: should actualyl wrap buttons and other goodies.
2774	my $class = shift;
2775
2776	my $self = $class->SUPER::new (
2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778	@_,
2779	);
2780
2781	$self
2782	}
2783
2784	sub set_items {
2785	my ($self, $items) = @_;
2786
2787	$self->{scrolled}->clear;
2788	return unless $items;
2789
2790	my @items = sort {
2791	($a->{type} <=> $b->{type})
2792	or ($a->{name} cmp $b->{name})
2793	} @$items;
2794
2795	$self->{real_items} = \@items;
2796
2797	my $row = 0;
2798	for my $item (@items) {
2799	CFClient::Item::update_widgets $item;
2800
2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805	$row++;
2806	}
2807	}
2808
2809	sub size_request {
2810	my ($self) = @_;
2811	($self->{req_w}, $self->{req_h});
2812	}
2813		2882
2814	#############################################################################	2883	#############################################################################
2815		2884
2816	package CFClient::UI::Menu;	2885	package CFClient::UI::Menu;
2817		2886
…		…
2858	# maybe save $GRAB? must be careful about events...	2927	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2928	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2929	$self->{button} = $ev->{button};
2861		2930
2862	$self->show;	2931	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2932	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2933	}
2865		2934
2866	sub mouse_motion {	2935	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2936	my ($self, $ev, $x, $y) = @_;
2868		2937
2869	# TODO: should use vbox->find_widget or so	2938	# TODO: should use vbox->find_widget or so
2870	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2939	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871	$self->{hover} = $self->{item}{$HOVER};	2940	$self->{hover} = $self->{item}{$HOVER};
		2941
		2942	0
2872	}	2943	}
2873		2944
2874	sub button_up {	2945	sub button_up {
2875	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2876		2947
…		…
2878	undef $GRAB;	2949	undef $GRAB;
2879	$self->hide;	2950	$self->hide;
2880		2951
2881	$self->_emit ("popdown");	2952	$self->_emit ("popdown");
2882	$self->{hover}[1]->() if $self->{hover};	2953	$self->{hover}[1]->() if $self->{hover};
		2954	} else {
		2955	return 0
		2956	}
		2957
		2958	1
		2959	}
		2960
		2961	#############################################################################
		2962
		2963	package CFClient::UI::Multiplexer;
		2964
		2965	our @ISA = CFClient::UI::Container::;
		2966
		2967	sub new {
		2968	my $class = shift;
		2969
		2970	my $self = $class->SUPER::new (
		2971	@_,
		2972	);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976
		2977	$self
		2978	}
		2979
		2980	sub add {
		2981	my ($self, @widgets) = @_;
		2982
		2983	$self->SUPER::add (@widgets);
		2984
		2985	$self->{current} = $self->{children}[0]
		2986	if @{ $self->{children} };
		2987	}
		2988
		2989	sub set_current_page {
		2990	my ($self, $page_or_widget) = @_;
		2991
		2992	my $widget = ref $page_or_widget
		2993	? $page_or_widget
		2994	: $self->{children}[$page_or_widget];
		2995
		2996	$self->{current} = $widget;
		2997	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2998
		2999	$self->_emit (page_changed => $self->{current});
		3000
		3001	$self->realloc;
		3002	}
		3003
		3004	sub visible_children {
		3005	$_[0]{current}
		3006	}
		3007
		3008	sub size_request {
		3009	my ($self) = @_;
		3010
		3011	$self->{current}->size_request
		3012	}
		3013
		3014	sub size_allocate {
		3015	my ($self, $w, $h) = @_;
		3016
		3017	$self->{current}->configure (0, 0, $w, $h);
		3018	}
		3019
		3020	sub _draw {
		3021	my ($self) = @_;
		3022
		3023	$self->{current}->draw;
		3024	}
		3025
		3026	#############################################################################
		3027
		3028	package CFClient::UI::Notebook;
		3029
		3030	our @ISA = CFClient::UI::VBox::;
		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	my $self = $class->SUPER::new (
		3036	buttonbar => (new CFClient::UI::Buttonbar),
		3037	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3038	# filter => # will be put between multiplexer and $self
		3039	@_,
		3040	);
2883	}	3041
		3042	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3043	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3044
		3045	$self
		3046	}
		3047
		3048	sub add {
		3049	my ($self, $title, $widget, $tooltip) = @_;
		3050
		3051	Scalar::Util::weaken $self;
		3052
		3053	$self->{buttonbar}->add (new CFClient::UI::Button
		3054	markup => $title,
		3055	tooltip => $tooltip,
		3056	on_activate => sub { $self->set_current_page ($widget) },
		3057	);
		3058
		3059	$self->{multiplexer}->add ($widget);
		3060	}
		3061
		3062	sub set_current_page {
		3063	my ($self, $page) = @_;
		3064
		3065	$self->{multiplexer}->set_current_page ($page);
		3066	$self->_emit (page_changed => $self->{multiplexer}{current});
2884	}	3067	}
2885		3068
2886	#############################################################################	3069	#############################################################################
2887		3070
2888	package CFClient::UI::Statusbox;	3071	package CFClient::UI::Statusbox;
…		…
2993	$self->SUPER::reconfigure;	3176	$self->SUPER::reconfigure;
2994	}	3177	}
2995		3178
2996	#############################################################################	3179	#############################################################################
2997		3180
2998	package CFClient::UI::Root;	3181	package CFClient::UI::Inventory;
2999		3182
3000	our @ISA = CFClient::UI::Container::;	3183	our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002	use CFClient::OpenGL;
3003		3184
3004	sub new {	3185	sub new {
3005	my $class = shift;	3186	my $class = shift;
3006		3187
3007	$class->SUPER::new (	3188	my $self = $class->SUPER::new (
		3189	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3190	@_,
		3191	);
		3192
		3193	$self
		3194	}
		3195
		3196	sub set_items {
		3197	my ($self, $items) = @_;
		3198
		3199	$self->{child}->clear;
		3200	return unless $items;
		3201
		3202	my @items = sort {
		3203	($a->{type} <=> $b->{type})
		3204	or ($a->{name} cmp $b->{name})
		3205	} @$items;
		3206
		3207	$self->{real_items} = \@items;
		3208
		3209	my $row = 0;
		3210	for my $item (@items) {
		3211	CFClient::Item::update_widgets $item;
		3212
		3213	$self->{child}->add (0, $row, $item->{face_widget});
		3214	$self->{child}->add (1, $row, $item->{desc_widget});
		3215	$self->{child}->add (2, $row, $item->{weight_widget});
		3216
		3217	$row++;
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::BindEditor;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (my $vb = new CFClient::UI::VBox);
		3233
		3234
		3235	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3236	text => "start recording",
		3237	tooltip => "Start/Stops recording of actions."
		3238	."All subsequent actions after the recording started will be captured."
		3239	."The actions are displayed after the record was stopped."
		3240	."To bind the action you have to click on the 'Bind' button",
		3241	on_activate => sub {
		3242	unless ($self->{recording}) {
		3243	$self->start;
		3244	} else {
		3245	$self->stop;
		3246	}
		3247	});
		3248
		3249	$vb->add (new CFClient::UI::Label text => "Actions:");
		3250	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3253	$vb->add (my $hb = new CFClient::UI::HBox);
		3254	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "bind",
		3257	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3258	on_activate => sub {
		3259	$self->ask_for_bind;
		3260	});
		3261
		3262	$vb->add (my $hb = new CFClient::UI::HBox);
		3263	$hb->add (new CFClient::UI::Button
		3264	text => "ok",
		3265	expand => 1,
		3266	tooltip => "This closes the binding editor and saves the binding",
		3267	on_activate => sub {
		3268	$self->hide;
		3269	$self->commit;
		3270	});
		3271
		3272	$hb->add (new CFClient::UI::Button
		3273	text => "cancel",
		3274	expand => 1,
		3275	tooltip => "This closes the binding editor without saving",
		3276	on_activate => sub {
		3277	$self->hide;
		3278	$self->{binding_cancel}->()
		3279	if $self->{binding_cancel};
		3280	});
		3281
		3282	$self->update_binding_widgets;
		3283
		3284	$self
		3285	}
		3286
		3287	sub commit {
		3288	my ($self) = @_;
		3289	my ($mod, $sym, $cmds) = $self->get_binding;
		3290	if ($sym != 0 && @$cmds > 0) {
		3291	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3292	."'. Don't forget 'Save Config'!");
		3293	$self->{binding_change}->($mod, $sym, $cmds)
		3294	if $self->{binding_change};
		3295	} else {
		3296	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3297	$self->{binding_cancel}->()
		3298	if $self->{binding_cancel};
		3299	}
		3300	}
		3301
		3302	sub start {
		3303	my ($self) = @_;
		3304
		3305	$self->{rec_btn}->set_text ("stop recording");
		3306	$self->{recording} = 1;
		3307	$self->clear_command_list;
		3308	$::CONN->start_record if $::CONN;
		3309	}
		3310
		3311	sub stop {
		3312	my ($self) = @_;
		3313
		3314	$self->{rec_btn}->set_text ("start recording");
		3315	$self->{recording} = 0;
		3316
		3317	my $rec;
		3318	$rec = $::CONN->stop_record if $::CONN;
		3319	return unless ref $rec eq 'ARRAY';
		3320	$self->set_command_list ($rec);
		3321	}
		3322
		3323
		3324	sub ask_for_bind_and_commit {
		3325	my ($self) = @_;
		3326	$self->ask_for_bind (1);
		3327	}
		3328
		3329	sub ask_for_bind {
		3330	my ($self, $commit) = @_;
		3331
		3332	CFClient::Binder::open_binding_dialog (sub {
		3333	my ($mod, $sym) = @_;
		3334	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3335	$self->update_binding_widgets;
		3336	$self->commit if $commit;
		3337	});
		3338	}
		3339
		3340	# $mod and $sym are the modifiers and key symbol
		3341	# $cmds is a array ref of strings (the commands)
		3342	# $cb is the callback that is executed on OK
		3343	# $ccb is the callback that is executed on CANCEL and
		3344	# when the binding was unsuccessful on OK
		3345	sub set_binding {
		3346	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3347
		3348	$self->clear_command_list;
		3349	$self->{recording} = 0;
		3350	$self->{rec_btn}->set_text ("start recording");
		3351
		3352	$self->{binding} = [$mod, $sym];
		3353	$self->{commands} = $cmds;
		3354
		3355	$self->{binding_change} = $cb;
		3356	$self->{binding_cancel} = $ccb;
		3357
		3358	$self->update_binding_widgets;
		3359	}
		3360
		3361	# this is a shortcut method that asks for a binding
		3362	# and then just binds it.
		3363	sub do_quick_binding {
		3364	my ($self, $cmds) = @_;
		3365	$self->set_binding (undef, undef, $cmds, sub {
		3366	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3367	});
		3368	$self->ask_for_bind (1);
		3369	}
		3370
		3371	sub update_binding_widgets {
		3372	my ($self) = @_;
		3373	my ($mod, $sym, $cmds) = $self->get_binding;
		3374	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3375	$self->set_command_list ($cmds);
		3376	}
		3377
		3378	sub get_binding {
		3379	my ($self) = @_;
		3380	return (
		3381	$self->{binding}->[0],
		3382	$self->{binding}->[1],
		3383	[ grep { defined $_ } @{$self->{commands}} ]
		3384	);
		3385	}
		3386
		3387	sub clear_command_list {
		3388	my ($self) = @_;
		3389	$self->{cmdbox}->clear ();
		3390	}
		3391
		3392	sub set_command_list {
		3393	my ($self, $cmds) = @_;
		3394
		3395	$self->{cmdbox}->clear ();
		3396	$self->{commands} = $cmds;
		3397
		3398	my $idx = 0;
		3399
		3400	for (@$cmds) {
		3401	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3402
		3403	my $i = $idx;
		3404	$hb->add (new CFClient::UI::Label text => $_);
		3405	$hb->add (new CFClient::UI::Button
		3406	text => "delete",
		3407	tooltip => "Deletes the action from the record",
		3408	on_activate => sub {
		3409	$self->{cmdbox}->remove ($hb);
		3410	$cmds->[$i] = undef;
		3411	});
		3412
		3413
		3414	$idx++
		3415	}
		3416	}
		3417
		3418	#############################################################################
		3419
		3420	package CFClient::UI::SpellList;
		3421
		3422	our @ISA = CFClient::UI::Table::;
		3423
		3424	sub new {
		3425	my $class = shift;
		3426
		3427	my $self = $class->SUPER::new (
		3428	binding => [],
		3429	commands => [],
		3430	@_,
		3431	)
		3432	}
		3433
		3434	# XXX: Do sorting? Argl...
		3435	sub add_spell {
		3436	my ($self, $spell) = @_;
		3437	$self->{spells}->{$spell->{name}} = $spell;
		3438
		3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3440	face => $spell->{face},
		3441	can_hover => 1,
		3442	can_events => 1,
		3443	tooltip => $spell->{message});
		3444
		3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3446	text => $spell->{name},
		3447	can_hover => 1,
		3448	can_events => 1,
		3449	tooltip => $spell->{message},
		3450	expand => 1);
		3451
		3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3454	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3455	expand => 1);
		3456
		3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3458	text => "bind to key",
		3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3460	}
		3461
		3462	sub rebuild_spell_list {
		3463	my ($self) = @_;
		3464	$self->{tbl_idx} = 0;
		3465	$self->add_spell ($_) for values %{$self->{spells}};
		3466	}
		3467
		3468	sub remove_spell {
		3469	my ($self, $spell) = @_;
		3470	delete $self->{spells}->{$spell->{name}};
		3471	$self->rebuild_spell_list;
		3472	}
		3473
		3474	#############################################################################
		3475
		3476	package CFClient::UI::Root;
		3477
		3478	our @ISA = CFClient::UI::Container::;
		3479
		3480	use CFClient::OpenGL;
		3481
		3482	sub new {
		3483	my $class = shift;
		3484
		3485	my $self = $class->SUPER::new (
3008	visible => 1,	3486	visible => 1,
3009	@_,	3487	@_,
3010	)	3488	);
3011	}
3012		3489
3013	sub configure {	3490	Scalar::Util::weaken ($self->{root} = $self);
3014	my ($self, $x, $y, $w, $h) = @_;
3015		3491
3016	$self->{w} = $w;	3492	$self
3017	$self->{h} = $h;
3018	}
3019
3020	sub check_size {
3021	my ($self) = @_;
3022
3023	$self->size_allocate ($self->{w}, $self->{h})
3024	if $self->{w};
3025	}	3493	}
3026		3494
3027	sub size_request {	3495	sub size_request {
3028	my ($self) = @_;	3496	my ($self) = @_;
3029		3497
3030	($self->{w}, $self->{h})	3498	($self->{w}, $self->{h})
		3499	}
		3500
		3501	sub _to_pixel {
		3502	my ($coord, $size, $max) = @_;
		3503
		3504	$coord =
		3505	$coord eq "center" ? ($max - $size) * 0.5
		3506	: $coord eq "max" ? $max
		3507	: $coord;
		3508
		3509	$coord = 0 if $coord < 0;
		3510	$coord = $max - $size if $coord > $max - $size;
		3511
		3512	int $coord + 0.5
3031	}	3513	}
3032		3514
3033	sub size_allocate {	3515	sub size_allocate {
3034	my ($self, $w, $h) = @_;	3516	my ($self, $w, $h) = @_;
3035		3517
3036	for my $child ($self->children) {	3518	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3519	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3520
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3521	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3522	$Y = $child->{force_y} if exists $child->{force_y};
3041		3523
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3524	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3525	$Y = _to_pixel $Y, $H, $self->{h};
3044
3045	$X = $self->{user_x} if exists $self->{user_x};
3046	$Y = $self->{user_y} if exists $self->{user_y};
3047
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3526
3051	$child->configure ($X, $Y, $W, $H);	3527	$child->configure ($X, $Y, $W, $H);
3052	}	3528	}
3053	}	3529	}
3054		3530
…		…
3065	}	3541	}
3066		3542
3067	sub update {	3543	sub update {
3068	my ($self) = @_;	3544	my ($self) = @_;
3069		3545
3070	$self->check_size;
3071	$::WANT_REFRESH++;	3546	$::WANT_REFRESH++;
3072	}	3547	}
3073		3548
3074	sub add {	3549	sub add {
3075	my ($self, @children) = @_;	3550	my ($self, @children) = @_;
3076		3551
3077	for (my @widgets = @children; my $w = pop @widgets; ) {
3078	push @widgets, $w->children;
3079	$w->{root} = $self;
3080	$w->{visible} = $self->{visible} + 1;
3081	}
3082
3083	for my $child (@children) {
3084	$child->{is_toplevel} = 1;	3552	$_->{is_toplevel} = 1
3085		3553	for @children;
3086	# integerise window positions
3087	$child->{x} = int $child->{x};
3088	$child->{y} = int $child->{y};
3089	}
3090		3554
3091	$self->SUPER::add (@children);	3555	$self->SUPER::add (@children);
3092	}	3556	}
3093		3557
3094	sub remove {	3558	sub remove {
3095	my ($self, @children) = @_;	3559	my ($self, @children) = @_;
3096		3560
3097	$self->SUPER::remove (@children);	3561	$self->SUPER::remove (@children);
		3562
		3563	delete $self->{is_toplevel}
		3564	for @children;
3098		3565
3099	while (@children) {	3566	while (@children) {
3100	my $w = pop @children;	3567	my $w = pop @children;
3101	push @children, $w->children;	3568	push @children, $w->children;
3102	$w->set_invisible;	3569	$w->set_invisible;
…		…
3121	while ($self->{refresh_hook}) {	3588	while ($self->{refresh_hook}) {
3122	$_->()	3589	$_->()
3123	for values %{delete $self->{refresh_hook}};	3590	for values %{delete $self->{refresh_hook}};
3124	}	3591	}
3125		3592
3126	if ($self->{check_size}) {	3593	if ($self->{realloc}) {
		3594	my %queue;
3127	my @queue;	3595	my @queue;
		3596	my $widget;
3128		3597
3129	for (;;) {	3598	outer:
3130	if ($self->{check_size}) {	3599	while () {
3131	#TODO use array-of-depth approach	3600	if (my $realloc = delete $self->{realloc}) {
		3601	for $widget (values %$realloc) {
		3602	$widget->{visible} or next; # do not resize invisible widgets
3132		3603
3133	@queue = sort { $a->{visible} <=> $b->{visible} }	3604	$queue{$widget+0}++ and next; # duplicates are common
3134	@queue, values %{delete $self->{check_size}};	3605
		3606	push @{ $queue[$widget->{visible}] }, $widget;
		3607	}
3135	}	3608	}
3136		3609
		3610	while () {
		3611	@queue or last outer;
		3612
3137	my $widget = pop @queue || last;	3613	$widget = pop @{ $queue[-1] || [] }
3138		3614	and last;
3139	defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142	? @$widget{qw(user_w user_h)}
3143	: $widget->size_request;
3144
3145	if (delete $widget->{force_alloc}
3146	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148		3615
		3616	pop @queue;
		3617	}
		3618
		3619	delete $queue{$widget+0};
		3620
		3621	my ($w, $h) = $widget->size_request;
		3622
		3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3625
		3626	$w = $widget->{force_w} if exists $widget->{force_w};
		3627	$h = $widget->{force_h} if exists $widget->{force_h};
		3628
		3629	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3630	|| delete $widget->{force_realloc}) {
3149	$widget->{req_w} = $w;	3631	$widget->{req_w} = $w;
3150	$widget->{req_h} = $h;	3632	$widget->{req_h} = $h;
3151		3633
3152	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3634	$self->{size_alloc}{$widget+0} = $widget;
3153		3635
3154	$widget->{parent}->check_size
3155	if $widget->{parent};	3636	if (my $parent = $widget->{parent}) {
		3637	$self->{realloc}{$parent+0} = $parent
		3638	unless $queue{$parent+0};
		3639
		3640	$parent->{force_size_alloc} = 1;
		3641	$self->{size_alloc}{$parent+0} = $parent;
		3642	}
3156	}	3643	}
		3644
		3645	delete $self->{realloc}{$widget+0};
3157	}	3646	}
3158	}	3647	}
3159		3648
3160	while ($self->{size_alloc}) {	3649	while (my $size_alloc = delete $self->{size_alloc}) {
3161	for (values %{delete $self->{size_alloc}}) {	3650	my @queue = sort { $b->{visible} <=> $a->{visible} }
3162	my ($widget, $w, $h) = @$_;	3651	values %$size_alloc;
		3652
		3653	while () {
		3654	my $widget = pop @queue || last;
		3655
		3656	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163		3657
3164	$w = 0 if $w < 0;	3658	$w = 0 if $w < 0;
3165	$h = 0 if $h < 0;	3659	$h = 0 if $h < 0;
3166		3660
		3661	$w = int $w + 0.5;
		3662	$h = int $h + 0.5;
		3663
		3664	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3665	$widget->{old_w} = $widget->{w};
		3666	$widget->{old_h} = $widget->{h};
		3667
3167	$widget->{w} = $w;	3668	$widget->{w} = $w;
3168	$widget->{h} = $h;	3669	$widget->{h} = $h;
		3670
3169	$widget->emit (size_allocate => $w, $h);	3671	$widget->emit (size_allocate => $w, $h);
		3672	}
3170	}	3673	}
3171	}	3674	}
3172		3675
3173	while ($self->{post_alloc_hook}) {	3676	while ($self->{post_alloc_hook}) {
3174	$_->()	3677	$_->()
3175	for values %{delete $self->{post_alloc_hook}};	3678	for values %{delete $self->{post_alloc_hook}};
3176	}	3679	}
		3680
3177		3681
3178	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3682	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3683	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180	glClear GL_COLOR_BUFFER_BIT;	3684	glClear GL_COLOR_BUFFER_BIT;
3181		3685
…		…
3183	glLoadIdentity;	3687	glLoadIdentity;
3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3688	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185	glMatrixMode GL_MODELVIEW;	3689	glMatrixMode GL_MODELVIEW;
3186	glLoadIdentity;	3690	glLoadIdentity;
3187		3691
		3692	{
		3693	package CFClient::UI::Base;
		3694
		3695	($draw_x, $draw_y, $draw_w, $draw_h) =
		3696	(0, 0, $self->{w}, $self->{h});
		3697	}
		3698
3188	$self->_draw;	3699	$self->_draw;
3189	}	3700	}
3190		3701
3191	#############################################################################	3702	#############################################################################
3192		3703

Diff Legend

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