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.272 by root, Sat Jun 3 01:47:14 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})
…		…
785	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	822	$self->update;
787	}	823	}
788		824
789	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
790	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
791	}	829	}
792		830
793	sub render_child {	831	sub render_child {
794	my ($self) = @_;	832	my ($self) = @_;
795		833
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
799		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
800	$self->_render;	845	$self->_render;
801	};	846	};
802	}	847	}
803		848
804	sub _draw {	849	sub _draw {
805	my ($self) = @_;	850	my ($self) = @_;
806		851
807	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
808		853
809	my $tex = $self->{texture}	854	my $tex = $self->{texture}
810	or return;	855	or return;
811		856
812	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
835	}	880	}
836		881
837	sub size_request {	882	sub size_request {
838	my ($self) = @_;	883	my ($self) = @_;
839		884
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		886
842	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
843	}	891	}
844		892
845	sub size_allocate {	893	sub size_allocate {
846	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
847		895
		896	my $child = $self->child;
		897
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		900
851	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
852	$self->update;	902	$self->update;
853	}	903	}
854		904
…		…
889	}	939	}
890	}	940	}
891		941
892	sub _render {	942	sub _render {
893	my ($self) = @_;	943	my ($self) = @_;
		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
894		947
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		949
897	$self->SUPER::_render;	950	$self->SUPER::_render;
898	}	951	}
…		…
997		1050
998	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
999		1052
1000	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
1001		1054
1002	my @tex =	1055	my $bg =
		1056	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1057	mipmap => 1, wrap => 1;
		1058
		1059	my @border =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	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);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1062
1006	sub new {	1063	sub new {
1007	my $class = shift;	1064	my ($class, %arg) = @_;
1008		1065
1009	# TODO: user_x, user_y, overwrite moveto?	1066	my $title = delete $arg{title};
1010		1067
1011	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1071	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1072	can_events => 1,
1017	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
1018	);	1076	);
1019		1077
1020	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
1021	align => 0,	1079	align => 0,
1022	valign => 1,	1080	valign => 1,
1023	text => $self->{title},	1081	text => $title,
1024	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1025		1084
1026	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027	}	1093	}
1028		1094
1029	sub border {	1095	sub border {
1030	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1031	}	1097	}
1032		1098
1033	sub size_request {	1099	sub size_request {
1034	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1035		1104
1036	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1037		1106
1038	(	1107	(
1039	$w + $self->border * 2,	1108	$w + $self->border * 2,
…		…
1042	}	1111	}
1043		1112
1044	sub size_allocate {	1113	sub size_allocate {
1045	my ($self, $w, $h) = @_;	1114	my ($self, $w, $h) = @_;
1046		1115
		1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
		1121
		1122	my $border = $self->border;
		1123
1047	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1048	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1049		1126
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);	1127	$self->child->configure ($border, $border, $w, $h);
1054	}	1128	}
1055		1129
1056	sub button_down {	1130	sub button_down {
1057	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1058		1132
…		…
1074	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1075		1149
1076	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1078		1152
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1155
1084	$self->check_size;	1156	$self->realloc;
		1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1158	};
1086		1159
1087	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1164	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1093		1166
1094	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1095		1168
1096	$self->{user_x} = $bx + $x - $ox;	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;
1098	$self->move ($self->{user_x}, $self->{user_y});
1099	$self->update;
1100	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1101	}	1175	1
1102	}	1176	}
1103		1177
1104	sub button_up {	1178	sub button_up {
1105	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1106		1180
1107	delete $self->{motion};	1181	!!delete $self->{motion}
1108	}	1182	}
1109		1183
1110	sub mouse_motion {	1184	sub mouse_motion {
1111	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1112		1186
1113	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1114	}	1190	}
1115		1191
1116	sub _draw {	1192	sub _draw {
1117	my ($self) = @_;	1193	my ($self) = @_;
1118		1194
		1195	my $child = $self->{children}[0];
		1196
1119	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1120	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1121		1199
1122	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1202
1125	my $border = $self->border;	1203	my $border = $self->border;
1126		1204
1127	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1210
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1135		1213
1136	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1217	$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);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1219	}
1147		1220
1148	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1149		1222
1150	$self->{title}->draw if $self->{title};
1151
1152	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1153	}	1229	}
1154		1230
1155	#############################################################################	1231	#############################################################################
1156		1232
1157	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1179	my ($self, $x, $y, $child) = @_;	1255	my ($self, $x, $y, $child) = @_;
1180		1256
1181	$child->set_parent ($self);	1257	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1258	$self->{children}[$y][$x] = $child;
1183		1259
1184	$self->check_size (1);	1260	$self->realloc;
1185	}	1261	}
1186		1262
1187	# TODO: move to container class maybe? send children a signal on removal?	1263	# TODO: move to container class maybe? send children a signal on removal?
1188	sub clear {	1264	sub clear {
1189	my ($self) = @_;	1265	my ($self) = @_;
…		…
1194	for (@children) {	1270	for (@children) {
1195	delete $_->{parent};	1271	delete $_->{parent};
1196	$_->hide;	1272	$_->hide;
1197	}	1273	}
1198		1274
1199	$self->check_size (1);	1275	$self->realloc;
1200	$self->update;
1201	}	1276	}
1202		1277
1203	sub get_wh {	1278	sub get_wh {
1204	my ($self) = @_;	1279	my ($self) = @_;
1205		1280
…		…
1301	}	1376	}
1302	}	1377	}
1303		1378
1304	#############################################################################	1379	#############################################################################
1305		1380
1306	package CFClient::UI::HBox;	1381	package CFClient::UI::Box;
1307
1308	# TODO: wrap into common Box base class
1309		1382
1310	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Container::;
1311		1384
1312	sub size_request {	1385	sub size_request {
1313	my ($self) = @_;	1386	my ($self) = @_;
1314		1387
1315	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$self->{vertical}
1316		1389	? (
1317	(	1390	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1318	(List::Util::sum map $_->[0], @alloc),	1391	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319	(List::Util::max map $_->[1], @alloc),	1392	)
1320	)	1393	: (
		1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1396	)
1321	}	1397	}
1322		1398
1323	sub size_allocate {	1399	sub size_allocate {
1324	my ($self, $w, $h) = @_;	1400	my ($self, $w, $h) = @_;
1325		1401
1326	($h, $w) = ($w, $h);	1402	my $space = $self->{vertical} ? $h : $w;
1327
1328	my $children = $self->{children};	1403	my $children = $self->{children};
1329		1404
1330	my @h = map $_->{req_w}, @$children;	1405	my @req;
1331		1406
1332	my $req_h = List::Util::sum @h;	1407	if ($self->{homogeneous}) {
1333		1408	@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 {	1409	} else {
		1410	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1411	my $req = List::Util::sum @req;
		1412
		1413	if ($req > $space) {
		1414	# ah well, not enough space
		1415	$_ *= $space / $req for @req;
		1416	} else {
1338	my $exp = List::Util::sum map $_->{expand}, @$children;	1417	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339	$exp ||= 1;
1340		1418
		1419	$space = ($space - $req) / $expand; # remaining space to give away
		1420
		1421	$req[$_] += $space * $children->[$_]{expand}
1341	for (0 .. $#$children) {	1422	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	}	1423	}
1348	}	1424	}
1349		1425
1350	CFClient::UI::harmonize \@h;	1426	CFClient::UI::harmonize \@req;
1351		1427
1352	my $y = 0;	1428	my $pos = 0;
1353	for (0 .. $#$children) {	1429	for (0 .. $#$children) {
1354	my $child = $children->[$_];
1355	my $h = $h[$_];	1430	my $alloc = $req[$_];
1356	$child->configure ($y, 0, $h, $w);	1431	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357		1432
1358	$y += $h;	1433	$pos += $alloc;
1359	}	1434	}
1360		1435
1361	1	1436	1
1362	}	1437	}
1363		1438
1364	#############################################################################	1439	#############################################################################
1365		1440
		1441	package CFClient::UI::HBox;
		1442
		1443	our @ISA = CFClient::UI::Box::;
		1444
		1445	sub new {
		1446	my $class = shift;
		1447
		1448	$class->SUPER::new (
		1449	vertical => 0,
		1450	@_,
		1451	)
		1452	}
		1453
		1454	#############################################################################
		1455
1366	package CFClient::UI::VBox;	1456	package CFClient::UI::VBox;
1367		1457
1368	# TODO: wrap into common Box base class
1369
1370	our @ISA = CFClient::UI::Container::;	1458	our @ISA = CFClient::UI::Box::;
1371		1459
1372	sub size_request {	1460	sub new {
1373	my ($self) = @_;	1461	my $class = shift;
1374		1462
1375	my @alloc = map [$_->size_request], @{$self->{children}};	1463	$class->SUPER::new (
1376		1464	vertical => 1,
1377	(	1465	@_,
1378	(List::Util::max map $_->[0], @alloc),
1379	(List::Util::sum map $_->[1], @alloc),
1380	)	1466	)
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	}	1467	}
1421		1468
1422	#############################################################################	1469	#############################################################################
1423		1470
1424	package CFClient::UI::Label;	1471	package CFClient::UI::Label;
…		…
1441	ellipsise => 3, # end	1488	ellipsise => 3, # end
1442	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1443	fontsize => 1,	1490	fontsize => 1,
1444	align => -1,	1491	align => -1,
1445	valign => -1,	1492	valign => -1,
1446	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1447	can_events => 0,	1495	can_events => 0,
1448	%arg	1496	%arg
1449	);	1497	);
1450		1498
1451	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1487	$self->{text} = "T$text";	1535	$self->{text} = "T$text";
1488		1536
1489	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490	$self->{layout}->set_text ($text);	1538	$self->{layout}->set_text ($text);
1491		1539
		1540	$self->realloc;
1492	$self->update;	1541	$self->update;
1493	$self->check_size;
1494	}	1542	}
1495		1543
1496	sub set_markup {	1544	sub set_markup {
1497	my ($self, $markup) = @_;	1545	my ($self, $markup) = @_;
1498		1546
…		…
1502	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503		1551
1504	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1552	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505	$self->{layout}->set_markup ($markup);	1553	$self->{layout}->set_markup ($markup);
1506		1554
		1555	$self->realloc;
1507	$self->update;	1556	$self->update;
1508	$self->check_size;
1509	}	1557	}
1510		1558
1511	sub size_request {	1559	sub size_request {
1512	my ($self) = @_;	1560	my ($self) = @_;
1513		1561
…		…
1527		1575
1528	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1529	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1530	}	1578	}
1531		1579
1532	(	1580	($w, $h)
1533	$w + $self->{padding} * 2,
1534	$h + $self->{padding} * 2,
1535	)
1536	}	1581	}
1537		1582
1538	sub size_allocate {	1583	sub size_allocate {
1539	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1540		1585
		1586	delete $self->{ox};
		1587
1541	delete $self->{texture};	1588	delete $self->{texture}
		1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542	}	1590	}
1543		1591
1544	sub set_fontsize {	1592	sub set_fontsize {
1545	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1546		1594
1547	$self->{fontsize} = $fontsize;	1595	$self->{fontsize} = $fontsize;
1548	delete $self->{texture};	1596	delete $self->{texture};
1549		1597
1550	$self->update;	1598	$self->realloc;
1551	$self->check_size;
1552	}	1599	}
1553		1600
1554	sub _draw {	1601	sub _draw {
1555	my ($self) = @_;	1602	my ($self) = @_;
1556		1603
…		…
1562	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1563	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566		1613
1567	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1568		1616
		1617	unless (exists $self->{ox}) {
1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1572		1621
1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1576
1577	$tex
1578	};	1625	};
1579		1626
1580	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1581	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582		1629
…		…
1636	sub set_text {	1683	sub set_text {
1637	my ($self, $text) = @_;	1684	my ($self, $text) = @_;
1638		1685
1639	$self->{cursor} = length $text;	1686	$self->{cursor} = length $text;
1640	$self->_set_text ($text);	1687	$self->_set_text ($text);
1641	$self->update;	1688
1642	$self->check_size;	1689	$self->realloc;
1643	}	1690	}
1644		1691
1645	sub get_text {	1692	sub get_text {
1646	$_[0]{text}	1693	$_[0]{text}
1647	}	1694	}
…		…
1677	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1678	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1679	$self->_emit ('escape');	1726	$self->_emit ('escape');
1680	} elsif ($uni) {	1727	} elsif ($uni) {
1681	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1682	}	1731	}
1683		1732
1684	$self->_set_text ($text);	1733	$self->_set_text ($text);
1685	$self->update;	1734
1686	$self->check_size;	1735	$self->realloc;
		1736
		1737	1
1687	}	1738	}
1688		1739
1689	sub focus_in {	1740	sub focus_in {
1690	my ($self) = @_;	1741	my ($self) = @_;
1691		1742
…		…
1706	utf8::encode $text;	1757	utf8::encode $text;
1707	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1708		1759
1709	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1710	$self->update;	1761	$self->update;
		1762
		1763	1
1711	}	1764	}
1712		1765
1713	sub mouse_motion {	1766	sub mouse_motion {
1714	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1715	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1716	}	1771	}
1717		1772
1718	sub _draw {	1773	sub _draw {
1719	my ($self) = @_;	1774	my ($self) = @_;
1720		1775
…		…
1797	} else {	1852	} else {
1798	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1799	}	1854	}
1800		1855
1801	} else {	1856	} else {
1802	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1803	}	1860	1
1804
1805	}	1861	}
1806		1862
1807	#############################################################################	1863	#############################################################################
1808		1864
1809	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1818		1874
1819	sub new {	1875	sub new {
1820	my $class = shift;	1876	my $class = shift;
1821		1877
1822	$class->SUPER::new (	1878	$class->SUPER::new (
1823	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1824	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1825	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1826	can_hover => 1,	1883	can_hover => 1,
1827	align => 0,	1884	align => 0,
1828	valign => 0,	1885	valign => 0,
…		…
1837	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1838		1895
1839	$self->emit ("activate")	1896	$self->emit ("activate")
1840	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1841	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1842	}	1901	}
1843		1902
1844	sub _draw {	1903	sub _draw {
1845	my ($self) = @_;	1904	my ($self) = @_;
1846		1905
…		…
1875		1934
1876	sub new {	1935	sub new {
1877	my $class = shift;	1936	my $class = shift;
1878		1937
1879	$class->SUPER::new (	1938	$class->SUPER::new (
1880	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1881	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1882	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1883	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1884	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1885	state => 0,	1945	state => 0,
…		…
1889	}	1949	}
1890		1950
1891	sub size_request {	1951	sub size_request {
1892	my ($self) = @_;	1952	my ($self) = @_;
1893		1953
1894	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1895	}	1955	}
1896		1956
1897	sub button_down {	1957	sub button_down {
1898	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1899		1959
1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1903	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1904	}	1968	1
1905	}	1969	}
1906		1970
1907	sub _draw {	1971	sub _draw {
1908	my ($self) = @_;	1972	my ($self) = @_;
1909		1973
1910	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1911		1975
1912	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913		1977
1914	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915		1981
1916	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917		1983
1918	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1919		1985
…		…
2184	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2185	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2186	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2187	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2188	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2189	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2190	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2191	vertical => 0,	2257	vertical => 0,
2192	can_hover => 1,	2258	can_hover => 1,
2193	inner_pad => 0.02,	2259	inner_pad => 0.02,
2194	@_	2260	@_
2195	);	2261	);
…		…
2198	$self->update;	2264	$self->update;
2199		2265
2200	$self	2266	$self
2201	}	2267	}
2202		2268
		2269	sub changed { }
		2270
2203	sub set_range {	2271	sub set_range {
2204	my ($self, $range) = @_;	2272	my ($self, $range) = @_;
2205		2273
2206	($range, $self->{range}) = ($self->{range}, $range);	2274	($range, $self->{range}) = ($self->{range}, $range);
2207		2275
…		…
2233	}	2301	}
2234		2302
2235	sub size_request {	2303	sub size_request {
2236	my ($self) = @_;	2304	my ($self) = @_;
2237		2305
2238	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2239	my $h = $self->{req_h};
2240
2241	$self->{vertical} ? ($h, $w) : ($w, $h)
2242	}	2307	}
2243		2308
2244	sub button_down {	2309	sub button_down {
2245	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2246		2311
2247	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2248		2313
2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250		2315
2251	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2252	}	2317	}
2253		2318
2254	sub mouse_motion {	2319	sub mouse_motion {
2255	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2256		2321
…		…
2260	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2261		2326
2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263		2328
2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2265	}	2334	1
2266	}	2335	}
2267		2336
2268	sub update {	2337	sub update {
2269	my ($self) = @_;	2338	my ($self) = @_;
2270		2339
…		…
2631	}	2700	}
2632		2701
2633	sub set_tooltip_from {	2702	sub set_tooltip_from {
2634	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2635		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2636	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2637	markup => $widget->{tooltip},	2715	markup => $tooltip,
2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639	fontsize => 0.8,	2717	fontsize => 0.8,
2640	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2641	ellipsise => 0,	2719	ellipsise => 0,
2642	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2653		2731
2654	sub size_allocate {	2732	sub size_allocate {
2655	my ($self, $w, $h) = @_;	2733	my ($self, $w, $h) = @_;
2656		2734
2657	$self->SUPER::size_allocate ($w - 4, $h - 4);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2736	}
		2737
		2738	sub visibility_change {
		2739	my ($self, $visible) = @_;
		2740
		2741	return unless $visible;
		2742
		2743	$self->{root}->on_post_alloc ("move_$self" => sub {
		2744	my $widget = $self->{owner}
		2745	or return;
		2746
		2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2748
		2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2750	if $x + $self->{w} > $::WIDTH;
		2751
		2752	$self->move_abs ($x, $y);
		2753	});
2658	}	2754	}
2659		2755
2660	sub _draw {	2756	sub _draw {
2661	my ($self) = @_;	2757	my ($self) = @_;
2662		2758
…		…
2679	glVertex $w, $h;	2775	glVertex $w, $h;
2680	glVertex $w, 0;	2776	glVertex $w, 0;
2681	glEnd;	2777	glEnd;
2682		2778
2683	glTranslate 2 - 0.375, 2 - 0.375;	2779	glTranslate 2 - 0.375, 2 - 0.375;
		2780
2684	$self->SUPER::_draw;	2781	$self->SUPER::_draw;
2685	}	2782	}
2686		2783
2687	#############################################################################	2784	#############################################################################
2688		2785
…		…
2764	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2765	}	2862	}
2766		2863
2767	#############################################################################	2864	#############################################################################
2768		2865
2769	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2770		2867
2771	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2772		2869
2773	sub new {	2870	# 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		2871
2814	#############################################################################	2872	#############################################################################
2815		2873
2816	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2817		2875
…		…
2858	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2917	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2861		2919
2862	$self->show;	2920	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2922	}
2865		2923
2866	sub mouse_motion {	2924	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2868		2926
2869	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2870	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2872	}	2932	}
2873		2933
2874	sub button_up {	2934	sub button_up {
2875	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2876		2936
…		…
2878	undef $GRAB;	2938	undef $GRAB;
2879	$self->hide;	2939	$self->hide;
2880		2940
2881	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2882	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2883	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2884	}	3054	}
2885		3055
2886	#############################################################################	3056	#############################################################################
2887		3057
2888	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2993	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2994	}	3164	}
2995		3165
2996	#############################################################################	3166	#############################################################################
2997		3167
2998	package CFClient::UI::Root;	3168	package CFClient::UI::Inventory;
2999		3169
3000	our @ISA = CFClient::UI::Container::;	3170	our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002	use CFClient::OpenGL;
3003		3171
3004	sub new {	3172	sub new {
3005	my $class = shift;	3173	my $class = shift;
3006		3174
3007	$class->SUPER::new (	3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
		3464	package CFClient::UI::Root;
		3465
		3466	our @ISA = CFClient::UI::Container::;
		3467
		3468	use CFClient::OpenGL;
		3469
		3470	sub new {
		3471	my $class = shift;
		3472
		3473	my $self = $class->SUPER::new (
3008	visible => 1,	3474	visible => 1,
3009	@_,	3475	@_,
3010	)	3476	);
3011	}
3012		3477
3013	sub configure {	3478	Scalar::Util::weaken ($self->{root} = $self);
3014	my ($self, $x, $y, $w, $h) = @_;
3015		3479
3016	$self->{w} = $w;	3480	$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	}	3481	}
3026		3482
3027	sub size_request {	3483	sub size_request {
3028	my ($self) = @_;	3484	my ($self) = @_;
3029		3485
3030	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
		3487	}
		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
3031	}	3501	}
3032		3502
3033	sub size_allocate {	3503	sub size_allocate {
3034	my ($self, $w, $h) = @_;	3504	my ($self, $w, $h) = @_;
3035		3505
3036	for my $child ($self->children) {	3506	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3508
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3041		3511
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3513	$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		3514
3051	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3052	}	3516	}
3053	}	3517	}
3054		3518
…		…
3065	}	3529	}
3066		3530
3067	sub update {	3531	sub update {
3068	my ($self) = @_;	3532	my ($self) = @_;
3069		3533
3070	$self->check_size;
3071	$::WANT_REFRESH++;	3534	$::WANT_REFRESH++;
3072	}	3535	}
3073		3536
3074	sub add {	3537	sub add {
3075	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3076		3539
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;	3540	$_->{is_toplevel} = 1
3085		3541	for @children;
3086	# integerise window positions
3087	$child->{x} = int $child->{x};
3088	$child->{y} = int $child->{y};
3089	}
3090		3542
3091	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3092	}	3544	}
3093		3545
3094	sub remove {	3546	sub remove {
3095	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3096		3548
3097	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3098		3553
3099	while (@children) {	3554	while (@children) {
3100	my $w = pop @children;	3555	my $w = pop @children;
3101	push @children, $w->children;	3556	push @children, $w->children;
3102	$w->set_invisible;	3557	$w->set_invisible;
…		…
3121	while ($self->{refresh_hook}) {	3576	while ($self->{refresh_hook}) {
3122	$_->()	3577	$_->()
3123	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3124	}	3579	}
3125		3580
3126	if ($self->{check_size}) {	3581	if ($self->{realloc}) {
		3582	my %queue;
3127	my @queue;	3583	my @queue;
		3584	my $widget;
3128		3585
3129	for (;;) {	3586	outer:
3130	if ($self->{check_size}) {	3587	while () {
3131	#TODO use array-of-depth approach	3588	if (my $realloc = delete $self->{realloc}) {
		3589	for $widget (values %$realloc) {
		3590	$widget->{visible} or next; # do not resize invisible widgets
3132		3591
3133	@queue = sort { $a->{visible} <=> $b->{visible} }	3592	$queue{$widget+0}++ and next; # duplicates are common
3134	@queue, values %{delete $self->{check_size}};	3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3135	}	3596	}
3136		3597
		3598	while () {
		3599	@queue or last outer;
		3600
3137	my $widget = pop @queue || last;	3601	$widget = pop @{ $queue[-1] || [] }
3138		3602	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		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
3149	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3150	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3151		3621
3152	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3622	$self->{size_alloc}{$widget+0} = $widget;
3153		3623
3154	$widget->{parent}->check_size
3155	if $widget->{parent};	3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
3156	}	3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3157	}	3634	}
3158	}	3635	}
3159		3636
3160	while ($self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3161	for (values %{delete $self->{size_alloc}}) {	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3162	my ($widget, $w, $h) = @$_;	3639	values %$size_alloc;
		3640
		3641	while () {
		3642	my $widget = pop @queue || last;
		3643
		3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163		3645
3164	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3165	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3166		3648
		3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3167	$widget->{w} = $w;	3656	$widget->{w} = $w;
3168	$widget->{h} = $h;	3657	$widget->{h} = $h;
		3658
3169	$widget->emit (size_allocate => $w, $h);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3170	}	3661	}
3171	}	3662	}
3172		3663
3173	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3174	$_->()	3665	$_->()
3175	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3176	}	3667	}
		3668
3177		3669
3178	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3181		3673
…		…
3183	glLoadIdentity;	3675	glLoadIdentity;
3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3186	glLoadIdentity;	3678	glLoadIdentity;
3187		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3188	$self->_draw;	3687	$self->_draw;
3189	}	3688	}
3190		3689
3191	#############################################################################	3690	#############################################################################
3192		3691

Diff Legend

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