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

Diff Legend

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