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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
10	use CFClient::Texture;	12	use CFPlus::Texture;
11		13
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		15
14	our $LAYOUT;	16	our $LAYOUT;
15	our $ROOT;	17	our $ROOT;
16	our $TOOLTIP;	18	our $TOOLTIP;
17	our $BUTTON_STATE;	19	our $BUTTON_STATE;
18		20
19	our %WIDGET; # all widgets, weak-referenced	21	our %WIDGET; # all widgets, weak-referenced
		22
		23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		24	if (!$GRAB) {
		25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		26	if (length $widget->{tooltip}) {
		27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->hide;
		29
		30	$TOOLTIP->{owner} = $widget;
		31
		32	return if $ENV{CFPLUS_DEBUG} & 8;
		33
		34	my $tip = $widget->{tooltip};
		35
		36	$tip = $tip->($widget) if CODE:: eq ref $tip;
		37
		38	$TOOLTIP->set_tooltip_from ($widget);
		39	$TOOLTIP->show;
		40	}
		41
		42	return;
		43	}
		44	}
		45	}
		46
		47	$TOOLTIP->hide;
		48	delete $TOOLTIP->{owner};
		49	});
20		50
21	sub get_layout {	51	sub get_layout {
22	my $layout;	52	my $layout;
23		53
24	for (grep { $_->{name} } values %WIDGET) {	54	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	69	my ($layout) = @_;
40		70
41	$LAYOUT = $layout;	71	$LAYOUT = $layout;
42	}	72	}
43		73
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	74	# class methods for events
73	sub feed_sdl_key_down_event {	75	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	76	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	77	if $FOCUS;
76	}	78	}
…		…
78	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
79	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
80	if $FOCUS;	82	if $FOCUS;
81	}	83	}
82		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
83	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
84	my ($ev) = @_;	99	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
86		101
87	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
88	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
89		106
90	$GRAB = $widget;	107	$GRAB = $widget;
91	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
92		109
93	check_tooltip;	110	$TOOLTIP_WATCHER->cb->();
94	}	111	}
95		112
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
97		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
99	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
100	}	123	}
101		124
102	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
103	my ($ev) = @_;	126	my ($ev) = @_;
104	my ($x, $y) = ($ev->{x}, $ev->{y});
105		127
106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107		129
108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109		131
110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
111	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112		134
113	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	137	$grab->update if $grab;
116	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
117		139
118	check_tooltip;	140	check_hover $widget;
		141	$TOOLTIP_WATCHER->cb->();
119	}	142	}
120	}	143	}
121		144
122	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
123	my ($ev) = @_;	146	my ($ev) = @_;
124	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
125		148
126	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127		150
128	if ($widget != $HOVER) {	151	check_hover $widget;
129	my $hover = $HOVER; $HOVER = $widget;
130		152
131	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
132	$HOVER->update if $HOVER && $HOVER->{can_hover};
133
134	check_tooltip;
135	}
136
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	154	if $HOVER;
139	}	155	}
140		156
141	# convert position array to integers	157	# convert position array to integers
142	sub harmonize {	158	sub harmonize {
…		…
192	reconfigure_widgets;	208	reconfigure_widgets;
193	}	209	}
194		210
195	#############################################################################	211	#############################################################################
196		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
197	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
198		222
199	use strict;	223	use strict;
200		224
201	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
202		226
203	sub new {	227	sub new {
204	my $class = shift;	228	my $class = shift;
205		229
206	my $self = bless {	230	my $self = bless {
…		…
211	h => undef,	235	h => undef,
212	can_events => 1,	236	can_events => 1,
213	@_	237	@_
214	}, $class;	238	}, $class;
215		239
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217		241
218	for (keys %$self) {	242	for (keys %$self) {
219	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
220	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
221	}	245	}
222	}	246	}
223		247
224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229		253
230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232		256
233	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
238		262
239	sub destroy {	263	sub destroy {
240	my ($self) = @_;	264	my ($self) = @_;
241		265
242	$self->hide;	266	$self->hide;
		267	$self->emit ("destroy");
243	%$self = ();	268	%$self = ();
244	}	269	}
245		270
246	sub show {	271	sub show {
247	my ($self) = @_;	272	my ($self) = @_;
248		273
249	return if $self->{parent};	274	return if $self->{parent};
250		275
251	$CFClient::UI::ROOT->add ($self);	276	$CFPlus::UI::ROOT->add ($self);
252	}	277	}
253		278
254	sub set_visible {	279	sub set_visible {
255	my ($self) = @_;	280	my ($self) = @_;
256		281
…		…
271		296
272	return unless $self->{visible};	297	return unless $self->{visible};
273		298
274	$_->set_invisible for $self->children;	299	$_->set_invisible for $self->children;
275		300
		301	delete $self->{visible};
276	delete $self->{root};	302	delete $self->{root};
277	delete $self->{visible};
278		303
279	undef $GRAB if $GRAB == $self;	304	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	305	undef $HOVER if $HOVER == $self;
281		306
282	CFClient::UI::check_tooltip	307	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	308	if $TOOLTIP->{owner} == $self;
284		309
285	$self->focus_out;	310	$self->emit ("focus_out");
286
287	$self->emit (visibility_change => 0);	311	$self->emit (visibility_change => 0);
288	}	312	}
289		313
290	sub set_visibility {	314	sub set_visibility {
291	my ($self, $visible) = @_;	315	my ($self, $visible) = @_;
…		…
314	}	338	}
315		339
316	sub move_abs {	340	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	341	my ($self, $x, $y, $z) = @_;
318		342
319	$self->{x} = List::Util::max 0, int $x;	343	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	344	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	345	$self->{z} = $z if defined $z;
322		346
323	$self->update;	347	$self->update;
324	}	348	}
325		349
…		…
335	sub size_request {	359	sub size_request {
336	require Carp;	360	require Carp;
337	Carp::confess "size_request is abstract";	361	Carp::confess "size_request is abstract";
338	}	362	}
339		363
		364	sub baseline_shift {
		365	0
		366	}
		367
340	sub configure {	368	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	369	my ($self, $x, $y, $w, $h) = @_;
342		370
343	if ($self->{aspect}) {	371	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	372	my ($ow, $oh) = ($w, $h);
345		373
346	$w = List::Util::min $w, int $h * $self->{aspect};	374	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	375	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		376
349	# use alignment to adjust x, y	377	# use alignment to adjust x, y
350		378
351	$x += int 0.5 * ($ow - $w);	379	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	380	$y += int 0.5 * ($oh - $h);
…		…
366		394
367	$self->{root}{size_alloc}{$self+0} = $self;	395	$self->{root}{size_alloc}{$self+0} = $self;
368	}	396	}
369	}	397	}
370		398
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	399	sub children {
376	# nop	400	# nop
377	}	401	}
378		402
379	sub visible_children {	403	sub visible_children {
…		…
397		421
398	return if $self->{tooltip} eq $tooltip;	422	return if $self->{tooltip} eq $tooltip;
399		423
400	$self->{tooltip} = $tooltip;	424	$self->{tooltip} = $tooltip;
401		425
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	427	delete $CFPlus::UI::TOOLTIP->{owner};
404	CFClient::UI::check_tooltip;	428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	429	}
406	}	430	}
407		431
408	# translate global coordinates to local coordinate system	432	# translate global coordinates to local coordinate system
409	sub coord2local {	433	sub coord2local {
410	my ($self, $x, $y) = @_;	434	my ($self, $x, $y) = @_;
411		435
		436	Carp::confess unless $self->{parent};#d#
		437
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	438	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	439	}
414		440
415	# translate local coordinates to global coordinate system	441	# translate local coordinates to global coordinate system
416	sub coord2global {	442	sub coord2global {
417	my ($self, $x, $y) = @_;	443	my ($self, $x, $y) = @_;
418		444
		445	Carp::confess unless $self->{parent};#d#
		446
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	447	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	448	}
421		449
422	sub focus_in {	450	sub invoke_focus_in {
423	my ($self) = @_;	451	my ($self) = @_;
424		452
425	return if $FOCUS == $self;	453	return if $FOCUS == $self;
426	return unless $self->{can_focus};	454	return unless $self->{can_focus};
427		455
428	my $focus = $FOCUS; $FOCUS = $self;	456	$FOCUS = $self;
429		457
430	$self->_emit (focus_in => $focus);	458	$self->update;
431		459
432	$focus->update if $focus;	460	0
433	$FOCUS->update;
434	}	461	}
435		462
436	sub focus_out {	463	sub invoke_focus_out {
437	my ($self) = @_;	464	my ($self) = @_;
438		465
439	return unless $FOCUS == $self;	466	return unless $FOCUS == $self;
440		467
441	my $focus = $FOCUS; undef $FOCUS;	468	undef $FOCUS;
442		469
443	$self->_emit (focus_out => $focus);	470	$self->update;
444		471
445	$focus->update if $focus; #?
446
447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	472	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448	unless $FOCUS;	473	unless $FOCUS;
449	}
450		474
		475	0
		476	}
		477
		478	sub grab_focus {
		479	my ($self) = @_;
		480
		481	$FOCUS->emit ("focus_out") if $FOCUS;
		482	$self->emit ("focus_in");
		483	}
		484
451	sub mouse_motion { 0 }	485	sub invoke_mouse_motion { 0 }
452	sub button_up { 0 }	486	sub invoke_button_up { 0 }
453	sub key_down { 0 }	487	sub invoke_key_down { 0 }
454	sub key_up { 0 }	488	sub invoke_key_up { 0 }
		489	sub invoke_mouse_wheel { 0 }
455		490
456	sub button_down {	491	sub invoke_button_down {
457	my ($self, $ev, $x, $y) = @_;	492	my ($self, $ev, $x, $y) = @_;
458		493
459	$self->focus_in;	494	$self->grab_focus;
460		495
461	0	496	0
		497	}
		498
		499	sub connect {
		500	my ($self, $signal, $cb) = @_;
		501
		502	push @{ $self->{signal_cb}{$signal} }, $cb;
		503
		504	defined wantarray and CFPlus::guard {
		505	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		506	@{ $self->{signal_cb}{$signal} };
		507	}
		508	}
		509
		510	sub disconnect_all {
		511	my ($self, $signal) = @_;
		512
		513	delete $self->{signal_cb}{$signal};
		514	}
		515
		516	my %has_coords = (
		517	button_down => 1,
		518	button_up => 1,
		519	mouse_motion => 1,
		520	mouse_wheel => 1,
		521	);
		522
		523	sub emit {
		524	my ($self, $signal, @args) = @_;
		525
		526	# I do not really like this solution, but I do not like duplication
		527	# and needlessly verbose code, either.
		528	my @append
		529	= $has_coords{$signal}
		530	? $args[0]->xy ($self)
		531	: ();
		532
		533	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		534
		535	#d##TODO# stop propagating at first true, do not use sum
		536	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		537	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		538	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462	}	539	}
463		540
464	sub find_widget {	541	sub find_widget {
465	my ($self, $x, $y) = @_;	542	my ($self, $x, $y) = @_;
466		543
…		…
476	sub set_parent {	553	sub set_parent {
477	my ($self, $parent) = @_;	554	my ($self, $parent) = @_;
478		555
479	Scalar::Util::weaken ($self->{parent} = $parent);	556	Scalar::Util::weaken ($self->{parent} = $parent);
480	$self->set_visible if $parent->{visible};	557	$self->set_visible if $parent->{visible};
481	}
482
483	sub connect {
484	my ($self, $signal, $cb) = @_;
485
486	push @{ $self->{signal_cb}{$signal} }, $cb;
487	}
488
489	sub _emit {
490	my ($self, $signal, @args) = @_;
491
492	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493	}
494
495	sub emit {
496	my ($self, $signal, @args) = @_;
497
498	$self->_emit ($signal, @args)
499	|| $self->$signal (@args);
500	}
501
502	sub visibility_change {
503	#my ($self, $visible) = @_;
504	}	558	}
505		559
506	sub realloc {	560	sub realloc {
507	my ($self) = @_;	561	my ($self) = @_;
508		562
…		…
541	return unless $self->{h} && $self->{w};	595	return unless $self->{h} && $self->{w};
542		596
543	# update screen rectangle	597	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};	598	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};	599	local $draw_y = $draw_y + $self->{y};
546	local $draw_w = $draw_x + $self->{w};
547	local $draw_h = $draw_y + $self->{h};
548		600
549	# skip widgets that are entirely outside the drawing area	601	# skip widgets that are entirely outside the drawing area
550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	602	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	603	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552		604
…		…
575	glVertex $self->{w} - 1, 0;	627	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	628	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	629	glVertex 0 , $self->{h} - 1;
578	glEnd;	630	glEnd;
579	glPopMatrix;	631	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	632	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	633	}
582		634
583	$self->_draw;	635	$self->_draw;
584	glPopMatrix;	636	glPopMatrix;
585	}	637	}
…		…
591	}	643	}
592		644
593	sub DESTROY {	645	sub DESTROY {
594	my ($self) = @_;	646	my ($self) = @_;
595		647
		648	return if CFPlus::in_destruct;
		649
		650	eval { $self->destroy };
		651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		652
596	delete $WIDGET{$self+0};	653	delete $WIDGET{$self+0};
597	#$self->deactivate;
598	}	654	}
599		655
600	#############################################################################	656	#############################################################################
601		657
602	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
603		659
604	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
605		661
606	use strict;	662	use strict;
607	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
608		664
609	sub new {	665	sub new {
610	my $class = shift;	666	my $class = shift;
611		667
612	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
643	}	699	}
644	}	700	}
645		701
646	#############################################################################	702	#############################################################################
647		703
648	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
649		705
650	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
651		707
652	sub new {	708	sub new {
653	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
655	}	711	}
…		…
662		718
663	sub draw { }	719	sub draw { }
664		720
665	#############################################################################	721	#############################################################################
666		722
667	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
668		724
669	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
670		726
671	sub new {	727	sub new {
672	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
673		729
674	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
683	if $children;	739	if $children;
684		740
685	$self	741	$self
686	}	742	}
687		743
		744	sub realloc {
		745	my ($self) = @_;
		746
		747	$self->{force_realloc} = 1;
		748	$self->{force_size_alloc} = 1;
		749	$self->SUPER::realloc;
		750	}
		751
688	sub add {	752	sub add {
689	my ($self, @widgets) = @_;	753	my ($self, @widgets) = @_;
690		754
691	$_->set_parent ($self)	755	$_->set_parent ($self)
692	for @widgets;	756	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
753	}	817	}
754		818
755	#############################################################################	819	#############################################################################
756		820
757	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
758		822
759	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
760		824
761	sub new {	825	sub new {
762	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
763		827
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		829
766	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
767	}	831	}
768		832
769	sub add {	833	sub add {
770	my ($self, $child) = @_;	834	my ($self, $child) = @_;
771		835
772	$self->{children} = [];	836	$self->SUPER::remove ($_) for @{ $self->{children} };
773
774	$self->SUPER::add ($child);	837	$self->SUPER::add ($child);
775	}	838	}
776		839
777	sub remove {	840	sub remove {
778	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
779		842
780	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
781		844
782	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
783	unless @{$self->{children}};	846	unless @{$self->{children}};
784	}	847	}
785		848
786	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
787		850
788	sub size_request {	851	sub size_request {
789	$_[0]{children}[0]->size_request	852	$_[0]{children}[0]->size_request
790	}	853	}
791		854
792	sub size_allocate {	855	sub invoke_size_allocate {
793	my ($self, $w, $h) = @_;	856	my ($self, $w, $h) = @_;
794		857
795	$self->{children}[0]->configure (0, 0, $w, $h);	858	$self->{children}[0]->configure (0, 0, $w, $h);
		859
		860	1
796	}	861	}
797		862
798	#############################################################################	863	#############################################################################
799		864
800	# back-buffered drawing area	865	# back-buffered drawing area
801		866
802	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
803		868
804	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
805		870
806	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
807		872
808	sub new {	873	sub new {
809	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
810		875
811	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
816		881
817	$ROOT->on_post_alloc ($self => sub { $self->render_child });	882	$ROOT->on_post_alloc ($self => sub { $self->render_child });
818	$self->SUPER::update;	883	$self->SUPER::update;
819	}	884	}
820		885
821	sub size_allocate {	886	sub invoke_size_allocate {
822	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
823		888
824	$self->SUPER::size_allocate ($w, $h);
825	$self->update;	889	$self->update;
		890
		891	$self->SUPER::invoke_size_allocate ($w, $h)
826	}	892	}
827		893
828	sub _render {	894	sub _render {
829	my ($self) = @_;	895	my ($self) = @_;
830		896
…		…
832	}	898	}
833		899
834	sub render_child {	900	sub render_child {
835	my ($self) = @_;	901	my ($self) = @_;
836		902
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	903	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
840		906
841	{	907	{
842	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
843		909
844	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
846	}	914	}
847
848	$self->_render;
849	};	915	};
850	}	916	}
851		917
852	sub _draw {	918	sub _draw {
853	my ($self) = @_;	919	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		920
857	my $tex = $self->{texture}	921	my $tex = $self->{texture}
858	or return;	922	or return;
859		923
860	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
863		927
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
865		929
866	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
867	}	931	}
868		932
869	#############################################################################	933	#############################################################################
870		934
871	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
872		936
873	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
874		938
875	sub new {	939	sub new {
876	my $class = shift;	940	my $class = shift;
877		941
878	$class->SUPER::new (	942	$class->SUPER::new (
…		…
891	$h = 10 if $self->{scroll_y};	955	$h = 10 if $self->{scroll_y};
892		956
893	($w, $h)	957	($w, $h)
894	}	958	}
895		959
896	sub size_allocate {	960	sub invoke_size_allocate {
897	my ($self, $w, $h) = @_;	961	my ($self, $w, $h) = @_;
898		962
899	my $child = $self->child;	963	my $child = $self->child;
900		964
901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	965	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	966	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903		967
904	$self->child->configure (0, 0, $w, $h);	968	$self->child->configure (0, 0, $w, $h);
905	$self->update;	969	$self->update;
		970
		971	1
906	}	972	}
907		973
908	sub set_offset {	974	sub set_offset {
909	my ($self, $x, $y) = @_;	975	my ($self, $x, $y) = @_;
910		976
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1004	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1005	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1006	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1008	}
943	}	1009	}
944		1010
945	sub _render {	1011	sub _render {
946	my ($self) = @_;	1012	my ($self) = @_;
947		1013
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1014	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1015	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1016
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1018
953	$self->SUPER::_render;	1019	$self->SUPER::_render;
954	}	1020	}
955		1021
956	#############################################################################	1022	#############################################################################
957		1023
958	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
959		1025
960	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
961		1027
962	sub new {	1028	sub new {
963	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
964		1030
965	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
966		1032
967	my $self;	1033	my $self;
968		1034
969	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
970	vertical => 1,	1036	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1038	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
974	},	1040	},
975	;	1041	;
976		1042
977	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
		1045	can_events => 1,
979	slider => $slider,	1046	slider => $slider,
980	%arg,	1047	%arg,
981	);	1048	);
982		1049
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1050	$self->SUPER::add ($self->{vp}, $self->{slider});
984	$self->add ($child) if $child;	1051	$self->add ($child) if $child;
985		1052
986	$self	1053	$self
987	}	1054	}
988		1055
		1056	#TODO# update range on size_allocate depending on child
		1057
989	sub add {	1058	sub add {
990	my ($self, $widget) = @_;	1059	my ($self, $widget) = @_;
991		1060
992	$self->{vp}->add ($self->{child} = $widget);	1061	$self->{vp}->add ($self->{child} = $widget);
993	}	1062	}
994		1063
		1064	sub invoke_mouse_wheel {
		1065	my ($self, $ev) = @_;
		1066
		1067	return 0 unless $ev->{dy}; # only vertical movements
		1068
		1069	$self->{slider}->emit (mouse_wheel => $ev);
		1070
		1071	1
		1072	}
		1073
		1074	sub update_slider {
		1075	my ($self) = @_;
		1076
		1077	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1078	}
		1079
995	sub update {	1080	sub update {
996	my ($self) = @_;	1081	my ($self) = @_;
997		1082
998	$self->SUPER::update;	1083	$self->SUPER::update;
999		1084
1000	# todo: overwrite size_allocate of child	1085	$self->update_slider;
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1086	}
1004		1087
1005	sub size_allocate {	1088	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1089	my ($self, $w, $h) = @_;
1007		1090
		1091	$self->update_slider;
		1092
1008	$self->SUPER::size_allocate ($w, $h);	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1009
1010	my $child = $self->{vp}->child;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012	}	1094	}
1013
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016		1095
1017	#############################################################################	1096	#############################################################################
1018		1097
1019	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1020		1099
1021	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1022		1101
1023	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1024		1103
1025	sub new {	1104	sub new {
1026	my $class = shift;	1105	my $class = shift;
1027		1106
1028	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1055	}	1134	}
1056		1135
1057	#############################################################################	1136	#############################################################################
1058		1137
1059	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1060		1139
1061	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1062		1141
1063	use CFClient::OpenGL;	1142	use CFPlus::OpenGL;
1064
1065	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;
1068
1069	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1143
1073	sub new {	1144	sub new {
1074	my ($class, %arg) = @_;	1145	my ($class, %arg) = @_;
1075		1146
1076	my $title = delete $arg{title};	1147	if ((exists $arg{label}) && !ref $arg{label}) {
		1148	$arg{label} = new CFPlus::UI::Label
		1149	align => 1,
		1150	valign => 0,
		1151	text => $arg{label},
		1152	fontsize => ($arg{border} || 0.8) * 0.75;
		1153	}
		1154
		1155	my $self = $class->SUPER::new (
		1156	# label => "",
		1157	fg => [0.6, 0.3, 0.1],
		1158	border => 0.8,
		1159	style => 'single',
		1160	%arg,
		1161	);
		1162
		1163	$self
		1164	}
		1165
		1166	sub add {
		1167	my ($self, @widgets) = @_;
		1168
		1169	$self->SUPER::add (@widgets);
		1170	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1171	}
		1172
		1173	sub border {
		1174	int $_[0]{border} * $::FONTSIZE
		1175	}
		1176
		1177	sub size_request {
		1178	my ($self) = @_;
		1179
		1180	($self->{label_w}, undef) = $self->{label}->size_request
		1181	if $self->{label};
		1182
		1183	my ($w, $h) = $self->SUPER::size_request;
		1184
		1185	(
		1186	$w + $self->border * 2,
		1187	$h + $self->border * 2,
		1188	)
		1189	}
		1190
		1191	sub invoke_size_allocate {
		1192	my ($self, $w, $h) = @_;
		1193
		1194	my $border = $self->border;
		1195
		1196	$w -= List::Util::max 0, $border * 2;
		1197	$h -= List::Util::max 0, $border * 2;
		1198
		1199	if (my $label = $self->{label}) {
		1200	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1201	$label->{h} = List::Util::min $h, $border;
		1202	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1203	}
		1204
		1205	$self->child->configure ($border, $border, $w, $h);
		1206
		1207	1
		1208	}
		1209
		1210	sub _draw {
		1211	my ($self) = @_;
		1212
		1213	my $child = $self->{children}[0];
		1214
		1215	my $border = $self->border;
		1216	my ($w, $h) = ($self->{w}, $self->{h});
		1217
		1218	$child->draw;
		1219
		1220	glColor @{$self->{fg}};
		1221	glBegin GL_LINE_STRIP;
		1222	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1223	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1224	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1225	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1226	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1227	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1228	glEnd;
		1229
		1230	if ($self->{label}) {
		1231	glTranslate $border * 2, 0;
		1232	$self->{label}->_draw;
		1233	}
		1234	}
		1235
		1236	#############################################################################
		1237
		1238	package CFPlus::UI::Toplevel;
		1239
		1240	our @ISA = CFPlus::UI::Bin::;
		1241
		1242	use CFPlus::OpenGL;
		1243
		1244	my $bg =
		1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1246	mipmap => 1, wrap => 1;
		1247
		1248	my @border =
		1249	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
1077		1254
1078	my $self = $class->SUPER::new (	1255	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1256	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1257	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1258	border => 0.6,
1082	can_events => 1,	1259	can_events => 1,
1083	min_w => 16,	1260	min_w => 64,
1084	min_h => 16,	1261	min_h => 32,
1085	%arg,	1262	%arg,
1086	);	1263	);
1087		1264
1088	$self->{title} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1266	align => 0,
1090	valign => 1,	1267	valign => 1,
1091	text => $title,	1268	text => $self->{title},
1092	fontsize => $self->{border}	1269	fontsize => $self->{border},
1093	if defined $title;	1270	if exists $self->{title};
		1271
		1272	if ($self->{has_close_button}) {
		1273	$self->{close_button} =
		1274	new CFPlus::UI::ImageButton
		1275	path => 'x1_close.png',
		1276	on_activate => sub { $self->emit ("delete") };
		1277
		1278	$self->CFPlus::UI::Container::add ($self->{close_button});
		1279	}
1094		1280
1095	$self	1281	$self
1096	}	1282	}
1097		1283
1098	sub add {	1284	sub add {
1099	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1100		1286
1101	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
		1288	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1289	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1290	}
1104		1291
1105	sub border {	1292	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1107	}	1294	}
1108		1295
1109	sub size_request {	1296	sub size_request {
1110	my ($self) = @_;	1297	my ($self) = @_;
1111		1298
1112	$self->{title}->size_request	1299	$self->{title_widget}->size_request
1113	if $self->{title};	1300	if $self->{title_widget};
		1301
		1302	$self->{close_button}->size_request
		1303	if $self->{close_button};
1114		1304
1115	my ($w, $h) = $self->SUPER::size_request;	1305	my ($w, $h) = $self->SUPER::size_request;
1116		1306
1117	(	1307	(
1118	$w + $self->border * 2,	1308	$w + $self->border * 2,
1119	$h + $self->border * 2,	1309	$h + $self->border * 2,
1120	)	1310	)
1121	}	1311	}
1122		1312
1123	sub size_allocate {	1313	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1314	my ($self, $w, $h) = @_;
1125		1315
1126	if ($self->{title}) {	1316	if ($self->{title_widget}) {
1127	$self->{title}{w} = $w;	1317	$self->{title_widget}{w} = $w;
1128	$self->{title}{h} = $h;	1318	$self->{title_widget}{h} = $h;
1129	$self->{title}->size_allocate ($w, $h);	1319	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1320	}
1131		1321
1132	my $border = $self->border;	1322	my $border = $self->border;
1133		1323
1134	$h -= List::Util::max 0, $border * 2;	1324	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1325	$w -= List::Util::max 0, $border * 2;
		1326
		1327	$self->child->configure ($border, $border, $w, $h);
		1328
		1329	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1330	if $self->{close_button};
		1331
		1332	1
		1333	}
		1334
		1335	sub invoke_delete {
		1336	my ($self) = @_;
		1337
		1338	$self->hide;
1136		1339
1137	$self->child->configure ($border, $border, $w, $h);	1340	1
1138	}	1341	}
1139		1342
1140	sub button_down {	1343	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1344	my ($self, $ev, $x, $y) = @_;
1142		1345
1143	my ($w, $h) = @$self{qw(w h)};	1346	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1347	my $border = $self->border;
1145		1348
…		…
1176		1379
1177	($x, $y) = ($ev->{x}, $ev->{y});	1380	($x, $y) = ($ev->{x}, $ev->{y});
1178		1381
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1382	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1383	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1384	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1385	};
1183	} else {	1386	} else {
1184	return 0;	1387	return 0;
1185	}	1388	}
1186		1389
1187	1	1390	1
1188	}	1391	}
1189		1392
1190	sub button_up {	1393	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1394	my ($self, $ev, $x, $y) = @_;
1192		1395
1193	!!delete $self->{motion}	1396	! ! delete $self->{motion}
1194	}	1397	}
1195		1398
1196	sub mouse_motion {	1399	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
1198		1401
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1403
1201	!!$self->{motion}	1404	! ! $self->{motion}
		1405	}
		1406
		1407	sub invoke_visibility_change {
		1408	my ($self, $visible) = @_;
		1409
		1410	delete $self->{motion} unless $visible;
		1411
		1412	0
1202	}	1413	}
1203		1414
1204	sub _draw {	1415	sub _draw {
1205	my ($self) = @_;	1416	my ($self) = @_;
1206		1417
…		…
1232		1443
1233	glDisable GL_TEXTURE_2D;	1444	glDisable GL_TEXTURE_2D;
1234		1445
1235	$child->draw;	1446	$child->draw;
1236		1447
1237	if ($self->{title}) {	1448	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1449	glTranslate 0, $border - $self->{h};
1239	$self->{title}->_draw;	1450	$self->{title_widget}->_draw;
		1451
		1452	glTranslate 0, - ($border - $self->{h});
1240	}	1453	}
		1454
		1455	$self->{close_button}->draw
		1456	if $self->{close_button};
1241	}	1457	}
1242		1458
1243	#############################################################################	1459	#############################################################################
1244		1460
1245	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1246		1462
1247	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1248		1464
1249	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1250		1466
1251	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1252		1468
1253	sub new {	1469	sub new {
1254	my $class = shift;	1470	my $class = shift;
1255		1471
1256	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1262	sub children {	1478	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1480	}
1265		1481
1266	sub add {	1482	sub add {
1267	my ($self, $x, $y, $child) = @_;	1483	my ($self) = shift;
1268		1484
		1485	while (@_) {
		1486	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1487	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1488	$self->{children}[$y][$x] = $child;
		1489	}
1271		1490
		1491	$self->{force_realloc} = 1;
		1492	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1493	$self->realloc;
		1494	}
		1495
		1496	sub remove {
		1497	my ($self, $child) = @_;
		1498
		1499	# TODO: not yet implemented
1273	}	1500	}
1274		1501
1275	# TODO: move to container class maybe? send children a signal on removal?	1502	# TODO: move to container class maybe? send children a signal on removal?
1276	sub clear {	1503	sub clear {
1277	my ($self) = @_;	1504	my ($self) = @_;
…		…
1318	(sum @$ws),	1545	(sum @$ws),
1319	(sum @$hs),	1546	(sum @$hs),
1320	)	1547	)
1321	}	1548	}
1322		1549
1323	sub size_allocate {	1550	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1551	my ($self, $w, $h) = @_;
1325		1552
1326	my ($ws, $hs) = $self->get_wh;	1553	my ($ws, $hs) = $self->get_wh;
1327		1554
1328	my $req_w = (sum @$ws) || 1;	1555	my $req_w = (sum @$ws) || 1;
…		…
1335		1562
1336	# linearly scale sizes	1563	# linearly scale sizes
1337	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339		1566
1340	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1341	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1342		1569
1343	my $y;	1570	my $y;
1344		1571
1345	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1346	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1360	}	1587	}
1361		1588
1362	$y += $row_h;	1589	$y += $row_h;
1363	}	1590	}
1364		1591
		1592	1
1365	}	1593	}
1366		1594
1367	sub find_widget {	1595	sub find_widget {
1368	my ($self, $x, $y) = @_;	1596	my ($self, $x, $y) = @_;
1369		1597
…		…
1388	}	1616	}
1389	}	1617	}
1390		1618
1391	#############################################################################	1619	#############################################################################
1392		1620
1393	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1394		1622
1395	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1396		1624
1397	sub size_request {	1625	sub size_request {
1398	my ($self) = @_;	1626	my ($self) = @_;
1399		1627
1400	$self->{vertical}	1628	$self->{vertical}
…		…
1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1634	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1635	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1408	)	1636	)
1409	}	1637	}
1410		1638
1411	sub size_allocate {	1639	sub invoke_size_allocate {
1412	my ($self, $w, $h) = @_;	1640	my ($self, $w, $h) = @_;
1413		1641
1414	my $space = $self->{vertical} ? $h : $w;	1642	my $space = $self->{vertical} ? $h : $w;
1415	my $children = $self->{children};	1643	my @children = $self->visible_children;
1416		1644
1417	my @req;	1645	my @req;
1418		1646
1419	if ($self->{homogeneous}) {	1647	if ($self->{homogeneous}) {
1420	@req = ($space / (@$children || 1)) x @$children;	1648	@req = ($space / (@children || 1)) x @children;
1421	} else {	1649	} else {
1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1650	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423	my $req = List::Util::sum @req;	1651	my $req = List::Util::sum @req;
1424		1652
1425	if ($req > $space) {	1653	if ($req > $space) {
1426	# ah well, not enough space	1654	# ah well, not enough space
1427	$_ *= $space / $req for @req;	1655	$_ *= $space / $req for @req;
1428	} else {	1656	} else {
1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1657	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430		1658
1431	$space = ($space - $req) / $expand; # remaining space to give away	1659	$space = ($space - $req) / $expand; # remaining space to give away
1432		1660
1433	$req[$_] += $space * $children->[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1434	for 0 .. $#$children;	1662	for 0 .. $#children;
1435	}	1663	}
1436	}	1664	}
1437		1665
1438	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1439		1667
1440	my $pos = 0;	1668	my $pos = 0;
1441	for (0 .. $#$children) {	1669	for (0 .. $#children) {
1442	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1671	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444		1672
1445	$pos += $alloc;	1673	$pos += $alloc;
1446	}	1674	}
1447		1675
1448	1	1676	1
1449	}	1677	}
1450		1678
1451	#############################################################################	1679	#############################################################################
1452		1680
1453	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1454		1682
1455	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1456		1684
1457	sub new {	1685	sub new {
1458	my $class = shift;	1686	my $class = shift;
1459		1687
1460	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1463	)	1691	)
1464	}	1692	}
1465		1693
1466	#############################################################################	1694	#############################################################################
1467		1695
1468	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1469		1697
1470	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1471		1699
1472	sub new {	1700	sub new {
1473	my $class = shift;	1701	my $class = shift;
1474		1702
1475	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1478	)	1706	)
1479	}	1707	}
1480		1708
1481	#############################################################################	1709	#############################################################################
1482		1710
1483	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1484		1712
1485	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1486		1714
1487	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1488		1716
1489	sub new {	1717	sub new {
1490	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1491		1719
1492	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1495	#active_bg => none	1723	#active_bg => none
1496	#font => default_font	1724	#font => default_font
1497	#text => initial text	1725	#text => initial text
1498	#markup => initial narkup	1726	#markup => initial narkup
1499	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1500	ellipsise => 3, # end	1729	ellipsise => 3, # end
1501	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1502	fontsize => 1,	1731	fontsize => 1,
1503	align => -1,	1732	align => -1,
1504	valign => -1,	1733	valign => -1,
1505	padding_x => 2,	1734	padding_x => 2,
1506	padding_y => 2,	1735	padding_y => 2,
1507	can_events => 0,	1736	can_events => 0,
1508	%arg	1737	%arg
1509	);	1738	);
1510		1739
1511	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1512	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1513	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1514	$self->{template} = $layout;	1743	$self->{template} = $layout;
1515	}	1744	}
1516		1745
1517	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1521	}	1750	}
1522		1751
1523	$self	1752	$self
1524	}	1753	}
1525		1754
1526	sub escape($) {
1527	local $_ = $_[0];
1528
1529	s/&/&amp;/g;
1530	s/>/&gt;/g;
1531	s/</&lt;/g;
1532
1533	$_
1534	}
1535
1536	sub update {	1755	sub update {
1537	my ($self) = @_;	1756	my ($self) = @_;
1538		1757
1539	delete $self->{texture};	1758	delete $self->{texture};
1540	$self->SUPER::update;	1759	$self->SUPER::update;
…		…
1542		1761
1543	sub realloc {	1762	sub realloc {
1544	my ($self) = @_;	1763	my ($self) = @_;
1545		1764
1546	delete $self->{ox};	1765	delete $self->{ox};
1547	delete $self->{req_h};
1548	$self->SUPER::realloc;	1766	$self->SUPER::realloc;
1549	}	1767	}
1550		1768
1551	sub set_text {	1769	sub set_text {
1552	my ($self, $text) = @_;	1770	my ($self, $text) = @_;
1553		1771
1554	return if $self->{text} eq "T$text";	1772	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1773	$self->{text} = "T$text";
1556		1774
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1775	$self->{layout}->set_text ($text);
1559		1776
		1777	delete $self->{size_req};
1560	$self->realloc;	1778	$self->realloc;
1561	$self->update;	1779	$self->update;
1562	}	1780	}
1563		1781
1564	sub set_markup {	1782	sub set_markup {
…		…
1567	return if $self->{text} eq "M$markup";	1785	return if $self->{text} eq "M$markup";
1568	$self->{text} = "M$markup";	1786	$self->{text} = "M$markup";
1569		1787
1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1788	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571		1789
1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573	$self->{layout}->set_markup ($markup);	1790	$self->{layout}->set_markup ($markup);
1574		1791
		1792	delete $self->{size_req};
1575	$self->realloc;	1793	$self->realloc;
1576	$self->update;	1794	$self->update;
1577	}	1795	}
1578		1796
1579	sub size_request {	1797	sub size_request {
1580	my ($self) = @_;	1798	my ($self) = @_;
1581		1799
1582	if (exists $self->{req_h}) {	1800	$self->{size_req} ||= do {
1583	@$self{qw(req_w req_h)}
1584	} else {
1585	$self->{layout}->set_font ($self->{font}) if $self->{font};	1801	$self->{layout}->set_font ($self->{font}) if $self->{font};
1586	$self->{layout}->set_width ($self->{max_w} || -1);	1802	$self->{layout}->set_width ($self->{max_w} || -1);
1587	$self->{layout}->set_ellipsise ($self->{ellipsise});	1803	$self->{layout}->set_ellipsise ($self->{ellipsise});
1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1804	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590		1806
1591	my ($w, $h) = $self->{layout}->size;	1807	my ($w, $h) = $self->{layout}->size;
1592		1808
1593	if (exists $self->{template}) {	1809	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1810	$self->{template}->set_font ($self->{font}) if $self->{font};
		1811	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1812	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1813
1597	my ($w2, $h2) = $self->{template}->size;	1814	my ($w2, $h2) = $self->{template}->size;
1598		1815
1599	$w = List::Util::max $w, $w2;	1816	$w = List::Util::max $w, $w2;
1600	$h = List::Util::max $h, $h2;	1817	$h = List::Util::max $h, $h2;
1601	}	1818	}
1602		1819
1603	($w, $h)	1820	[$w, $h]
1604	}	1821	};
1605	}
1606		1822
		1823	@{ $self->{size_req} }
		1824	}
		1825
		1826	sub baseline_shift {
		1827	$_[0]{layout}->descent
		1828	}
		1829
1607	sub size_allocate {	1830	sub invoke_size_allocate {
1608	my ($self, $w, $h) = @_;	1831	my ($self, $w, $h) = @_;
1609		1832
1610	delete $self->{ox};	1833	delete $self->{ox};
1611		1834
1612	delete $self->{texture}	1835	delete $self->{texture}
1613	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1836	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1837
		1838	1
1614	}	1839	}
1615		1840
1616	sub set_fontsize {	1841	sub set_fontsize {
1617	my ($self, $fontsize) = @_;	1842	my ($self, $fontsize) = @_;
1618		1843
1619	$self->{fontsize} = $fontsize;	1844	$self->{fontsize} = $fontsize;
		1845	delete $self->{size_req};
1620	delete $self->{texture};	1846	delete $self->{texture};
1621		1847
1622	$self->realloc;	1848	$self->realloc;
1623	}	1849	}
1624		1850
		1851	sub reconfigure {
		1852	my ($self) = @_;
		1853
		1854	delete $self->{size_req};
		1855	delete $self->{texture};
		1856
		1857	$self->SUPER::reconfigure;
		1858	}
		1859
1625	sub _draw {	1860	sub _draw {
1626	my ($self) = @_;	1861	my ($self) = @_;
1627		1862
1628	$self->SUPER::_draw; # draw background, if applicable	1863	$self->SUPER::_draw; # draw background, if applicable
1629		1864
1630	my $tex = $self->{texture} ||= do {	1865	my $size = $self->{texture} ||= do {
1631	$self->{layout}->set_foreground (@{$self->{fg}});	1866	$self->{layout}->set_foreground (@{$self->{fg}});
1632	$self->{layout}->set_font ($self->{font}) if $self->{font};	1867	$self->{layout}->set_font ($self->{font}) if $self->{font};
1633	$self->{layout}->set_width ($self->{w});	1868	$self->{layout}->set_width ($self->{w});
1634	$self->{layout}->set_ellipsise ($self->{ellipsise});	1869	$self->{layout}->set_ellipsise ($self->{ellipsise});
1635	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1870	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637		1872
1638	new_from_layout CFClient::Texture $self->{layout}	1873	[$self->{layout}->size]
1639	};	1874	};
1640		1875
1641	unless (exists $self->{ox}) {	1876	unless (exists $self->{ox}) {
1642	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1877	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1878	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644	: ($self->{w} - $tex->{w}) * 0.5);	1879	: ($self->{w} - $size->[0]) * 0.5);
1645		1880
1646	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1881	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1882	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648	: ($self->{h} - $tex->{h}) * 0.5);	1883	: ($self->{h} - $size->[1]) * 0.5);
1649	};	1884	};
1650		1885
1651	glEnable GL_TEXTURE_2D;	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1653		1888
1654	glColor_premultiply @{$self->{fg}}	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1655	if $tex->{format} == GL_ALPHA;
1656
1657	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659	glDisable GL_TEXTURE_2D;
1660	}	1890	}
1661		1891
1662	#############################################################################	1892	#############################################################################
1663		1893
1664	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1665		1895
1666	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1667		1897
1668	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1669		1899
1670	sub new {	1900	sub new {
1671	my $class = shift;	1901	my $class = shift;
1672		1902
1673	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1677	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1678	can_hover => 1,	1908	can_hover => 1,
1679	can_focus => 1,	1909	can_focus => 1,
1680	valign => 0,	1910	valign => 0,
1681	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1682	#text => ...	1913	#text => ...
		1914	#hidden => "*",
1683	@_	1915	@_
1684	)	1916	)
1685	}	1917	}
1686		1918
1687	sub _set_text {	1919	sub _set_text {
…		…
1694	$self->{last_activity} = $::NOW;	1926	$self->{last_activity} = $::NOW;
1695	$self->{text} = $text;	1927	$self->{text} = $text;
1696		1928
1697	$text =~ s/./*/g if $self->{hidden};	1929	$text =~ s/./*/g if $self->{hidden};
1698	$self->{layout}->set_text ("$text ");	1930	$self->{layout}->set_text ("$text ");
		1931	delete $self->{size_req};
1699		1932
1700	$self->_emit (changed => $self->{text});	1933	$self->emit (changed => $self->{text});
		1934
		1935	$self->realloc;
1701	$self->update;	1936	$self->update;
1702	}	1937	}
1703		1938
1704	sub set_text {	1939	sub set_text {
1705	my ($self, $text) = @_;	1940	my ($self, $text) = @_;
1706		1941
1707	$self->{cursor} = length $text;	1942	$self->{cursor} = length $text;
1708	$self->_set_text ($text);	1943	$self->_set_text ($text);
1709
1710	$self->realloc;
1711	}	1944	}
1712		1945
1713	sub get_text {	1946	sub get_text {
1714	$_[0]{text}	1947	$_[0]{text}
1715	}	1948	}
…		…
1720	my ($w, $h) = $self->SUPER::size_request;	1953	my ($w, $h) = $self->SUPER::size_request;
1721		1954
1722	($w + 1, $h) # add 1 for cursor	1955	($w + 1, $h) # add 1 for cursor
1723	}	1956	}
1724		1957
1725	sub key_down {	1958	sub invoke_key_down {
1726	my ($self, $ev) = @_;	1959	my ($self, $ev) = @_;
1727		1960
1728	my $mod = $ev->{mod};	1961	my $mod = $ev->{mod};
1729	my $sym = $ev->{sym};	1962	my $sym = $ev->{sym};
1730	my $uni = $ev->{unicode};	1963	my $uni = $ev->{unicode};
…		…
1733		1966
1734	if ($uni == 8) {	1967	if ($uni == 8) {
1735	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1737	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1738	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1739	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1740	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1741	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1742	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1743	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1744	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1745	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1746	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1747	$self->_emit ('escape');	1983	$self->emit ('escape');
1748	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1749	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1750	} else {	1986	} else {
1751	return 0;	1987	return 0;
1752	}	1988	}
1753		1989
1754	$self->_set_text ($text);	1990	$self->_set_text ($text);
1755		1991
1756	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1757		1994
1758	1	1995	1
1759	}	1996	}
1760		1997
1761	sub focus_in {	1998	sub invoke_focus_in {
1762	my ($self) = @_;	1999	my ($self) = @_;
1763		2000
1764	$self->{last_activity} = $::NOW;	2001	$self->{last_activity} = $::NOW;
1765		2002
1766	$self->SUPER::focus_in;	2003	$self->SUPER::invoke_focus_in
1767	}	2004	}
1768		2005
1769	sub button_down {	2006	sub invoke_button_down {
1770	my ($self, $ev, $x, $y) = @_;	2007	my ($self, $ev, $x, $y) = @_;
1771		2008
1772	$self->SUPER::button_down ($ev, $x, $y);	2009	$self->SUPER::invoke_button_down ($ev, $x, $y);
1773		2010
1774	my $idx = $self->{layout}->xy_to_index ($x, $y);	2011	my $idx = $self->{layout}->xy_to_index ($x, $y);
1775		2012
1776	# byte-index to char-index	2013	# byte-index to char-index
1777	my $text = $self->{text};	2014	my $text = $self->{text};
1778	utf8::encode $text;	2015	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779	$self->{cursor} = length substr $text, 0, $idx;	2016	$self->{cursor} = length $text;
1780		2017
1781	$self->_set_text ($self->{text});	2018	$self->_set_text ($self->{text});
1782	$self->update;	2019	$self->update;
1783		2020
1784	1	2021	1
1785	}	2022	}
1786		2023
1787	sub mouse_motion {	2024	sub invoke_mouse_motion {
1788	my ($self, $ev, $x, $y) = @_;	2025	my ($self, $ev, $x, $y) = @_;
1789	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2026	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790		2027
1791	0	2028	1
1792	}	2029	}
1793		2030
1794	sub _draw {	2031	sub _draw {
1795	my ($self) = @_;	2032	my ($self) = @_;
1796		2033
…		…
1823	utf8::encode $text;	2060	utf8::encode $text;
1824		2061
1825	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2062	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1826	}	2063	}
1827		2064
1828	glColor @{$self->{fg}};
1829	glBegin GL_LINES;	2065	glBegin GL_LINES;
1830	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2066	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1831	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2067	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1832	glEnd;	2068	glEnd;
1833	}	2069	}
1834	}	2070	}
1835		2071
		2072	#############################################################################
		2073
1836	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1837		2075
1838	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1839		2077
1840	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1841		2079
1842	sub key_down {	2080	sub invoke_key_down {
1843	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1844		2082
1845	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1846		2084
1847	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1848	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1849	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
		2088
1850	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1851	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1852	$self->_emit (activate => $txt);	2091	$self->emit (activate => $txt);
1853	$self->update;	2092	$self->update;
1854		2093
1855	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1856	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1857	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1858	}	2097	}
1859	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1860	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1862	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1863	}	2102	}
1864	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1865	}	2104	}
1866		2105
1867	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1868	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1869	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870		2109
1871	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1872	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1873	} else {	2112	} else {
1874	$self->set_text ($self->{history_saveback});	2113	$self->set_text ($self->{history_saveback});
1875	}	2114	}
1876		2115
1877	} else {	2116	} else {
1878	return $self->SUPER::key_down ($ev)	2117	return $self->SUPER::invoke_key_down ($ev)
1879	}	2118	}
1880		2119
1881	1	2120	1
1882	}	2121	}
1883		2122
1884	#############################################################################	2123	#############################################################################
1885		2124
		2125	package CFPlus::UI::TextEdit;
		2126
		2127	our @ISA = CFPlus::UI::EntryBase::;
		2128
		2129	use CFPlus::OpenGL;
		2130
		2131	sub move_cursor_ver {
		2132	my ($self, $dy) = @_;
		2133
		2134	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2135
		2136	$y += $dy;
		2137
		2138	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2139	$self->{cursor} = $index;
		2140	delete $self->{cur_h};
		2141	$self->update;
		2142	return;
		2143	}
		2144	}
		2145
		2146	sub invoke_key_down {
		2147	my ($self, $ev) = @_;
		2148
		2149	my $sym = $ev->{sym};
		2150
		2151	if ($sym == CFPlus::SDLK_UP) {
		2152	$self->move_cursor_ver (-1);
		2153	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2154	$self->move_cursor_ver (+1);
		2155	} else {
		2156	return $self->SUPER::invoke_key_down ($ev)
		2157	}
		2158
		2159	1
		2160	}
		2161
		2162	#############################################################################
		2163
1886	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
1887		2165
1888	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
1889		2167
1890	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
1891		2169
1892	my @tex =	2170	my @tex =
1893	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
1895		2173
1896	sub new {	2174	sub new {
1897	my $class = shift;	2175	my $class = shift;
1898		2176
…		…
1907	can_events => 1,	2185	can_events => 1,
1908	@_	2186	@_
1909	)	2187	)
1910	}	2188	}
1911		2189
1912	sub activate { }
1913
1914	sub button_up {	2190	sub invoke_button_up {
1915	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
1916		2192
1917	$self->emit ("activate")	2193	$self->emit ("activate")
1918	if $x >= 0 && $x < $self->{w}	2194	if $x >= 0 && $x < $self->{w}
1919	&& $y >= 0 && $y < $self->{h};	2195	&& $y >= 0 && $y < $self->{h};
…		…
1937	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
1938	}	2214	}
1939		2215
1940	#############################################################################	2216	#############################################################################
1941		2217
1942	package CFClient::UI::CheckBox;	2218	package CFPlus::UI::CheckBox;
1943		2219
1944	our @ISA = CFClient::UI::DrawBG::;	2220	our @ISA = CFPlus::UI::DrawBG::;
1945		2221
1946	my @tex =	2222	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949		2225
1950	use CFClient::OpenGL;	2226	use CFPlus::OpenGL;
1951		2227
1952	sub new {	2228	sub new {
1953	my $class = shift;	2229	my $class = shift;
1954		2230
1955	$class->SUPER::new (	2231	$class->SUPER::new (
…		…
1969	my ($self) = @_;	2245	my ($self) = @_;
1970		2246
1971	(6) x 2	2247	(6) x 2
1972	}	2248	}
1973		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
1974	sub button_down {	2258	sub invoke_button_down {
1975	my ($self, $ev, $x, $y) = @_;	2259	my ($self, $ev, $x, $y) = @_;
1976		2260
1977	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979	$self->{state} = !$self->{state};	2263	$self->toggle;
1980	$self->_emit (changed => $self->{state});
1981	} else {	2264	} else {
1982	return 0	2265	return 0
1983	}	2266	}
1984		2267
1985	1	2268	1
…		…
2005	glDisable GL_TEXTURE_2D;	2288	glDisable GL_TEXTURE_2D;
2006	}	2289	}
2007		2290
2008	#############################################################################	2291	#############################################################################
2009		2292
2010	package CFClient::UI::Image;	2293	package CFPlus::UI::Image;
2011		2294
2012	our @ISA = CFClient::UI::Base::;	2295	our @ISA = CFPlus::UI::Base::;
2013		2296
2014	use CFClient::OpenGL;	2297	use CFPlus::OpenGL;
2015	use Carp qw/confess/;
2016		2298
2017	our %loaded_images;	2299	our %texture_cache;
2018		2300
2019	sub new {	2301	sub new {
2020	my $class = shift;	2302	my $class = shift;
2021		2303
2022	my $self = $class->SUPER::new (can_events => 0, @_);	2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
2023		2308
2024	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2309	$self->{path} || $self->{tex}
		2310	or Carp::croak "'path' or 'tex' attributes required";
2025		2311
2026	$loaded_images{$self->{image}} ||=	2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2027	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2028		2314
2029	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2315	Scalar::Util::weaken $texture_cache{$self->{path}};
2030		2316
2031	Scalar::Util::weaken $loaded_images{$self->{image}};	2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033	$self->{aspect} = $tex->{w} / $tex->{h};
2034		2318
2035	$self	2319	$self
2036	}	2320	}
2037		2321
		2322	sub STORABLE_freeze {
		2323	my ($self, $cloning) = @_;
		2324
		2325	$self->{path}
		2326	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2327
		2328	$self->{path}
		2329	}
		2330
		2331	sub STORABLE_attach {
		2332	my ($self, $cloning, $path) = @_;
		2333
		2334	$self->new (path => $path)
		2335	}
		2336
2038	sub size_request {	2337	sub size_request {
2039	my ($self) = @_;	2338	my ($self) = @_;
2040		2339
2041	($self->{tex}->{w}, $self->{tex}->{h})	2340	($self->{tex}{w}, $self->{tex}{h})
2042	}	2341	}
2043		2342
2044	sub _draw {	2343	sub _draw {
2045	my ($self) = @_;	2344	my ($self) = @_;
2046		2345
…		…
2056	}	2355	}
2057		2356
2058	glEnable GL_TEXTURE_2D;	2357	glEnable GL_TEXTURE_2D;
2059	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060		2359
2061	$tex->draw_quad_alpha (0, 0, $w, $h);	2360	$tex->draw_quad (0, 0, $w, $h);
2062		2361
2063	glDisable GL_TEXTURE_2D;	2362	glDisable GL_TEXTURE_2D;
2064	}	2363	}
2065		2364
2066	#############################################################################	2365	#############################################################################
2067		2366
		2367	package CFPlus::UI::ImageButton;
		2368
		2369	our @ISA = CFPlus::UI::Image::;
		2370
		2371	use CFPlus::OpenGL;
		2372
		2373	my %textures;
		2374
		2375	sub new {
		2376	my $class = shift;
		2377
		2378	my $self = $class->SUPER::new (
		2379	padding_x => 4,
		2380	padding_y => 4,
		2381	fg => [1, 1, 1],
		2382	active_fg => [0, 0, 1],
		2383	can_hover => 1,
		2384	align => 0,
		2385	valign => 0,
		2386	can_events => 1,
		2387	@_
		2388	);
		2389	}
		2390
		2391	sub invoke_button_up {
		2392	my ($self, $ev, $x, $y) = @_;
		2393
		2394	$self->emit ("activate")
		2395	if $x >= 0 && $x < $self->{w}
		2396	&& $y >= 0 && $y < $self->{h};
		2397
		2398	1
		2399	}
		2400
		2401	#############################################################################
		2402
2068	package CFClient::UI::VGauge;	2403	package CFPlus::UI::VGauge;
2069		2404
2070	our @ISA = CFClient::UI::Base::;	2405	our @ISA = CFPlus::UI::Base::;
2071		2406
2072	use List::Util qw(min max);	2407	use List::Util qw(min max);
2073		2408
2074	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2075		2410
2076	my %tex = (	2411	my %tex = (
2077	food => [	2412	food => [
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080	],	2415	],
2081	grace => [	2416	grace => [
2082	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2418	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2084	],	2419	],
2085	hp => [	2420	hp => [
2086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088	],	2423	],
2089	mana => [	2424	mana => [
2090	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2426	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2092	],	2427	],
2093	);	2428	);
2094		2429
2095	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2155	my $ycut1 = max 0, min 1, $ycut;	2490	my $ycut1 = max 0, min 1, $ycut;
2156	my $ycut2 = max 0, min 1, $ycut - 1;	2491	my $ycut2 = max 0, min 1, $ycut - 1;
2157		2492
2158	my $h1 = $self->{h} * (1 - $ycut1);	2493	my $h1 = $self->{h} * (1 - $ycut1);
2159	my $h2 = $self->{h} * (1 - $ycut2);	2494	my $h2 = $self->{h} * (1 - $ycut2);
		2495	my $h3 = $self->{h};
		2496
		2497	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160		2498
2161	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
2162	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2500	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164	glEnable GL_TEXTURE_2D;	2502	glEnable GL_TEXTURE_2D;
…		…
2183		2521
2184	if ($t3) {	2522	if ($t3) {
2185	glBindTexture GL_TEXTURE_2D, $t3->{name};	2523	glBindTexture GL_TEXTURE_2D, $t3->{name};
2186	glBegin GL_QUADS;	2524	glBegin GL_QUADS;
2187	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2525	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2526	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2527	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2528	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191	glEnd;	2529	glEnd;
2192	}	2530	}
2193		2531
2194	glDisable GL_BLEND;	2532	glDisable GL_BLEND;
2195	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2196	}	2534	}
2197		2535
2198	#############################################################################	2536	#############################################################################
2199		2537
2200	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2201		2539
2202	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2203		2541
2204	sub new {	2542	sub new {
2205	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2206		2544
2207	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2209	can_hover => 1,	2547	can_hover => 1,
2210	can_events => 1,	2548	can_events => 1,
2211	%arg,	2549	%arg,
2212	);	2550	);
2213		2551
2214	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2552	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2215	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2553	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2216	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2554	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2217		2555
2218	$self	2556	$self
2219	}	2557	}
2220		2558
2221	sub set_fontsize {	2559	sub set_fontsize {
…		…
2242	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2243	}	2581	}
2244		2582
2245	#############################################################################	2583	#############################################################################
2246		2584
2247	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2248		2586
2249	use strict;	2587	use strict;
2250		2588
2251	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2252		2590
2253	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2254		2592
2255	my @tex =	2593	my @tex =
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2258		2596
2259	sub new {	2597	sub new {
2260	my $class = shift;	2598	my $class = shift;
2261		2599
…		…
2282	$self->update;	2620	$self->update;
2283		2621
2284	$self	2622	$self
2285	}	2623	}
2286		2624
2287	sub changed { }
2288
2289	sub set_range {	2625	sub set_range {
2290	my ($self, $range) = @_;	2626	my ($self, $range) = @_;
2291		2627
2292	($range, $self->{range}) = ($self->{range}, $range);	2628	($range, $self->{range}) = ($self->{range}, $range);
2293		2629
2294	$self->update
2295	if "@$range" ne "@{$self->{range}}";	2630	if ("@$range" ne "@{$self->{range}}") {
		2631	$self->update;
		2632	$self->set_value ($self->{range}[0]);
		2633	}
2296	}	2634	}
2297		2635
2298	sub set_value {	2636	sub set_value {
2299	my ($self, $value) = @_;	2637	my ($self, $value) = @_;
2300		2638
…		…
2311	if $unit;	2649	if $unit;
2312		2650
2313	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2651	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314		2652
2315	if ($value != $old_value) {	2653	if ($value != $old_value) {
2316	$self->_emit (changed => $value);	2654	$self->emit (changed => $value);
2317	$self->update;	2655	$self->update;
2318	}	2656	}
2319	}	2657	}
2320		2658
2321	sub size_request {	2659	sub size_request {
2322	my ($self) = @_;	2660	my ($self) = @_;
2323		2661
2324	($self->{req_w}, $self->{req_h})	2662	($self->{req_w}, $self->{req_h})
2325	}	2663	}
2326		2664
2327	sub button_down {	2665	sub invoke_button_down {
2328	my ($self, $ev, $x, $y) = @_;	2666	my ($self, $ev, $x, $y) = @_;
2329		2667
2330	$self->SUPER::button_down ($ev, $x, $y);	2668	$self->SUPER::invoke_button_down ($ev, $x, $y);
2331		2669
2332	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2670	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333		2671
2334	$self->mouse_motion ($ev, $x, $y)	2672	$self->invoke_mouse_motion ($ev, $x, $y)
2335	}	2673	}
2336		2674
2337	sub mouse_motion {	2675	sub invoke_mouse_motion {
2338	my ($self, $ev, $x, $y) = @_;	2676	my ($self, $ev, $x, $y) = @_;
2339		2677
2340	if ($GRAB == $self) {	2678	if ($GRAB == $self) {
2341	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2679	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342		2680
…		…
2348	} else {	2686	} else {
2349	return 0;	2687	return 0;
2350	}	2688	}
2351		2689
2352	1	2690	1
		2691	}
		2692
		2693	sub invoke_mouse_wheel {
		2694	my ($self, $ev) = @_;
		2695
		2696	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2697
		2698	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2699
		2700	! ! $delta
2353	}	2701	}
2354		2702
2355	sub update {	2703	sub update {
2356	my ($self) = @_;	2704	my ($self) = @_;
2357		2705
…		…
2406	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2407	}	2755	}
2408		2756
2409	#############################################################################	2757	#############################################################################
2410		2758
2411	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2412		2760
2413	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2414		2762
2415	sub new {	2763	sub new {
2416	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2417		2765
2418	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2419		2767
2420	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2421	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423	to_value => sub { shift },	2771	to_value => sub { shift },
2424	from_value => sub { shift },	2772	from_value => sub { shift },
2425	%arg,	2773	%arg,
2426	);	2774	);
2427		2775
…		…
2447	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2448	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2449		2797
2450	#############################################################################	2798	#############################################################################
2451		2799
2452	package CFClient::UI::TextView;	2800	package CFPlus::UI::TextScroller;
2453		2801
2454	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2455		2803
2456	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2457		2805
2458	sub new {	2806	sub new {
2459	my $class = shift;	2807	my $class = shift;
2460		2808
2461	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
2462	fontsize => 1,	2810	fontsize => 1,
2463	can_events => 0,	2811	can_events => 1,
		2812	indent => 0,
2464	#font => default_font	2813	#font => default_font
2465	@_,	2814	@_,
2466		2815
2467	layout => (new CFClient::Layout 1),	2816	layout => (new CFPlus::Layout),
2468	par => [],	2817	par => [],
2469	height => 0,	2818	height => 0,
2470	children => [	2819	children => [
2471	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2472	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2473	],	2822	],
2474	);	2823	);
2475		2824
2476	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2477		2826
…		…
2483		2832
2484	$self->{fontsize} = $fontsize;	2833	$self->{fontsize} = $fontsize;
2485	$self->reflow;	2834	$self->reflow;
2486	}	2835	}
2487		2836
		2837	sub size_request {
		2838	my ($self) = @_;
		2839
		2840	my ($empty, $slider) = @{ $self->{children} };
		2841
		2842	local $self->{children} = [$empty, $slider];
		2843	$self->SUPER::size_request
		2844	}
		2845
2488	sub size_allocate {	2846	sub invoke_size_allocate {
2489	my ($self, $w, $h) = @_;	2847	my ($self, $w, $h) = @_;
2490		2848
2491	$self->SUPER::size_allocate ($w, $h);	2849	my ($empty, $slider, @other) = @{ $self->{children} };
		2850	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492		2851
2493	$self->{layout}->set_font ($self->{font}) if $self->{font};	2852	$self->{layout}->set_font ($self->{font}) if $self->{font};
2494	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2853	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495	$self->{layout}->set_width ($self->{children}[0]{w});	2854	$self->{layout}->set_width ($empty->{w});
		2855	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496		2856
2497	$self->reflow;	2857	$self->reflow;
2498	}
2499		2858
2500	sub text_size {	2859	local $self->{children} = [$empty, $slider];
		2860	$self->SUPER::invoke_size_allocate ($w, $h)
		2861	}
		2862
		2863	sub invoke_mouse_wheel {
2501	my ($self, $text, $indent) = @_;	2864	my ($self, $ev) = @_;
		2865
		2866	return 0 unless $ev->{dy}; # only vertical movements
		2867
		2868	$self->{children}[1]->emit (mouse_wheel => $ev);
		2869
		2870	1
		2871	}
		2872
		2873	sub get_layout {
		2874	my ($self, $para) = @_;
2502		2875
2503	my $layout = $self->{layout};	2876	my $layout = $self->{layout};
2504		2877
		2878	$layout->set_font ($self->{font}) if $self->{font};
		2879	$layout->set_foreground (@{$para->{fg}});
2505	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506	$layout->set_width ($self->{children}[0]{w} - $indent);	2881	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2882	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507	$layout->set_markup ($text);	2883	$layout->set_markup ($para->{markup});
		2884
		2885	$layout->set_shapes (
		2886	map
		2887	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2888	@{$para->{widget}}
2508		2889	);
		2890
2509	$layout->size	2891	$layout
2510	}	2892	}
2511		2893
2512	sub reflow {	2894	sub reflow {
2513	my ($self) = @_;	2895	my ($self) = @_;
2514		2896
…		…
2521		2903
2522	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2523	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2524	}	2906	}
2525		2907
		2908	sub current_paragraph {
		2909	my ($self) = @_;
		2910
		2911	$self->{top_paragraph} - 1
		2912	}
		2913
		2914	sub scroll_to {
		2915	my ($self, $para) = @_;
		2916
		2917	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2918
		2919	$self->{scroll_to} = $para;
		2920	$self->update;
		2921	}
		2922
2526	sub clear {	2923	sub clear {
2527	my ($self) = @_;	2924	my ($self) = @_;
		2925
		2926	my (undef, undef, @other) = @{ $self->{children} };
		2927	$self->remove ($_) for @other;
2528		2928
2529	$self->{par} = [];	2929	$self->{par} = [];
2530	$self->{height} = 0;	2930	$self->{height} = 0;
2531	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532	}	2932	}
2533		2933
2534	sub add_paragraph {	2934	sub add_paragraph {
2535	my ($self, $color, $text, $indent) = @_;	2935	my $self = shift;
2536		2936
2537	for my $line (split /\n/, $text) {	2937	for my $para (@_) {
2538	my ($w, $h) = $self->text_size ($line);	2938	$para = {
		2939	fg => [1, 1, 1, 1],
		2940	indent => 0,
		2941	markup => "",
		2942	widget => [],
		2943	ref $para ? %$para : (markup => $para),
		2944	w => 1e10,
		2945	wrapped => 1,
		2946	};
		2947
		2948	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2949	push @{$self->{par}}, $para;
		2950	}
		2951
		2952	$self->{need_reflow}++;
		2953	$self->update;
		2954	}
		2955
		2956	sub scroll_to_bottom {
		2957	my ($self) = @_;
		2958
		2959	$self->{scroll_to} = $#{$self->{par}};
		2960	$self->update;
		2961	}
		2962
		2963	sub force_uptodate {
		2964	my ($self) = @_;
		2965
		2966	if (delete $self->{need_reflow}) {
		2967	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2968
		2969	my $height = 0;
		2970
		2971	for my $para (@{$self->{par}}) {
		2972	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2973	my $layout = $self->get_layout ($para);
		2974	my ($w, $h) = $layout->size;
		2975
		2976	$para->{w} = $w + $para->{indent};
		2977	$para->{h} = $h;
		2978	$para->{wrapped} = $layout->has_wrapped;
		2979	}
		2980
		2981	$para->{y} = $height;
		2982	$height += $para->{h};
		2983	}
		2984
2539	$self->{height} += $h;	2985	$self->{height} = $height;
2540	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2541	}
2542		2987
2543	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2988	delete $self->{texture};
		2989	}
		2990
		2991	if (my $paridx = delete $self->{scroll_to}) {
		2992	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2993	}
2544	}	2994	}
2545		2995
2546	sub update {	2996	sub update {
2547	my ($self) = @_;	2997	my ($self) = @_;
2548		2998
…		…
2550		3000
2551	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2552		3002
2553	delete $self->{texture};	3003	delete $self->{texture};
2554		3004
2555	$ROOT->on_post_alloc ($self, sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2556	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557		3009
2558	if (delete $self->{need_reflow}) {
2559	my $height = 0;
2560
2561	my $layout = $self->{layout};
2562
2563	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565	for (@{$self->{par}}) {
2566	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567	$layout->set_width ($W - $_->[3]);
2568	$layout->set_markup ($_->[4]);
2569	my ($w, $h) = $layout->size;
2570	$_->[0] = $w + $_->[3];
2571	$_->[1] = $h;
2572	}
2573
2574	$height += $_->[1];
2575	}
2576
2577	$self->{height} = $height;
2578
2579	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2580
2581	delete $self->{texture};
2582	}
2583
2584	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2586	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2587		3013
		3014	package CFPlus::UI::Base;
		3015	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3016	(0, 0, $self->{w}, $self->{h});
		3017
		3018	my $top = int $self->{children}[1]{range}[0];
		3019
		3020	my $paridx = 0;
		3021	my $top_paragraph;
2588	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2589		3023
2590	my $y0 = $top;	3024	my $y0 = $top;
2591	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2592		3026
2593	my $y = 0;
2594
2595	my $layout = $self->{layout};
2596
2597	$layout->set_font ($self->{font}) if $self->{font};
2598
2599	glEnable GL_BLEND;
2600	#TODO# not correct in windows where rgba is forced off
2601	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603	for my $par (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2604	my $h = $par->[1];	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2605		3030
2606	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2607	$layout->set_foreground (@{ $par->[2] });	3032	my $layout = $self->get_layout ($para);
2608	$layout->set_width ($W - $par->[3]);
2609	$layout->set_markup ($par->[4]);
2610		3033
2611	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3034	$layout->render ($para->{indent}, $y - $y0);
2612		3035
2613	glRasterPos $par->[3], $y - $y0;	3036	if (my @w = @{ $para->{widget} }) {
2614	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3037	my @s = $layout->get_shapes;
		3038
		3039	for (@w) {
		3040	my ($dx, $dy) = splice @s, 0, 2, ();
		3041
		3042	$_->{x} = $dx + $para->{indent};
		3043	$_->{y} = $dy + $y - $y0;
		3044
		3045	$_->draw;
		3046	}
		3047	}
2615	}	3048	}
2616		3049
2617	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2618	}	3052	}
2619		3053
2620	glDisable GL_BLEND;	3054	$self->{top_paragraph} = $top_paragraph;
2621	};	3055	};
2622	});	3056	});
		3057	}
		3058
		3059	sub reconfigure {
		3060	my ($self) = @_;
		3061
		3062	$self->SUPER::reconfigure;
		3063
		3064	$_->{w} = 1e10 for @{ $self->{par} };
		3065	$self->reflow;
2623	}	3066	}
2624		3067
2625	sub _draw {	3068	sub _draw {
2626	my ($self) = @_;	3069	my ($self) = @_;
2627		3070
…		…
2630	glColor 0, 0, 0, 1;	3073	glColor 0, 0, 0, 1;
2631	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3074	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632	glDisable GL_TEXTURE_2D;	3075	glDisable GL_TEXTURE_2D;
2633		3076
2634	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2635
2636	}	3078	}
2637		3079
2638	#############################################################################	3080	#############################################################################
2639		3081
2640	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2641		3083
2642	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2643		3085
2644	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2645		3087
2646	sub moveto {	3088	sub moveto {
2647	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2648		3090
2649	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2677	glPopMatrix;	3119	glPopMatrix;
2678	}	3120	}
2679		3121
2680	#############################################################################	3122	#############################################################################
2681		3123
2682	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2683		3125
2684	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2685		3127
2686	sub new {	3128	sub new {
2687	my $class = shift;	3129	my $class = shift;
2688		3130
2689	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2701	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2702	}	3144	}
2703		3145
2704	#############################################################################	3146	#############################################################################
2705		3147
2706	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2707		3149
2708	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2709		3151
2710	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2711		3153
2712	sub new {	3154	sub new {
2713	my $class = shift;	3155	my $class = shift;
2714		3156
2715	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2718	)	3160	)
2719	}	3161	}
2720		3162
2721	sub set_tooltip_from {	3163	sub set_tooltip_from {
2722	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2723		3168
2724	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2725		3170
2726	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2727	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
2728	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3173	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729	. "req $widget->{req_w} $widget->{req_h}\n"	3174	. "req $widget->{req_w} $widget->{req_h}\n"
2730	. "visible $widget->{visible}";	3175	. "visible $widget->{visible}";
2731	}	3176	}
2732		3177
		3178	$tooltip =~ s/^\n+//;
		3179	$tooltip =~ s/\n+$//;
		3180
2733	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2734	markup => $tooltip,	3182	markup => $tooltip,
2735	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736	fontsize => 0.8,	3184	fontsize => 0.8,
2737	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2738	ellipsise => 0,	3186	ellipsise => 0,
2739	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2740	);	3188	);
2741	}	3189	}
2742		3190
…		…
2746	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3194	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747		3195
2748	($w + 4, $h + 4)	3196	($w + 4, $h + 4)
2749	}	3197	}
2750		3198
2751	sub size_allocate {	3199	sub invoke_size_allocate {
2752	my ($self, $w, $h) = @_;	3200	my ($self, $w, $h) = @_;
2753		3201
2754	$self->SUPER::size_allocate ($w - 4, $h - 4);	3202	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755	}	3203	}
2756		3204
2757	sub visibility_change {	3205	sub invoke_visibility_change {
2758	my ($self, $visible) = @_;	3206	my ($self, $visible) = @_;
2759		3207
2760	return unless $visible;	3208	return unless $visible;
2761		3209
2762	$self->{root}->on_post_alloc ("move_$self" => sub {	3210	$self->{root}->on_post_alloc ("move_$self" => sub {
2763	my $widget = $self->{owner}	3211	my $widget = $self->{owner}
2764	or return;	3212	or return;
2765		3213
		3214	if ($widget->{visible}) {
2766	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3215	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767		3216
2768	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3217	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769	if $x + $self->{w} > $::WIDTH;	3218	if $x + $self->{w} > $self->{root}{w};
2770		3219
2771	$self->move_abs ($x, $y);	3220	$self->move_abs ($x, $y);
		3221	} else {
		3222	$self->hide;
		3223	}
2772	});	3224	});
2773	}	3225	}
2774		3226
2775	sub _draw {	3227	sub _draw {
2776	my ($self) = @_;	3228	my ($self) = @_;
…		…
2800	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
2801	}	3253	}
2802		3254
2803	#############################################################################	3255	#############################################################################
2804		3256
2805	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
2806		3258
2807	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
2808		3260
2809	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
2810		3262
2811	sub new {	3263	sub new {
2812	my $class = shift;	3264	my $class = shift;
2813		3265
2814	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
2849	sub _draw {	3301	sub _draw {
2850	my ($self) = @_;	3302	my ($self) = @_;
2851		3303
2852	return unless $::CONN;	3304	return unless $::CONN;
2853		3305
		3306	$self->SUPER::_draw;
		3307
2854	my $face;	3308	my $face;
2855		3309
2856	if ($self->{frame}) {	3310	if ($self->{frame}) {
2857	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
2858		3312
…		…
2869	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3323	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870	glDisable GL_TEXTURE_2D;	3324	glDisable GL_TEXTURE_2D;
2871	}	3325	}
2872	}	3326	}
2873		3327
2874	sub DESTROY {	3328	sub destroy {
2875	my ($self) = @_;	3329	my ($self) = @_;
2876		3330
2877	$self->{timer}->cancel	3331	$self->{timer}->cancel
2878	if $self->{timer};	3332	if $self->{timer};
2879		3333
2880	$self->SUPER::DESTROY;	3334	$self->SUPER::destroy;
2881	}	3335	}
2882		3336
2883	#############################################################################	3337	#############################################################################
2884		3338
2885	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
2886		3340
2887	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
2888		3342
2889	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
2890		3344
2891	#############################################################################	3345	#############################################################################
2892		3346
2893	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
2894		3348
2895	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
2896		3350
2897	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
2898		3352
2899	sub new {	3353	sub new {
2900	my $class = shift;	3354	my $class = shift;
2901		3355
2902	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
2903	items => [],	3357	items => [],
2904	z => 100,	3358	z => 100,
2905	@_,	3359	@_,
2906	);	3360	);
2907		3361
2908	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909		3363
2910	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
2911	my ($widget, $cb) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
2912		3366
2913	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
2914	if (!ref $widget) {	3368	if (!ref $widget) {
		3369	if ($widget =~ /\t/) {
		3370	my ($left, $right) = split /\t/, $widget, 2;
		3371
2915	$widget = new CFClient::UI::Label	3372	$widget = new CFPlus::UI::HBox
2916	can_hover => 1,	3373	can_hover => 1,
2917	can_events => 1,	3374	can_events => 1,
		3375	tooltip => $tooltip,
		3376	children => [
		3377	(new CFPlus::UI::Label markup => $left, expand => 1),
		3378	(new CFPlus::UI::Label markup => $right, align => +1),
		3379	],
		3380	;
		3381
		3382	} else {
		3383	$widget = new CFPlus::UI::Label
		3384	can_hover => 1,
		3385	can_events => 1,
2918	text => $widget;	3386	markup => $widget,
		3387	tooltip => $tooltip;
		3388	}
2919	}	3389	}
2920		3390
2921	$self->{item}{$widget} = $item;	3391	$self->{item}{$widget} = $item;
2922		3392
2923	$self->{vbox}->add ($widget);	3393	$self->{vbox}->add ($widget);
…		…
2928		3398
2929	# popup given the event (must be a mouse button down event currently)	3399	# popup given the event (must be a mouse button down event currently)
2930	sub popup {	3400	sub popup {
2931	my ($self, $ev) = @_;	3401	my ($self, $ev) = @_;
2932		3402
2933	$self->_emit ("popdown");	3403	$self->emit ("popdown");
2934		3404
2935	# maybe save $GRAB? must be careful about events...	3405	# maybe save $GRAB? must be careful about events...
2936	$GRAB = $self;	3406	$GRAB = $self;
2937	$self->{button} = $ev->{button};	3407	$self->{button} = $ev->{button};
2938		3408
2939	$self->show;	3409	$self->show;
2940	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3410	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941	}	3411	}
2942		3412
2943	sub mouse_motion {	3413	sub invoke_mouse_motion {
2944	my ($self, $ev, $x, $y) = @_;	3414	my ($self, $ev, $x, $y) = @_;
2945		3415
2946	# TODO: should use vbox->find_widget or so	3416	# TODO: should use vbox->find_widget or so
2947	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3417	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948	$self->{hover} = $self->{item}{$HOVER};	3418	$self->{hover} = $self->{item}{$HOVER};
2949		3419
2950	0	3420	0
2951	}	3421	}
2952		3422
2953	sub button_up {	3423	sub invoke_button_up {
2954	my ($self, $ev, $x, $y) = @_;	3424	my ($self, $ev, $x, $y) = @_;
2955		3425
2956	if ($ev->{button} == $self->{button}) {	3426	if ($ev->{button} == $self->{button}) {
2957	undef $GRAB;	3427	undef $GRAB;
2958	$self->hide;	3428	$self->hide;
2959		3429
2960	$self->_emit ("popdown");	3430	$self->emit ("popdown");
2961	$self->{hover}[1]->() if $self->{hover};	3431	$self->{hover}[1]->() if $self->{hover};
2962	} else {	3432	} else {
2963	return 0	3433	return 0
2964	}	3434	}
2965		3435
2966	1	3436	1
2967	}	3437	}
2968		3438
2969	#############################################################################	3439	#############################################################################
2970		3440
2971	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
2972		3442
2973	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
2974		3444
2975	sub new {	3445	sub new {
2976	my $class = shift;	3446	my $class = shift;
2977		3447
2978	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
2992		3462
2993	$self->{current} = $self->{children}[0]	3463	$self->{current} = $self->{children}[0]
2994	if @{ $self->{children} };	3464	if @{ $self->{children} };
2995	}	3465	}
2996		3466
		3467	sub get_current_page {
		3468	my ($self) = @_;
		3469
		3470	$self->{current}
		3471	}
		3472
2997	sub set_current_page {	3473	sub set_current_page {
2998	my ($self, $page_or_widget) = @_;	3474	my ($self, $page_or_widget) = @_;
2999		3475
3000	my $widget = ref $page_or_widget	3476	my $widget = ref $page_or_widget
3001	? $page_or_widget	3477	? $page_or_widget
3002	: $self->{children}[$page_or_widget];	3478	: $self->{children}[$page_or_widget];
3003		3479
3004	$self->{current} = $widget;	3480	$self->{current} = $widget;
3005	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3481	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006		3482
3007	$self->_emit (page_changed => $self->{current});	3483	$self->emit (page_changed => $self->{current});
3008		3484
3009	$self->realloc;	3485	$self->realloc;
3010	}	3486	}
3011		3487
3012	sub visible_children {	3488	sub visible_children {
…		…
3017	my ($self) = @_;	3493	my ($self) = @_;
3018		3494
3019	$self->{current}->size_request	3495	$self->{current}->size_request
3020	}	3496	}
3021		3497
3022	sub size_allocate {	3498	sub invoke_size_allocate {
3023	my ($self, $w, $h) = @_;	3499	my ($self, $w, $h) = @_;
3024		3500
3025	$self->{current}->configure (0, 0, $w, $h);	3501	$self->{current}->configure (0, 0, $w, $h);
		3502
		3503	1
3026	}	3504	}
3027		3505
3028	sub _draw {	3506	sub _draw {
3029	my ($self) = @_;	3507	my ($self) = @_;
3030		3508
3031	$self->{current}->draw;	3509	$self->{current}->draw;
3032	}	3510	}
3033		3511
3034	#############################################################################	3512	#############################################################################
3035		3513
3036	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3037		3515
3038	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3039		3517
3040	sub new {	3518	sub new {
3041	my $class = shift;	3519	my $class = shift;
3042		3520
3043	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3044	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3045	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3047	@_,	3525	@_,
3048	);	3526	);
3049		3527
3050	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3056	sub add {	3534	sub add {
3057	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3058		3536
3059	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3060		3538
3061	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3062	markup => $title,	3540	markup => $title,
3063	tooltip => $tooltip,	3541	tooltip => $tooltip,
3064	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3065	);	3543	);
3066		3544
3067	$self->{multiplexer}->add ($widget);	3545	$self->{multiplexer}->add ($widget);
3068	}	3546	}
3069		3547
		3548	sub get_current_page {
		3549	my ($self) = @_;
		3550
		3551	$self->{multiplexer}->get_current_page
		3552	}
		3553
3070	sub set_current_page {	3554	sub set_current_page {
3071	my ($self, $page) = @_;	3555	my ($self, $page) = @_;
3072		3556
3073	$self->{multiplexer}->set_current_page ($page);	3557	$self->{multiplexer}->set_current_page ($page);
3074	$self->_emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3075	}	3559	}
3076		3560
3077	#############################################################################	3561	#############################################################################
3078		3562
		3563	package CFPlus::UI::Selector;
		3564
		3565	use utf8;
		3566
		3567	our @ISA = CFPlus::UI::Button::;
		3568
		3569	sub new {
		3570	my $class = shift;
		3571
		3572	my $self = $class->SUPER::new (
		3573	options => [], # [value, title, longdesc], ...
		3574	value => undef,
		3575	@_,
		3576	);
		3577
		3578	$self->_set_value ($self->{value});
		3579
		3580	$self
		3581	}
		3582
		3583	sub invoke_button_down {
		3584	my ($self, $ev) = @_;
		3585
		3586	my @menu_items;
		3587
		3588	for (@{ $self->{options} }) {
		3589	my ($value, $title, $tooltip) = @$_;
		3590
		3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3592	}
		3593
		3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3595	}
		3596
		3597	sub _set_value {
		3598	my ($self, $value) = @_;
		3599
		3600	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3601	or return;
		3602
		3603	$self->{value} = $item->[0];
		3604	$self->set_markup ("$item->[1] ⇓");
		3605	$self->set_tooltip ($item->[2]);
		3606	}
		3607
		3608	sub set_value {
		3609	my ($self, $value) = @_;
		3610
		3611	return unless $self->{value} ne $value;
		3612
		3613	$self->_set_value ($value);
		3614	$self->emit (changed => $value);
		3615	}
		3616
		3617	#############################################################################
		3618
3079	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3080		3620
3081	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3082		3622
3083	sub new {	3623	sub new {
3084	my $class = shift;	3624	my $class = shift;
3085		3625
3086	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3098	sub reorder {	3638	sub reorder {
3099	my ($self) = @_;	3639	my ($self) = @_;
3100	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
3101		3641
3102	# freeze display when hovering over any label	3642	# freeze display when hovering over any label
3103	return if $CFClient::UI::TOOLTIP->{owner}	3643	return if $CFPlus::UI::TOOLTIP->{owner}
3104	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105	values %{ $self->{item} };	3645	values %{ $self->{item} };
3106		3646
3107	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3108	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109	}	3649	}
…		…
3130	for ($short) {	3670	for ($short) {
3131	s/^\s+//;	3671	s/^\s+//;
3132	s/\s+/ /g;	3672	s/\s+/ /g;
3133	}	3673	}
3134		3674
3135	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3136	markup => $short,	3676	markup => $short,
3137	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3138	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3139	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3140	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3178	$item->{count}++;	3718	$item->{count}++;
3179	} else {	3719	} else {
3180	$item->{count} = 1;	3720	$item->{count} = 1;
3181	$item->{text} = $item->{tooltip} = $text;	3721	$item->{text} = $item->{tooltip} = $text;
3182	}	3722	}
3183	$item->{id} = ++$self->{id};	3723	$item->{id} += 0.2;#d#
3184	$item->{timeout} = $timeout;	3724	$item->{timeout} = $timeout;
3185	delete $item->{label};	3725	delete $item->{label};
3186	} else {	3726	} else {
3187	$self->{item}{$group} = {	3727	$self->{item}{$group} = {
3188	id => ++$self->{id},	3728	id => ++$self->{id},
…		…
3194	count => 1,	3734	count => 1,
3195	%arg,	3735	%arg,
3196	};	3736	};
3197	}	3737	}
3198		3738
		3739	$ROOT->on_refresh (reorder => sub {
3199	$self->reorder;	3740	$self->reorder;
		3741	});
3200	}	3742	}
3201		3743
3202	sub reconfigure {	3744	sub reconfigure {
3203	my ($self) = @_;	3745	my ($self) = @_;
3204		3746
…		…
3207		3749
3208	$self->reorder;	3750	$self->reorder;
3209	$self->SUPER::reconfigure;	3751	$self->SUPER::reconfigure;
3210	}	3752	}
3211		3753
3212	sub DESTROY {	3754	sub destroy {
3213	my ($self) = @_;	3755	my ($self) = @_;
3214		3756
3215	$self->{timer}->cancel;	3757	$self->{timer}->cancel;
3216		3758
3217	$self->SUPER::DESTROY;	3759	$self->SUPER::destroy;
3218	}	3760	}
3219		3761
3220	#############################################################################	3762	#############################################################################
3221		3763
3222	package CFClient::UI::Inventory;
3223
3224	our @ISA = CFClient::UI::ScrolledWindow::;
3225
3226	sub new {
3227	my $class = shift;
3228
3229	my $self = $class->SUPER::new (
3230	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231	@_,
3232	);
3233
3234	$self
3235	}
3236
3237	sub set_items {
3238	my ($self, $items) = @_;
3239
3240	$self->{child}->clear;
3241	return unless $items;
3242
3243	my @items = sort {
3244	($a->{type} <=> $b->{type})
3245	or ($a->{name} cmp $b->{name})
3246	} @$items;
3247
3248	$self->{real_items} = \@items;
3249
3250	my $row = 0;
3251	for my $item (@items) {
3252	CFClient::Item::update_widgets $item;
3253
3254	$self->{child}->add (0, $row, $item->{face_widget});
3255	$self->{child}->add (1, $row, $item->{desc_widget});
3256	$self->{child}->add (2, $row, $item->{weight_widget});
3257
3258	$row++;
3259	}
3260	}
3261
3262	#############################################################################
3263
3264	package CFClient::UI::BindEditor;
3265
3266	our @ISA = CFClient::UI::FancyFrame::;
3267
3268	sub new {
3269	my $class = shift;
3270
3271	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273	$self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277	text => "start recording",
3278	tooltip => "Start/Stops recording of actions."
3279	."All subsequent actions after the recording started will be captured."
3280	."The actions are displayed after the record was stopped."
3281	."To bind the action you have to click on the 'Bind' button",
3282	on_activate => sub {
3283	unless ($self->{recording}) {
3284	$self->start;
3285	} else {
3286	$self->stop;
3287	}
3288	});
3289
3290	$vb->add (new CFClient::UI::Label text => "Actions:");
3291	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3294	$vb->add (my $hb = new CFClient::UI::HBox);
3295	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296	$hb->add (new CFClient::UI::Button
3297	text => "bind",
3298	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299	on_activate => sub {
3300	$self->ask_for_bind;
3301	});
3302
3303	$vb->add (my $hb = new CFClient::UI::HBox);
3304	$hb->add (new CFClient::UI::Button
3305	text => "ok",
3306	expand => 1,
3307	tooltip => "This closes the binding editor and saves the binding",
3308	on_activate => sub {
3309	$self->hide;
3310	$self->commit;
3311	});
3312
3313	$hb->add (new CFClient::UI::Button
3314	text => "cancel",
3315	expand => 1,
3316	tooltip => "This closes the binding editor without saving",
3317	on_activate => sub {
3318	$self->hide;
3319	$self->{binding_cancel}->()
3320	if $self->{binding_cancel};
3321	});
3322
3323	$self->update_binding_widgets;
3324
3325	$self
3326	}
3327
3328	sub commit {
3329	my ($self) = @_;
3330	my ($mod, $sym, $cmds) = $self->get_binding;
3331	if ($sym != 0 && @$cmds > 0) {
3332	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333	."'. Don't forget 'Save Config'!");
3334	$self->{binding_change}->($mod, $sym, $cmds)
3335	if $self->{binding_change};
3336	} else {
3337	$::STATUSBOX->add ("No action bound, no key or action specified!");
3338	$self->{binding_cancel}->()
3339	if $self->{binding_cancel};
3340	}
3341	}
3342
3343	sub start {
3344	my ($self) = @_;
3345
3346	$self->{rec_btn}->set_text ("stop recording");
3347	$self->{recording} = 1;
3348	$self->clear_command_list;
3349	$::CONN->start_record if $::CONN;
3350	}
3351
3352	sub stop {
3353	my ($self) = @_;
3354
3355	$self->{rec_btn}->set_text ("start recording");
3356	$self->{recording} = 0;
3357
3358	my $rec;
3359	$rec = $::CONN->stop_record if $::CONN;
3360	return unless ref $rec eq 'ARRAY';
3361	$self->set_command_list ($rec);
3362	}
3363
3364
3365	sub ask_for_bind_and_commit {
3366	my ($self) = @_;
3367	$self->ask_for_bind (1);
3368	}
3369
3370	sub ask_for_bind {
3371	my ($self, $commit) = @_;
3372
3373	CFClient::Binder::open_binding_dialog (sub {
3374	my ($mod, $sym) = @_;
3375	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376	$self->update_binding_widgets;
3377	$self->commit if $commit;
3378	});
3379	}
3380
3381	# $mod and $sym are the modifiers and key symbol
3382	# $cmds is a array ref of strings (the commands)
3383	# $cb is the callback that is executed on OK
3384	# $ccb is the callback that is executed on CANCEL and
3385	# when the binding was unsuccessful on OK
3386	sub set_binding {
3387	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389	$self->clear_command_list;
3390	$self->{recording} = 0;
3391	$self->{rec_btn}->set_text ("start recording");
3392
3393	$self->{binding} = [$mod, $sym];
3394	$self->{commands} = $cmds;
3395
3396	$self->{binding_change} = $cb;
3397	$self->{binding_cancel} = $ccb;
3398
3399	$self->update_binding_widgets;
3400	}
3401
3402	# this is a shortcut method that asks for a binding
3403	# and then just binds it.
3404	sub do_quick_binding {
3405	my ($self, $cmds) = @_;
3406	$self->set_binding (undef, undef, $cmds, sub {
3407	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408	});
3409	$self->ask_for_bind (1);
3410	}
3411
3412	sub update_binding_widgets {
3413	my ($self) = @_;
3414	my ($mod, $sym, $cmds) = $self->get_binding;
3415	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416	$self->set_command_list ($cmds);
3417	}
3418
3419	sub get_binding {
3420	my ($self) = @_;
3421	return (
3422	$self->{binding}->[0],
3423	$self->{binding}->[1],
3424	[ grep { defined $_ } @{$self->{commands}} ]
3425	);
3426	}
3427
3428	sub clear_command_list {
3429	my ($self) = @_;
3430	$self->{cmdbox}->clear ();
3431	}
3432
3433	sub set_command_list {
3434	my ($self, $cmds) = @_;
3435
3436	$self->{cmdbox}->clear ();
3437	$self->{commands} = $cmds;
3438
3439	my $idx = 0;
3440
3441	for (@$cmds) {
3442	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444	my $i = $idx;
3445	$hb->add (new CFClient::UI::Label text => $_);
3446	$hb->add (new CFClient::UI::Button
3447	text => "delete",
3448	tooltip => "Deletes the action from the record",
3449	on_activate => sub {
3450	$self->{cmdbox}->remove ($hb);
3451	$cmds->[$i] = undef;
3452	});
3453
3454
3455	$idx++
3456	}
3457	}
3458
3459	#############################################################################
3460
3461	package CFClient::UI::SpellList;
3462
3463	our @ISA = CFClient::UI::Table::;
3464
3465	sub new {
3466	my $class = shift;
3467
3468	my $self = $class->SUPER::new (
3469	binding => [],
3470	commands => [],
3471	@_,
3472	)
3473	}
3474
3475	# XXX: Do sorting? Argl...
3476	sub add_spell {
3477	my ($self, $spell) = @_;
3478	$self->{spells}->{$spell->{name}} = $spell;
3479
3480	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481	face => $spell->{face},
3482	can_hover => 1,
3483	can_events => 1,
3484	tooltip => $spell->{message});
3485
3486	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487	text => $spell->{name},
3488	can_hover => 1,
3489	can_events => 1,
3490	tooltip => $spell->{message},
3491	expand => 1);
3492
3493	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496	expand => 1);
3497
3498	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499	text => "bind to key",
3500	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501	}
3502
3503	sub rebuild_spell_list {
3504	my ($self) = @_;
3505	$self->{tbl_idx} = 0;
3506	$self->add_spell ($_) for values %{$self->{spells}};
3507	}
3508
3509	sub remove_spell {
3510	my ($self, $spell) = @_;
3511	delete $self->{spells}->{$spell->{name}};
3512	$self->rebuild_spell_list;
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::Root;	3764	package CFPlus::UI::Root;
3518		3765
3519	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3520		3767
3521	use List::Util qw(min max);	3768	use List::Util qw(min max);
3522		3769
3523	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3524		3771
3525	sub new {	3772	sub new {
3526	my $class = shift;	3773	my $class = shift;
3527		3774
3528	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3553	$coord = $max - $size if $coord > $max - $size;	3800	$coord = $max - $size if $coord > $max - $size;
3554		3801
3555	int $coord + 0.5	3802	int $coord + 0.5
3556	}	3803	}
3557		3804
3558	sub size_allocate {	3805	sub invoke_size_allocate {
3559	my ($self, $w, $h) = @_;	3806	my ($self, $w, $h) = @_;
3560		3807
3561	for my $child ($self->children) {	3808	for my $child ($self->children) {
3562	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3809	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563		3810
…		…
3567	$X = _to_pixel $X, $W, $self->{w};	3814	$X = _to_pixel $X, $W, $self->{w};
3568	$Y = _to_pixel $Y, $H, $self->{h};	3815	$Y = _to_pixel $Y, $H, $self->{h};
3569		3816
3570	$child->configure ($X, $Y, $W, $H);	3817	$child->configure ($X, $Y, $W, $H);
3571	}	3818	}
		3819
		3820	1
3572	}	3821	}
3573		3822
3574	sub coord2local {	3823	sub coord2local {
3575	my ($self, $x, $y) = @_;	3824	my ($self, $x, $y) = @_;
3576		3825
…		…
3702	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703		3952
3704	$w = 0 if $w < 0;	3953	$w = 0 if $w < 0;
3705	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3706		3955
		3956	$w = max $widget->{min_w}, $w;
		3957	$h = max $widget->{min_h}, $h;
		3958
		3959	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3960	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3961
		3962	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3963	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3964
3707	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3708	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
3709		3967
3710	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3968	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711	$widget->{old_w} = $widget->{w};	3969	$widget->{old_w} = $widget->{w};
…		…
3734	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3736	glLoadIdentity;	3994	glLoadIdentity;
3737		3995
3738	{	3996	{
3739	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3740		3998
3741	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3742	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3743	}
3744		4001
3745	$self->_draw;	4002	$self->_draw;
		4003	}
3746	}	4004	}
3747		4005
3748	#############################################################################	4006	#############################################################################
3749		4007
3750	package CFClient::UI;	4008	package CFPlus::UI;
3751		4009
3752	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3753	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754		4012
3755	1	4013	1
3756		4014

Diff Legend

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