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

Diff Legend

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