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

Diff Legend

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