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.392 by root, Sat Jul 21 13:37:09 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
…		…
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	}
		1106
		1107	#TODO# update range on size_allocate depending on child?
990		1108
991	sub add {	1109	sub add {
992	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
993		1111
994	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
995	}	1113	}
996		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider}{visible}) {
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider}{visible}) {
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
997	sub update {	1139	sub update {
998	my ($self) = @_;	1140	my ($self) = @_;
999		1141
		1142	$self->update_slider;
1000	$self->SUPER::update;	1143	$self->SUPER::update;
1001
1002	# todo: overwrite size_allocate of child
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1144	}
1006		1145
		1146	sub invoke_mouse_wheel {
		1147	my ($self, $ev) = @_;
		1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev)
		1150	if $ev->{dy};
		1151
		1152	$self->{hslider}->emit (mouse_wheel => $ev)
		1153	if $ev->{dx};
		1154
		1155	1
		1156	}
		1157
		1158	sub invoke_button_down {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if ($ev->{button} == 2) {
		1162	$self->grab_focus;
		1163
		1164	my $ox = $self->{vp}{view_x} + $ev->{x};
		1165	my $oy = $self->{vp}{view_y} + $ev->{y};
		1166
		1167	$self->{motion} = sub {
		1168	my ($ev, $x, $y) = @_;
		1169
		1170	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1171	$self->update;
		1172	};
		1173
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_button_up {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if (delete $self->{motion}) {
		1184	return 1;
		1185	}
		1186
		1187	0
		1188	}
		1189
		1190	sub invoke_mouse_motion {
		1191	my ($self, $ev, $x, $y) = @_;
		1192
		1193	if ($self->{motion}) {
		1194	$self->{motion}->($ev, $x, $y);
		1195	return 1;
		1196	}
		1197
		1198	0
		1199	}
		1200
1007	sub size_allocate {	1201	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1202	my ($self, $w, $h) = @_;
1009		1203
		1204	$self->update_slider;
1010	$self->SUPER::size_allocate ($w, $h);	1205	$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	}	1206	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1207
1019	#############################################################################	1208	#############################################################################
1020		1209
1021	package CFClient::UI::Frame;	1210	package CFPlus::UI::Frame;
1022		1211
1023	our @ISA = CFClient::UI::Bin::;	1212	our @ISA = CFPlus::UI::Bin::;
1024		1213
1025	use CFClient::OpenGL;	1214	use CFPlus::OpenGL;
1026		1215
1027	sub new {	1216	sub new {
1028	my $class = shift;	1217	my $class = shift;
1029		1218
1030	$class->SUPER::new (	1219	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1245	$self->SUPER::_draw;
1057	}	1246	}
1058		1247
1059	#############################################################################	1248	#############################################################################
1060		1249
1061	package CFClient::UI::FancyFrame;	1250	package CFPlus::UI::FancyFrame;
1062		1251
1063	our @ISA = CFClient::UI::Bin::;	1252	our @ISA = CFPlus::UI::Bin::;
1064		1253
1065	use CFClient::OpenGL;	1254	use CFPlus::OpenGL;
		1255
		1256	sub new {
		1257	my ($class, %arg) = @_;
		1258
		1259	if ((exists $arg{label}) && !ref $arg{label}) {
		1260	$arg{label} = new CFPlus::UI::Label
		1261	align => 1,
		1262	valign => 0,
		1263	text => $arg{label},
		1264	fontsize => ($arg{border} || 0.8) * 0.75;
		1265	}
		1266
		1267	my $self = $class->SUPER::new (
		1268	# label => "",
		1269	fg => [0.6, 0.3, 0.1],
		1270	border => 0.8,
		1271	style => 'single',
		1272	%arg,
		1273	);
		1274
		1275	$self
		1276	}
		1277
		1278	sub add {
		1279	my ($self, @widgets) = @_;
		1280
		1281	$self->SUPER::add (@widgets);
		1282	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1283	}
		1284
		1285	sub border {
		1286	int $_[0]{border} * $::FONTSIZE
		1287	}
		1288
		1289	sub size_request {
		1290	my ($self) = @_;
		1291
		1292	($self->{label_w}, undef) = $self->{label}->size_request
		1293	if $self->{label};
		1294
		1295	my ($w, $h) = $self->SUPER::size_request;
		1296
		1297	(
		1298	$w + $self->border * 2,
		1299	$h + $self->border * 2,
		1300	)
		1301	}
		1302
		1303	sub invoke_size_allocate {
		1304	my ($self, $w, $h) = @_;
		1305
		1306	my $border = $self->border;
		1307
		1308	$w -= List::Util::max 0, $border * 2;
		1309	$h -= List::Util::max 0, $border * 2;
		1310
		1311	if (my $label = $self->{label}) {
		1312	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1313	$label->{h} = List::Util::min $h, $border;
		1314	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1315	}
		1316
		1317	$self->child->configure ($border, $border, $w, $h);
		1318
		1319	1
		1320	}
		1321
		1322	sub _draw {
		1323	my ($self) = @_;
		1324
		1325	my $child = $self->{children}[0];
		1326
		1327	my $border = $self->border;
		1328	my ($w, $h) = ($self->{w}, $self->{h});
		1329
		1330	$child->draw;
		1331
		1332	glColor @{$self->{fg}};
		1333	glBegin GL_LINE_STRIP;
		1334	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1338	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1339	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1340	glEnd;
		1341
		1342	if ($self->{label}) {
		1343	glTranslate $border * 2, 0;
		1344	$self->{label}->_draw;
		1345	}
		1346	}
		1347
		1348	#############################################################################
		1349
		1350	package CFPlus::UI::Toplevel;
		1351
		1352	our @ISA = CFPlus::UI::Bin::;
		1353
		1354	use CFPlus::OpenGL;
1066		1355
1067	my $bg =	1356	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1357	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1358	mipmap => 1, wrap => 1;
1070		1359
1071	my @border =	1360	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1361	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);	1362	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1363
		1364	my @icon =
		1365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1366	qw(x1_move.png x1_resize.png);
1074		1367
1075	sub new {	1368	sub new {
1076	my ($class, %arg) = @_;	1369	my ($class, %arg) = @_;
1077		1370
1078	my $self = $class->SUPER::new (	1371	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1372	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1373	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1374	border => 0.6,
1082	can_events => 1,	1375	can_events => 1,
1083	min_w => 16,	1376	min_w => 64,
1084	min_h => 16,	1377	min_h => 32,
1085	%arg,	1378	%arg,
1086	);	1379	);
1087		1380
1088	$self->{title_widget} = new CFClient::UI::Label	1381	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1382	align => 0,
1090	valign => 1,	1383	valign => 1,
1091	text => $self->{title},	1384	text => $self->{title},
1092	fontsize => $self->{border},	1385	fontsize => $self->{border},
1093	if exists $self->{title};	1386	if exists $self->{title};
1094		1387
1095	unless ($self->{no_close_button}) {	1388	if ($self->{has_close_button}) {
1096	$self->{close_btn} =	1389	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1390	new CFPlus::UI::ImageButton
1098	image => 'x1_close.png',	1391	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1392	on_activate => sub { $self->emit ("delete") };
1100		1393
1101	$self->CFClient::UI::Container::add ($self->{close_btn});	1394	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1395	}
1103		1396
1104	$self	1397	$self
1105	}	1398	}
1106		1399
1107	sub add {	1400	sub add {
1108	my ($self, @widgets) = @_;	1401	my ($self, @widgets) = @_;
1109		1402
1110	$self->SUPER::add (@widgets);	1403	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};	1404	$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};	1405	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1406	}
1114		1407
1115	sub border {	1408	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1409	int $_[0]{border} * $::FONTSIZE
1117	}	1410	}
…		…
1120	my ($self) = @_;	1413	my ($self) = @_;
1121		1414
1122	$self->{title_widget}->size_request	1415	$self->{title_widget}->size_request
1123	if $self->{title_widget};	1416	if $self->{title_widget};
1124		1417
1125	$self->{close_btn}->size_request	1418	$self->{close_button}->size_request
1126	if $self->{close_btn};	1419	if $self->{close_button};
1127		1420
1128	my ($w, $h) = $self->SUPER::size_request;	1421	my ($w, $h) = $self->SUPER::size_request;
1129		1422
1130	(	1423	(
1131	$w + $self->border * 2,	1424	$w + $self->border * 2,
1132	$h + $self->border * 2,	1425	$h + $self->border * 2,
1133	)	1426	)
1134	}	1427	}
1135		1428
1136	sub size_allocate {	1429	sub invoke_size_allocate {
1137	my ($self, $w, $h) = @_;	1430	my ($self, $w, $h) = @_;
1138		1431
1139	if ($self->{title_widget}) {	1432	if ($self->{title_widget}) {
1140	$self->{title_widget}{w} = $w;	1433	$self->{title_widget}{w} = $w;
1141	$self->{title_widget}{h} = $h;	1434	$self->{title_widget}{h} = $h;
1142	$self->{title_widget}->size_allocate ($w, $h);	1435	$self->{title_widget}->invoke_size_allocate ($w, $h);
1143	}	1436	}
1144		1437
1145	my $border = $self->border;	1438	my $border = $self->border;
1146		1439
1147	$h -= List::Util::max 0, $border * 2;	1440	$h -= List::Util::max 0, $border * 2;
1148	$w -= List::Util::max 0, $border * 2;	1441	$w -= List::Util::max 0, $border * 2;
1149		1442
1150	$self->child->configure ($border, $border, $w, $h);	1443	$self->child->configure ($border, $border, $w, $h);
1151		1444
1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)	1445	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_btn};	1446	if $self->{close_button};
1154	}
1155		1447
		1448	1
		1449	}
		1450
		1451	sub invoke_delete {
		1452	my ($self) = @_;
		1453
		1454	$self->hide;
		1455
		1456	1
		1457	}
		1458
1156	sub button_down {	1459	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1460	my ($self, $ev, $x, $y) = @_;
1158		1461
1159	my ($w, $h) = @$self{qw(w h)};	1462	my ($w, $h) = @$self{qw(w h)};
1160	my $border = $self->border;	1463	my $border = $self->border;
1161		1464
…		…
1192		1495
1193	($x, $y) = ($ev->{x}, $ev->{y});	1496	($x, $y) = ($ev->{x}, $ev->{y});
1194		1497
1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1498	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196	# HACK: the next line is required to enforce placement	1499	# HACK: the next line is required to enforce placement
1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1500	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198	};	1501	};
1199	} else {	1502	} else {
1200	return 0;	1503	return 0;
1201	}	1504	}
1202		1505
1203	1	1506	1
1204	}	1507	}
1205		1508
1206	sub button_up {	1509	sub invoke_button_up {
1207	my ($self, $ev, $x, $y) = @_;	1510	my ($self, $ev, $x, $y) = @_;
1208		1511
1209	$self->{close_btn}->button_up ($ev, $x, $y)
1210	if $self->{close_btn};
1211
1212	!!delete $self->{motion}	1512	! ! delete $self->{motion}
1213	}	1513	}
1214		1514
1215	sub mouse_motion {	1515	sub invoke_mouse_motion {
1216	my ($self, $ev, $x, $y) = @_;	1516	my ($self, $ev, $x, $y) = @_;
1217		1517
1218	$self->{motion}->($ev, $x, $y) if $self->{motion};	1518	$self->{motion}->($ev, $x, $y) if $self->{motion};
1219		1519
1220	!!$self->{motion}	1520	! ! $self->{motion}
		1521	}
		1522
		1523	sub invoke_visibility_change {
		1524	my ($self, $visible) = @_;
		1525
		1526	delete $self->{motion} unless $visible;
		1527
		1528	0
1221	}	1529	}
1222		1530
1223	sub _draw {	1531	sub _draw {
1224	my ($self) = @_;	1532	my ($self) = @_;
1225		1533
…		…
1232	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1540	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1233		1541
1234	my $border = $self->border;	1542	my $border = $self->border;
1235		1543
1236	glColor @{ $self->{border_bg} };	1544	glColor @{ $self->{border_bg} };
1237	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1545	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1238	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1546	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1239	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1547	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1240	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1548	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1549
		1550	# move
		1551	my $w2 = ($w - $border) * .5;
		1552	my $h2 = ($h - $border) * .5;
		1553	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1556
		1557	# resize
		1558	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1560	unless $self->{has_close_button};
		1561	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1562	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1241		1563
1242	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1564	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1243	glColor @{ $self->{bg} };	1565	glColor @{ $self->{bg} };
1244		1566
1245	# TODO: repeat texture not scale	1567	# TODO: repeat texture not scale
…		…
1258	$self->{title_widget}->_draw;	1580	$self->{title_widget}->_draw;
1259		1581
1260	glTranslate 0, - ($border - $self->{h});	1582	glTranslate 0, - ($border - $self->{h});
1261	}	1583	}
1262		1584
1263	$self->{close_btn}->draw	1585	$self->{close_button}->draw
1264	if $self->{close_btn};	1586	if $self->{close_button};
1265	}	1587	}
1266		1588
1267	#############################################################################	1589	#############################################################################
1268		1590
1269	package CFClient::UI::Table;	1591	package CFPlus::UI::Table;
1270		1592
1271	our @ISA = CFClient::UI::Base::;	1593	our @ISA = CFPlus::UI::Container::;
1272		1594
1273	use List::Util qw(max sum);	1595	use List::Util qw(max sum);
1274		1596
1275	use CFClient::OpenGL;	1597	use CFPlus::OpenGL;
1276		1598
1277	sub new {	1599	sub new {
1278	my $class = shift;	1600	my $class = shift;
1279		1601
1280	$class->SUPER::new (	1602	$class->SUPER::new (
1281	col_expand => [],	1603	col_expand => [],
		1604	row_expand => [],
1282	@_,	1605	@_,
1283	)	1606	)
1284	}	1607	}
1285		1608
1286	sub children {
1287	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288	}
1289
1290	sub add {	1609	sub add {
1291	my ($self, $x, $y, $child) = @_;	1610	my ($self, @widgets) = @_;
1292		1611
1293	$child->set_parent ($self);	1612	for my $child (@widgets) {
1294	$self->{children}[$y][$x] = $child;	1613	$child->{rowspan} ||= 1;
		1614	$child->{colspan} ||= 1;
		1615	}
1295		1616
1296	$self->realloc;	1617	$self->SUPER::add (@widgets);
1297	}	1618	}
1298		1619
1299	sub remove {	1620	sub add_at {
		1621	my $self = shift;
		1622
		1623	my @widgets;
		1624
		1625	while (@_) {
		1626	my ($col, $row, $child) = splice @_, 0, 3, ();
		1627
		1628	$child->{row} = $row;
		1629	$child->{col} = $col;
		1630
		1631	push @widgets, $child;
		1632	}
		1633
		1634	$self->add (@widgets);
		1635	}
		1636
		1637	sub get_wh {
1300	my ($self, $child) = @_;	1638	my ($self) = @_;
1301		1639
1302	# TODO: not yet implemented	1640	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		1641
1309	my @children = $self->children;	1642	my @children = $self->children;
1310	delete $self->{children};	1643
		1644	# first pass, columns
		1645	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1646	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1647
		1648	my $sw = sum @w[$c .. $c + $cs - 1];
		1649
		1650	if ($w > $sw) {
		1651	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1652	}
1311		1653	}
1312	for (@children) {
1313	delete $_->{parent};
1314	$_->hide;
1315	}
1316		1654
1317	$self->realloc;	1655	# second pass, rows
1318	}	1656	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)};	1657	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1333		1658
1334	$w[$x] = max $w[$x], $w;	1659	my $sh = sum @h[$r .. $r + $rs - 1];
1335	$h[$y] = max $h[$y], $h;	1660
		1661	if ($h > $sh) {
		1662	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1336	}	1663	}
1337	}	1664	}
1338		1665
1339	(\@w, \@h)	1666	(\@w, \@h)
1340	}	1667	}
…		…
1348	(sum @$ws),	1675	(sum @$ws),
1349	(sum @$hs),	1676	(sum @$hs),
1350	)	1677	)
1351	}	1678	}
1352		1679
1353	sub size_allocate {	1680	sub invoke_size_allocate {
1354	my ($self, $w, $h) = @_;	1681	my ($self, $w, $h) = @_;
1355		1682
1356	my ($ws, $hs) = $self->get_wh;	1683	my ($ws, $hs) = $self->get_wh;
1357		1684
1358	my $req_w = (sum @$ws) || 1;	1685	my $req_w = (sum @$ws) || 1;
1359	my $req_h = (sum @$hs) || 1;	1686	my $req_h = (sum @$hs) || 1;
1360		1687
1361	# TODO: nicer code && do row_expand	1688	# now linearly scale the rows/columns to the allocated size
1362	my @col_expand = @{$self->{col_expand}};	1689	my @col_expand = @{$self->{col_expand}};
1363	@col_expand = (1) x @$ws unless @col_expand;	1690	@col_expand = (1) x @$ws unless @col_expand;
1364	my $col_expand = (sum @col_expand) || 1;	1691	my $col_expand = (sum @col_expand) || 1;
1365		1692
1366	# linearly scale sizes
1367	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1693	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369		1694
1370	CFClient::UI::harmonize $ws;	1695	CFPlus::UI::harmonize $ws;
		1696
		1697	my @row_expand = @{$self->{row_expand}};
		1698	@row_expand = (1) x @$ws unless @row_expand;
		1699	my $row_expand = (sum @row_expand) || 1;
		1700
		1701	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1702
1371	CFClient::UI::harmonize $hs;	1703	CFPlus::UI::harmonize $hs;
1372		1704
1373	my $y;	1705	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1706	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1374		1707
1375	for my $r (0 .. $#{$self->{children}}) {	1708	for my $widget ($self->children) {
1376	my $row = $self->{children}[$r]	1709	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1377	or next;
1378		1710
1379	my $x = 0;	1711	$widget->configure (
1380	my $row_h = $hs->[$r];	1712	$x[$c], $y[$r],
		1713	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1381		1714	);
1382	for my $c (0 .. $#$row) {	1715	}
1383	my $col_w = $ws->[$c];
1384		1716
1385	if (my $widget = $row->[$c]) {	1717	1
1386	$widget->configure ($x, $y, $col_w, $row_h);	1718	}
1387	}
1388		1719
1389	$x += $col_w;	1720	#############################################################################
		1721
		1722	package CFPlus::UI::Fixed;
		1723
		1724	use List::Util qw(min max);
		1725
		1726	our @ISA = CFPlus::UI::Container::;
		1727
		1728	sub add {
		1729	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1730
		1731	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1732	$self->SUPER::add ($child);
		1733	}
		1734
		1735	sub _scale($$$) {
		1736	my ($mode, $val, $max) = @_;
		1737
		1738	$mode eq "abs" ? $val
		1739	: $mode eq "rel" ? $val * $max
		1740	: 0
		1741	}
		1742
		1743	sub size_request {
		1744	my ($self) = @_;
		1745
		1746	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1747
		1748	# determine overall size by querying abs widgets
		1749	for my $child ($self->visible_children) {
		1750	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1751
		1752	if ($pos eq "abs") {
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1757	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1390	}	1758	}
1391
1392	$y += $row_h;
1393	}	1759	}
1394		1760
1395	}	1761	my $W = $x2 - $x1;
		1762	my $H = $y2 - $y1;
1396		1763
1397	sub find_widget {	1764	# now layout remaining widgets
		1765	for my $child ($self->visible_children) {
		1766	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1767
		1768	if ($pos ne "abs") {
		1769	$x = _scale $pos, $x, $W;
		1770	$y = _scale $pos, $x, $H;
		1771	$w = _scale $size, $w, $child->{req_w};
		1772	$h = _scale $size, $h, $child->{req_h};
		1773
		1774	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1775	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1776	}
		1777	}
		1778
		1779	my $W = $x2 - $x1;
		1780	my $H = $y2 - $y1;
		1781
		1782	($W, $H)
		1783	}
		1784
		1785	sub invoke_size_allocate {
1398	my ($self, $x, $y) = @_;	1786	my ($self, $W, $H) = @_;
1399		1787
1400	$x -= $self->{x};	1788	for my $child ($self->visible_children) {
1401	$y -= $self->{y};	1789	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1402		1790
1403	my $res;	1791	$x = _scale $pos, $x, $W;
		1792	$y = _scale $pos, $x, $H;
		1793	$w = _scale $size, $w, $child->{req_w};
		1794	$h = _scale $size, $h, $child->{req_h};
1404		1795
1405	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1796	$child->configure ($x, $y, $w, $h);
1406	$res = $_->find_widget ($x, $y)	1797	}
1407	and return $res;	1798
1408	}	1799	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	}	1800	}
1420		1801
1421	#############################################################################	1802	#############################################################################
1422		1803
1423	package CFClient::UI::Box;	1804	package CFPlus::UI::Box;
1424		1805
1425	our @ISA = CFClient::UI::Container::;	1806	our @ISA = CFPlus::UI::Container::;
1426		1807
1427	sub size_request {	1808	sub size_request {
1428	my ($self) = @_;	1809	my ($self) = @_;
1429		1810
1430	$self->{vertical}	1811	$self->{vertical}
…		…
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1817	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1818	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1438	)	1819	)
1439	}	1820	}
1440		1821
1441	sub size_allocate {	1822	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1823	my ($self, $w, $h) = @_;
1443		1824
1444	my $space = $self->{vertical} ? $h : $w;	1825	my $space = $self->{vertical} ? $h : $w;
1445	my $children = $self->{children};	1826	my @children = $self->visible_children;
1446		1827
1447	my @req;	1828	my @req;
1448		1829
1449	if ($self->{homogeneous}) {	1830	if ($self->{homogeneous}) {
1450	@req = ($space / (@$children || 1)) x @$children;	1831	@req = ($space / (@children || 1)) x @children;
1451	} else {	1832	} else {
1452	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1833	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453	my $req = List::Util::sum @req;	1834	my $req = List::Util::sum @req;
1454		1835
1455	if ($req > $space) {	1836	if ($req > $space) {
1456	# ah well, not enough space	1837	# ah well, not enough space
1457	$_ *= $space / $req for @req;	1838	$_ *= $space / $req for @req;
1458	} else {	1839	} else {
1459	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1840	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460		1841
1461	$space = ($space - $req) / $expand; # remaining space to give away	1842	$space = ($space - $req) / $expand; # remaining space to give away
1462		1843
1463	$req[$_] += $space * $children->[$_]{expand}	1844	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#$children;	1845	for 0 .. $#children;
1465	}	1846	}
1466	}	1847	}
1467		1848
1468	CFClient::UI::harmonize \@req;	1849	CFPlus::UI::harmonize \@req;
1469		1850
1470	my $pos = 0;	1851	my $pos = 0;
1471	for (0 .. $#$children) {	1852	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1853	my $alloc = $req[$_];
1473	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1854	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474		1855
1475	$pos += $alloc;	1856	$pos += $alloc;
1476	}	1857	}
1477		1858
1478	1	1859	1
1479	}	1860	}
1480		1861
1481	#############################################################################	1862	#############################################################################
1482		1863
1483	package CFClient::UI::HBox;	1864	package CFPlus::UI::HBox;
1484		1865
1485	our @ISA = CFClient::UI::Box::;	1866	our @ISA = CFPlus::UI::Box::;
1486		1867
1487	sub new {	1868	sub new {
1488	my $class = shift;	1869	my $class = shift;
1489		1870
1490	$class->SUPER::new (	1871	$class->SUPER::new (
…		…
1493	)	1874	)
1494	}	1875	}
1495		1876
1496	#############################################################################	1877	#############################################################################
1497		1878
1498	package CFClient::UI::VBox;	1879	package CFPlus::UI::VBox;
1499		1880
1500	our @ISA = CFClient::UI::Box::;	1881	our @ISA = CFPlus::UI::Box::;
1501		1882
1502	sub new {	1883	sub new {
1503	my $class = shift;	1884	my $class = shift;
1504		1885
1505	$class->SUPER::new (	1886	$class->SUPER::new (
…		…
1508	)	1889	)
1509	}	1890	}
1510		1891
1511	#############################################################################	1892	#############################################################################
1512		1893
1513	package CFClient::UI::Label;	1894	package CFPlus::UI::Label;
1514		1895
1515	our @ISA = CFClient::UI::DrawBG::;	1896	our @ISA = CFPlus::UI::DrawBG::;
1516		1897
1517	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1518		1899
1519	sub new {	1900	sub new {
1520	my ($class, %arg) = @_;	1901	my ($class, %arg) = @_;
1521		1902
1522	my $self = $class->SUPER::new (	1903	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1906	#active_bg => none
1526	#font => default_font	1907	#font => default_font
1527	#text => initial text	1908	#text => initial text
1528	#markup => initial narkup	1909	#markup => initial narkup
1529	#max_w => maximum pixel width	1910	#max_w => maximum pixel width
		1911	#style => 0, # render flags
1530	ellipsise => 3, # end	1912	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1913	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1914	fontsize => 1,
1533	align => -1,	1915	align => -1,
1534	valign => -1,	1916	valign => -1,
1535	padding_x => 2,	1917	padding_x => 2,
1536	padding_y => 2,	1918	padding_y => 2,
1537	can_events => 0,	1919	can_events => 0,
1538	%arg	1920	%arg
1539	);	1921	);
1540		1922
1541	if (exists $self->{template}) {	1923	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1924	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1925	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1926	$self->{template} = $layout;
1545	}	1927	}
1546		1928
1547	if (exists $self->{markup}) {	1929	if (exists $self->{markup}) {
…		…
1551	}	1933	}
1552		1934
1553	$self	1935	$self
1554	}	1936	}
1555		1937
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 {	1938	sub update {
1567	my ($self) = @_;	1939	my ($self) = @_;
1568		1940
1569	delete $self->{texture};	1941	delete $self->{texture};
1570	$self->SUPER::update;	1942	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1953	my ($self, $text) = @_;
1582		1954
1583	return if $self->{text} eq "T$text";	1955	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1956	$self->{text} = "T$text";
1585		1957
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1958	$self->{layout}->set_text ($text);
1588		1959
1589	delete $self->{size_req};	1960	delete $self->{size_req};
1590	$self->realloc;	1961	$self->realloc;
1591	$self->update;	1962	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1968	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1969	$self->{text} = "M$markup";
1599		1970
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1971	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1972
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1973	$self->{layout}->set_markup ($markup);
1604		1974
1605	delete $self->{size_req};	1975	delete $self->{size_req};
1606	$self->realloc;	1976	$self->realloc;
1607	$self->update;	1977	$self->update;
…		…
1619		1989
1620	my ($w, $h) = $self->{layout}->size;	1990	my ($w, $h) = $self->{layout}->size;
1621		1991
1622	if (exists $self->{template}) {	1992	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1993	$self->{template}->set_font ($self->{font}) if $self->{font};
		1994	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1995	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1996
1626	my ($w2, $h2) = $self->{template}->size;	1997	my ($w2, $h2) = $self->{template}->size;
1627		1998
1628	$w = List::Util::max $w, $w2;	1999	$w = List::Util::max $w, $w2;
…		…
1633	};	2004	};
1634		2005
1635	@{ $self->{size_req} }	2006	@{ $self->{size_req} }
1636	}	2007	}
1637		2008
		2009	sub baseline_shift {
		2010	$_[0]{layout}->descent
		2011	}
		2012
1638	sub size_allocate {	2013	sub invoke_size_allocate {
1639	my ($self, $w, $h) = @_;	2014	my ($self, $w, $h) = @_;
1640		2015
1641	delete $self->{ox};	2016	delete $self->{ox};
1642		2017
1643	delete $self->{texture}	2018	delete $self->{texture}
1644	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2019	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2020
		2021	1
1645	}	2022	}
1646		2023
1647	sub set_fontsize {	2024	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2025	my ($self, $fontsize) = @_;
1649		2026
1650	$self->{fontsize} = $fontsize;	2027	$self->{fontsize} = $fontsize;
		2028	delete $self->{size_req};
1651	delete $self->{texture};	2029	delete $self->{texture};
1652		2030
1653	$self->realloc;	2031	$self->realloc;
1654	}	2032	}
1655		2033
1656	sub reconfigure {	2034	sub reconfigure {
1657	my ($self) = @_;	2035	my ($self) = @_;
1658		2036
1659	delete $self->{size_req};	2037	delete $self->{size_req};
		2038	delete $self->{texture};
1660		2039
1661	$self->SUPER::reconfigure;	2040	$self->SUPER::reconfigure;
1662	}	2041	}
1663		2042
1664	sub _draw {	2043	sub _draw {
1665	my ($self) = @_;	2044	my ($self) = @_;
1666		2045
1667	$self->SUPER::_draw; # draw background, if applicable	2046	$self->SUPER::_draw; # draw background, if applicable
1668		2047
1669	my $tex = $self->{texture} ||= do {	2048	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2049	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2050	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2051	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2052	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2053	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2054	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2055
1677	new_from_layout CFClient::Texture $self->{layout}	2056	[$self->{layout}->size]
1678	};	2057	};
1679		2058
1680	unless (exists $self->{ox}) {	2059	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2060	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2061	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2062	: ($self->{w} - $size->[0]) * 0.5);
1684		2063
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2064	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2065	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2066	: ($self->{h} - $size->[1]) * 0.5);
1688	};	2067	};
1689		2068
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2069	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2070	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		2071
1695	if ($tex->{format} == GL_ALPHA) {	2072	$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	}	2073	}
1706		2074
1707	#############################################################################	2075	#############################################################################
1708		2076
1709	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1710		2078
1711	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1712		2080
1713	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1714		2082
1715	sub new {	2083	sub new {
1716	my $class = shift;	2084	my $class = shift;
1717		2085
1718	$class->SUPER::new (	2086	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	2090	active_fg => [0, 0, 0],
1723	can_hover => 1,	2091	can_hover => 1,
1724	can_focus => 1,	2092	can_focus => 1,
1725	valign => 0,	2093	valign => 0,
1726	can_events => 1,	2094	can_events => 1,
		2095	ellipsise => 0,
1727	#text => ...	2096	#text => ...
1728	#hidden => "*",	2097	#hidden => "*",
1729	@_	2098	@_
1730	)	2099	)
1731	}	2100	}
…		…
1742		2111
1743	$text =~ s/./*/g if $self->{hidden};	2112	$text =~ s/./*/g if $self->{hidden};
1744	$self->{layout}->set_text ("$text ");	2113	$self->{layout}->set_text ("$text ");
1745	delete $self->{size_req};	2114	delete $self->{size_req};
1746		2115
1747	$self->_emit (changed => $self->{text});	2116	$self->emit (changed => $self->{text});
1748		2117
1749	$self->realloc;	2118	$self->realloc;
1750	$self->update;	2119	$self->update;
1751	}	2120	}
1752		2121
…		…
1767	my ($w, $h) = $self->SUPER::size_request;	2136	my ($w, $h) = $self->SUPER::size_request;
1768		2137
1769	($w + 1, $h) # add 1 for cursor	2138	($w + 1, $h) # add 1 for cursor
1770	}	2139	}
1771		2140
1772	sub key_down {	2141	sub invoke_key_down {
1773	my ($self, $ev) = @_;	2142	my ($self, $ev) = @_;
1774		2143
1775	my $mod = $ev->{mod};	2144	my $mod = $ev->{mod};
1776	my $sym = $ev->{sym};	2145	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2146	my $uni = $ev->{unicode};
1778		2147
1779	my $text = $self->get_text;	2148	my $text = $self->get_text;
		2149
		2150	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1780		2151
1781	if ($uni == 8) {	2152	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2153	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2154	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2155	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2156	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2157	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2158	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2159	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2160	} elsif ($sym == CFPlus::SDLK_HOME) {
		2161	# what a hack
		2162	$self->{cursor} =
		2163	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2164	? length $1
		2165	: 0;
		2166	} elsif ($sym == CFPlus::SDLK_END) {
		2167	# uh, again
		2168	$self->{cursor} =
		2169	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2170	? $self->{cursor} + length $1
		2171	: length $self->{text};
		2172	} elsif ($uni == 21) { # ctrl-u
		2173	$text = "";
1790	$self->{cursor} = 0;	2174	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2175	} elsif ($uni == 27) {
1794	$self->_emit ('escape');	2176	$self->emit ('escape');
1795	} elsif ($uni) {	2177	} elsif ($uni == 0x0d) {
		2178	substr $text, $self->{cursor}++, 0, "\012";
		2179	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2180	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2181	} else {
1798	return 0;	2182	return 0;
1799	}	2183	}
1800		2184
1801	$self->_set_text ($text);	2185	$self->_set_text ($text);
1802		2186
1803	$self->realloc;	2187	$self->realloc;
		2188	$self->update;
1804		2189
1805	1	2190	1
1806	}	2191	}
1807		2192
1808	sub focus_in {	2193	sub invoke_focus_in {
1809	my ($self) = @_;	2194	my ($self) = @_;
1810		2195
1811	$self->{last_activity} = $::NOW;	2196	$self->{last_activity} = $::NOW;
1812		2197
1813	$self->SUPER::focus_in;	2198	$self->SUPER::invoke_focus_in
1814	}	2199	}
1815		2200
1816	sub button_down {	2201	sub invoke_button_down {
1817	my ($self, $ev, $x, $y) = @_;	2202	my ($self, $ev, $x, $y) = @_;
1818		2203
1819	$self->SUPER::button_down ($ev, $x, $y);	2204	$self->SUPER::invoke_button_down ($ev, $x, $y);
1820		2205
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2206	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2207
1823	# byte-index to char-index	2208	# byte-index to char-index
1824	my $text = $self->{text};	2209	my $text = $self->{text};
1825	utf8::encode $text;	2210	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2211	$self->{cursor} = length $text;
1827		2212
1828	$self->_set_text ($self->{text});	2213	$self->_set_text ($self->{text});
1829	$self->update;	2214	$self->update;
1830		2215
1831	1	2216	1
1832	}	2217	}
1833		2218
1834	sub mouse_motion {	2219	sub invoke_mouse_motion {
1835	my ($self, $ev, $x, $y) = @_;	2220	my ($self, $ev, $x, $y) = @_;
1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2221	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837		2222
1838	0	2223	1
1839	}	2224	}
1840		2225
1841	sub _draw {	2226	sub _draw {
1842	my ($self) = @_;	2227	my ($self) = @_;
1843		2228
…		…
1870	utf8::encode $text;	2255	utf8::encode $text;
1871		2256
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2258	}
1874		2259
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2260	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2261	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};	2262	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2263	glEnd;
1880	}	2264	}
1881	}	2265	}
1882		2266
		2267	#############################################################################
		2268
1883	package CFClient::UI::Entry;	2269	package CFPlus::UI::Entry;
1884		2270
1885	our @ISA = CFClient::UI::EntryBase::;	2271	our @ISA = CFPlus::UI::EntryBase::;
1886		2272
1887	use CFClient::OpenGL;	2273	use CFPlus::OpenGL;
1888		2274
1889	sub key_down {	2275	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2276	my ($self, $ev) = @_;
1891		2277
1892	my $sym = $ev->{sym};	2278	my $sym = $ev->{sym};
1893		2279
1894	if ($sym == 13) {	2280	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2281	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2282	my $txt = $self->get_text;
		2283
1897	$self->{history_pointer} = -1;	2284	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2285	$self->{history_saveback} = '';
1899	$self->_emit (activate => $txt);	2286	$self->emit (activate => $txt);
1900	$self->update;	2287	$self->update;
1901		2288
1902	} elsif ($sym == CFClient::SDLK_UP) {	2289	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2290	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2291	$self->{history_saveback} = $self->get_text;
1905	}	2292	}
1906	if (@{$self->{history} || []} > 0) {	2293	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2294	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2296	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2297	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2298	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2299	}
1913		2300
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2301	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2302	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2303	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2304
1918	if ($self->{history_pointer} >= 0) {	2305	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2306	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1920	} else {	2307	} else {
1921	$self->set_text ($self->{history_saveback});	2308	$self->set_text ($self->{history_saveback});
1922	}	2309	}
1923		2310
1924	} else {	2311	} else {
1925	return $self->SUPER::key_down ($ev)	2312	return $self->SUPER::invoke_key_down ($ev)
1926	}	2313	}
1927		2314
1928	1	2315	1
1929	}	2316	}
1930		2317
1931	#############################################################################	2318	#############################################################################
1932		2319
		2320	package CFPlus::UI::TextEdit;
		2321
		2322	our @ISA = CFPlus::UI::EntryBase::;
		2323
		2324	use CFPlus::OpenGL;
		2325
		2326	sub move_cursor_ver {
		2327	my ($self, $dy) = @_;
		2328
		2329	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2330
		2331	$y += $dy;
		2332
		2333	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2334	$self->{cursor} = $index;
		2335	delete $self->{cur_h};
		2336	$self->update;
		2337	return;
		2338	}
		2339	}
		2340
		2341	sub invoke_key_down {
		2342	my ($self, $ev) = @_;
		2343
		2344	my $sym = $ev->{sym};
		2345
		2346	if ($sym == CFPlus::SDLK_UP) {
		2347	$self->move_cursor_ver (-1);
		2348	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2349	$self->move_cursor_ver (+1);
		2350	} else {
		2351	return $self->SUPER::invoke_key_down ($ev)
		2352	}
		2353
		2354	1
		2355	}
		2356
		2357	#############################################################################
		2358
1933	package CFClient::UI::Button;	2359	package CFPlus::UI::Button;
1934		2360
1935	our @ISA = CFClient::UI::Label::;	2361	our @ISA = CFPlus::UI::Label::;
1936		2362
1937	use CFClient::OpenGL;	2363	use CFPlus::OpenGL;
1938		2364
1939	my @tex =	2365	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2367	qw(b1_button_inactive.png b1_button_active.png);
1942		2368
1943	sub new {	2369	sub new {
1944	my $class = shift;	2370	my $class = shift;
1945		2371
1946	$class->SUPER::new (	2372	$class->SUPER::new (
1947	padding_x => 4,	2373	padding_x => 4,
1948	padding_y => 4,	2374	padding_y => 4,
1949	fg => [1, 1, 1],	2375	fg => [1.0, 1.0, 1.0],
1950	active_fg => [0, 0, 1],	2376	active_fg => [0.8, 0.8, 0.8],
1951	can_hover => 1,	2377	can_hover => 1,
1952	align => 0,	2378	align => 0,
1953	valign => 0,	2379	valign => 0,
1954	can_events => 1,	2380	can_events => 1,
1955	@_	2381	@_
1956	)	2382	)
1957	}	2383	}
1958		2384
1959	sub activate { }
1960
1961	sub button_up {	2385	sub invoke_button_up {
1962	my ($self, $ev, $x, $y) = @_;	2386	my ($self, $ev, $x, $y) = @_;
1963		2387
1964	$self->emit ("activate")	2388	$self->emit ("activate")
1965	if $x >= 0 && $x < $self->{w}	2389	if $x >= 0 && $x < $self->{w}
1966	&& $y >= 0 && $y < $self->{h};	2390	&& $y >= 0 && $y < $self->{h};
…		…
1975		2399
1976	glEnable GL_TEXTURE_2D;	2400	glEnable GL_TEXTURE_2D;
1977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1978	glColor 0, 0, 0, 1;	2402	glColor 0, 0, 0, 1;
1979		2403
		2404	my $tex = $tex[$GRAB == $self];
1980	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2405	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981		2406
1982	glDisable GL_TEXTURE_2D;	2407	glDisable GL_TEXTURE_2D;
1983		2408
1984	$self->SUPER::_draw;	2409	$self->SUPER::_draw;
1985	}	2410	}
1986		2411
1987	#############################################################################	2412	#############################################################################
1988		2413
		2414	package CFPlus::UI::CheckBox;
		2415
		2416	our @ISA = CFPlus::UI::DrawBG::;
		2417
		2418	my @tex =
		2419	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2420	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2421
		2422	use CFPlus::OpenGL;
		2423
		2424	sub new {
		2425	my $class = shift;
		2426
		2427	$class->SUPER::new (
		2428	padding_x => 2,
		2429	padding_y => 2,
		2430	fg => [1, 1, 1],
		2431	active_fg => [1, 1, 0],
		2432	bg => [0, 0, 0, 0.2],
		2433	active_bg => [1, 1, 1, 0.5],
		2434	state => 0,
		2435	can_hover => 1,
		2436	@_
		2437	)
		2438	}
		2439
		2440	sub size_request {
		2441	my ($self) = @_;
		2442
		2443	(6) x 2
		2444	}
		2445
		2446	sub toggle {
		2447	my ($self) = @_;
		2448
		2449	$self->{state} = !$self->{state};
		2450	$self->emit (changed => $self->{state});
		2451	$self->update;
		2452	}
		2453
		2454	sub invoke_button_down {
		2455	my ($self, $ev, $x, $y) = @_;
		2456
		2457	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2458	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2459	$self->toggle;
		2460	} else {
		2461	return 0
		2462	}
		2463
		2464	1
		2465	}
		2466
		2467	sub _draw {
		2468	my ($self) = @_;
		2469
		2470	$self->SUPER::_draw;
		2471
		2472	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2473
		2474	my ($w, $h) = @$self{qw(w h)};
		2475
		2476	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2477
		2478	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2479
		2480	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2481
		2482	glEnable GL_TEXTURE_2D;
		2483	$tex->draw_quad_alpha (0, 0, $s, $s);
		2484	glDisable GL_TEXTURE_2D;
		2485	}
		2486
		2487	#############################################################################
		2488
		2489	package CFPlus::UI::Image;
		2490
		2491	our @ISA = CFPlus::UI::Base::;
		2492
		2493	use CFPlus::OpenGL;
		2494
		2495	our %texture_cache;
		2496
		2497	sub new {
		2498	my $class = shift;
		2499
		2500	my $self = $class->SUPER::new (
		2501	can_events => 0,
		2502	@_,
		2503	);
		2504
		2505	$self->{path} || $self->{tex}
		2506	or Carp::croak "'path' or 'tex' attributes required";
		2507
		2508	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2509	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2510
		2511	CFPlus::weaken $texture_cache{$self->{path}};
		2512
		2513	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2514
		2515	$self
		2516	}
		2517
		2518	sub STORABLE_freeze {
		2519	my ($self, $cloning) = @_;
		2520
		2521	$self->{path}
		2522	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2523
		2524	$self->{path}
		2525	}
		2526
		2527	sub STORABLE_attach {
		2528	my ($self, $cloning, $path) = @_;
		2529
		2530	$self->new (path => $path)
		2531	}
		2532
		2533	sub size_request {
		2534	my ($self) = @_;
		2535
		2536	($self->{tex}{w}, $self->{tex}{h})
		2537	}
		2538
		2539	sub _draw {
		2540	my ($self) = @_;
		2541
		2542	my $tex = $self->{tex};
		2543
		2544	my ($w, $h) = ($self->{w}, $self->{h});
		2545
		2546	if ($self->{rot90}) {
		2547	glRotate 90, 0, 0, 1;
		2548	glTranslate 0, -$self->{w}, 0;
		2549
		2550	($w, $h) = ($h, $w);
		2551	}
		2552
		2553	glEnable GL_TEXTURE_2D;
		2554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2555
		2556	$tex->draw_quad (0, 0, $w, $h);
		2557
		2558	glDisable GL_TEXTURE_2D;
		2559	}
		2560
		2561	#############################################################################
		2562
1989	package CFClient::UI::ImageButton;	2563	package CFPlus::UI::ImageButton;
1990		2564
1991	our @ISA = CFClient::UI::Image::;	2565	our @ISA = CFPlus::UI::Image::;
1992		2566
1993	use CFClient::OpenGL;	2567	use CFPlus::OpenGL;
1994		2568
1995	my %textures;	2569	my %textures;
1996		2570
1997	sub new {	2571	sub new {
1998	my $class = shift;	2572	my $class = shift;
…		…
2008	can_events => 1,	2582	can_events => 1,
2009	@_	2583	@_
2010	);	2584	);
2011	}	2585	}
2012		2586
2013	sub activate { }
2014
2015	sub button_up {	2587	sub invoke_button_up {
2016	my ($self, $ev, $x, $y) = @_;	2588	my ($self, $ev, $x, $y) = @_;
2017		2589
2018	$self->emit ("activate")	2590	$self->emit ("activate")
2019	if $x >= 0 && $x < $self->{w}	2591	if $x >= 0 && $x < $self->{w}
2020	&& $y >= 0 && $y < $self->{h};	2592	&& $y >= 0 && $y < $self->{h};
…		…
2022	1	2594	1
2023	}	2595	}
2024		2596
2025	#############################################################################	2597	#############################################################################
2026		2598
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;	2599	package CFPlus::UI::VGauge;
2096		2600
2097	our @ISA = CFClient::UI::Base::;	2601	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		2602
2157	use List::Util qw(min max);	2603	use List::Util qw(min max);
2158		2604
2159	use CFClient::OpenGL;	2605	use CFPlus::OpenGL;
2160		2606
2161	my %tex = (	2607	my %tex = (
2162	food => [	2608	food => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2610	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165	],	2611	],
2166	grace => [	2612	grace => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2613	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/	2614	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169	],	2615	],
2170	hp => [	2616	hp => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2617	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2618	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173	],	2619	],
2174	mana => [	2620	mana => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	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/	2622	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177	],	2623	],
2178	);	2624	);
2179		2625
2180	# eg. VGauge->new (gauge => 'food'), default gauge: food	2626	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2240	my $ycut1 = max 0, min 1, $ycut;	2686	my $ycut1 = max 0, min 1, $ycut;
2241	my $ycut2 = max 0, min 1, $ycut - 1;	2687	my $ycut2 = max 0, min 1, $ycut - 1;
2242		2688
2243	my $h1 = $self->{h} * (1 - $ycut1);	2689	my $h1 = $self->{h} * (1 - $ycut1);
2244	my $h2 = $self->{h} * (1 - $ycut2);	2690	my $h2 = $self->{h} * (1 - $ycut2);
		2691	my $h3 = $self->{h};
		2692
		2693	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245		2694
2246	glEnable GL_BLEND;	2695	glEnable GL_BLEND;
2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2696	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2697	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249	glEnable GL_TEXTURE_2D;	2698	glEnable GL_TEXTURE_2D;
…		…
2268		2717
2269	if ($t3) {	2718	if ($t3) {
2270	glBindTexture GL_TEXTURE_2D, $t3->{name};	2719	glBindTexture GL_TEXTURE_2D, $t3->{name};
2271	glBegin GL_QUADS;	2720	glBegin GL_QUADS;
2272	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2721	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2722	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2723	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2724	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276	glEnd;	2725	glEnd;
2277	}	2726	}
2278		2727
2279	glDisable GL_BLEND;	2728	glDisable GL_BLEND;
2280	glDisable GL_TEXTURE_2D;	2729	glDisable GL_TEXTURE_2D;
2281	}	2730	}
2282		2731
2283	#############################################################################	2732	#############################################################################
2284		2733
2285	package CFClient::UI::Gauge;	2734	package CFPlus::UI::Gauge;
2286		2735
2287	our @ISA = CFClient::UI::VBox::;	2736	our @ISA = CFPlus::UI::VBox::;
2288		2737
2289	sub new {	2738	sub new {
2290	my ($class, %arg) = @_;	2739	my ($class, %arg) = @_;
2291		2740
2292	my $self = $class->SUPER::new (	2741	my $self = $class->SUPER::new (
…		…
2294	can_hover => 1,	2743	can_hover => 1,
2295	can_events => 1,	2744	can_events => 1,
2296	%arg,	2745	%arg,
2297	);	2746	);
2298		2747
2299	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2748	$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);	2749	$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");	2750	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302		2751
2303	$self	2752	$self
2304	}	2753	}
2305		2754
2306	sub set_fontsize {	2755	sub set_fontsize {
…		…
2327	$self->{value}->set_text ($val);	2776	$self->{value}->set_text ($val);
2328	}	2777	}
2329		2778
2330	#############################################################################	2779	#############################################################################
2331		2780
2332	package CFClient::UI::Slider;	2781	package CFPlus::UI::Slider;
2333		2782
2334	use strict;	2783	use strict;
2335		2784
2336	use CFClient::OpenGL;	2785	use CFPlus::OpenGL;
2337		2786
2338	our @ISA = CFClient::UI::DrawBG::;	2787	our @ISA = CFPlus::UI::DrawBG::;
2339		2788
2340	my @tex =	2789	my @tex =
2341	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2790	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342	qw(s1_slider.png s1_slider_bg.png);	2791	qw(s1_slider.png s1_slider_bg.png);
2343		2792
2344	sub new {	2793	sub new {
2345	my $class = shift;	2794	my $class = shift;
2346		2795
…		…
2367	$self->update;	2816	$self->update;
2368		2817
2369	$self	2818	$self
2370	}	2819	}
2371		2820
2372	sub changed { }
2373
2374	sub set_range {	2821	sub set_range {
2375	my ($self, $range) = @_;	2822	my ($self, $range) = @_;
2376		2823
2377	($range, $self->{range}) = ($self->{range}, $range);	2824	($range, $self->{range}) = ($self->{range}, $range);
2378		2825
…		…
2398	if $unit;	2845	if $unit;
2399		2846
2400	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2847	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401		2848
2402	if ($value != $old_value) {	2849	if ($value != $old_value) {
2403	$self->_emit (changed => $value);	2850	$self->emit (changed => $value);
2404	$self->update;	2851	$self->update;
2405	}	2852	}
2406	}	2853	}
2407		2854
2408	sub size_request {	2855	sub size_request {
2409	my ($self) = @_;	2856	my ($self) = @_;
2410		2857
2411	($self->{req_w}, $self->{req_h})	2858	($self->{req_w}, $self->{req_h})
2412	}	2859	}
2413		2860
2414	sub button_down {	2861	sub invoke_button_down {
2415	my ($self, $ev, $x, $y) = @_;	2862	my ($self, $ev, $x, $y) = @_;
2416		2863
2417	$self->SUPER::button_down ($ev, $x, $y);	2864	$self->SUPER::invoke_button_down ($ev, $x, $y);
2418		2865
2419	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2866	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420		2867
2421	$self->mouse_motion ($ev, $x, $y)	2868	$self->invoke_mouse_motion ($ev, $x, $y)
2422	}	2869	}
2423		2870
2424	sub mouse_motion {	2871	sub invoke_mouse_motion {
2425	my ($self, $ev, $x, $y) = @_;	2872	my ($self, $ev, $x, $y) = @_;
2426		2873
2427	if ($GRAB == $self) {	2874	if ($GRAB == $self) {
2428	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2875	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429		2876
…		…
2435	} else {	2882	} else {
2436	return 0;	2883	return 0;
2437	}	2884	}
2438		2885
2439	1	2886	1
		2887	}
		2888
		2889	sub invoke_mouse_wheel {
		2890	my ($self, $ev) = @_;
		2891
		2892	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2893
		2894	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2895
		2896	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2897
		2898	! ! $delta
2440	}	2899	}
2441		2900
2442	sub update {	2901	sub update {
2443	my ($self) = @_;	2902	my ($self) = @_;
2444		2903
…		…
2493	glDisable GL_TEXTURE_2D;	2952	glDisable GL_TEXTURE_2D;
2494	}	2953	}
2495		2954
2496	#############################################################################	2955	#############################################################################
2497		2956
2498	package CFClient::UI::ValSlider;	2957	package CFPlus::UI::ValSlider;
2499		2958
2500	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2501		2960
2502	sub new {	2961	sub new {
2503	my ($class, %arg) = @_;	2962	my ($class, %arg) = @_;
2504		2963
2505	my $range = delete $arg{range};	2964	my $range = delete $arg{range};
2506		2965
2507	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2508	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2967	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2968	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510	to_value => sub { shift },	2969	to_value => sub { shift },
2511	from_value => sub { shift },	2970	from_value => sub { shift },
2512	%arg,	2971	%arg,
2513	);	2972	);
2514		2973
…		…
2534	sub set_range { shift->{slider}->set_range (@_) }	2993	sub set_range { shift->{slider}->set_range (@_) }
2535	sub set_value { shift->{slider}->set_value (@_) }	2994	sub set_value { shift->{slider}->set_value (@_) }
2536		2995
2537	#############################################################################	2996	#############################################################################
2538		2997
2539	package CFClient::UI::TextScroller;	2998	package CFPlus::UI::TextScroller;
2540		2999
2541	our @ISA = CFClient::UI::HBox::;	3000	our @ISA = CFPlus::UI::HBox::;
2542		3001
2543	use CFClient::OpenGL;	3002	use CFPlus::OpenGL;
2544		3003
2545	sub new {	3004	sub new {
2546	my $class = shift;	3005	my $class = shift;
2547		3006
2548	my $self = $class->SUPER::new (	3007	my $self = $class->SUPER::new (
2549	fontsize => 1,	3008	fontsize => 1,
2550	can_events => 0,	3009	can_events => 1,
2551	indent => 0,	3010	indent => 0,
2552	#font => default_font	3011	#font => default_font
2553	@_,	3012	@_,
2554		3013
2555	layout => (new CFClient::Layout 1),	3014	layout => (new CFPlus::Layout),
2556	par => [],	3015	par => [],
		3016	max_par => 0,
2557	height => 0,	3017	height => 0,
2558	children => [	3018	children => [
2559	(new CFClient::UI::Empty expand => 1),	3019	(new CFPlus::UI::Empty expand => 1),
2560	(new CFClient::UI::Slider vertical => 1),	3020	(new CFPlus::UI::Slider vertical => 1),
2561	],	3021	],
2562	);	3022	);
2563		3023
2564	$self->{children}[1]->connect (changed => sub { $self->update });	3024	$self->{children}[1]->connect (changed => sub { $self->update });
2565		3025
…		…
2571		3031
2572	$self->{fontsize} = $fontsize;	3032	$self->{fontsize} = $fontsize;
2573	$self->reflow;	3033	$self->reflow;
2574	}	3034	}
2575		3035
		3036	sub size_request {
		3037	my ($self) = @_;
		3038
		3039	my ($empty, $slider) = @{ $self->{children} };
		3040
		3041	local $self->{children} = [$empty, $slider];
		3042	$self->SUPER::size_request
		3043	}
		3044
2576	sub size_allocate {	3045	sub invoke_size_allocate {
2577	my ($self, $w, $h) = @_;	3046	my ($self, $w, $h) = @_;
2578		3047
2579	$self->SUPER::size_allocate ($w, $h);	3048	my ($empty, $slider, @other) = @{ $self->{children} };
		3049	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580		3050
2581	$self->{layout}->set_font ($self->{font}) if $self->{font};	3051	$self->{layout}->set_font ($self->{font}) if $self->{font};
2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3052	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583	$self->{layout}->set_width ($self->{children}[0]{w});	3053	$self->{layout}->set_width ($empty->{w});
2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3054	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585		3055
2586	$self->reflow;	3056	$self->reflow;
2587	}
2588		3057
2589	sub text_size {	3058	local $self->{children} = [$empty, $slider];
		3059	$self->SUPER::invoke_size_allocate ($w, $h)
		3060	}
		3061
		3062	sub invoke_mouse_wheel {
2590	my ($self, $text, $indent) = @_;	3063	my ($self, $ev) = @_;
		3064
		3065	return 0 unless $ev->{dy}; # only vertical movements
		3066
		3067	$self->{children}[1]->emit (mouse_wheel => $ev);
		3068
		3069	1
		3070	}
		3071
		3072	sub get_layout {
		3073	my ($self, $para) = @_;
2591		3074
2592	my $layout = $self->{layout};	3075	my $layout = $self->{layout};
2593		3076
		3077	$layout->set_font ($self->{font}) if $self->{font};
		3078	$layout->set_foreground (@{$para->{fg}});
2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3079	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595	$layout->set_width ($self->{children}[0]{w} - $indent);	3080	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3081	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($text);	3082	$layout->set_markup ($para->{markup});
		3083
		3084	$layout->set_shapes (
		3085	map
		3086	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3087	@{$para->{widget}}
2598		3088	);
		3089
2599	$layout->size	3090	$layout
2600	}	3091	}
2601		3092
2602	sub reflow {	3093	sub reflow {
2603	my ($self) = @_;	3094	my ($self) = @_;
2604		3095
…		…
2611		3102
2612	# todo: base offset on lines or so, not on pixels	3103	# todo: base offset on lines or so, not on pixels
2613	$self->{children}[1]->set_value ($offset);	3104	$self->{children}[1]->set_value ($offset);
2614	}	3105	}
2615		3106
		3107	sub current_paragraph {
		3108	my ($self) = @_;
		3109
		3110	$self->{top_paragraph} - 1
		3111	}
		3112
		3113	sub scroll_to {
		3114	my ($self, $para) = @_;
		3115
		3116	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3117
		3118	$self->{scroll_to} = $para;
		3119	$self->update;
		3120	}
		3121
2616	sub clear {	3122	sub clear {
2617	my ($self) = @_;	3123	my ($self) = @_;
		3124
		3125	my (undef, undef, @other) = @{ $self->{children} };
		3126	$self->remove ($_) for @other;
2618		3127
2619	$self->{par} = [];	3128	$self->{par} = [];
2620	$self->{height} = 0;	3129	$self->{height} = 0;
2621	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3130	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622	}	3131	}
2623		3132
2624	sub add_paragraph {	3133	sub add_paragraph {
2625	my ($self, $color, $text, $indent) = @_;	3134	my $self = shift;
2626		3135
2627	for my $line (split /\n/, $text) {	3136	for my $para (@_) {
2628	my ($w, $h) = $self->text_size ($line);	3137	$para = {
		3138	fg => [1, 1, 1, 1],
		3139	indent => 0,
		3140	markup => "",
		3141	widget => [],
		3142	ref $para ? %$para : (markup => $para),
		3143	w => 1e10,
		3144	wrapped => 1,
		3145	};
		3146
		3147	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3148	push @{$self->{par}}, $para;
		3149	}
		3150
		3151	if (my $max = $self->{max_par}) {
		3152	shift @{$self->{par}} while @{$self->{par}} > $max;
		3153	}
		3154
		3155	$self->{need_reflow}++;
		3156	$self->update;
		3157	}
		3158
		3159	sub scroll_to_bottom {
		3160	my ($self) = @_;
		3161
		3162	$self->{scroll_to} = $#{$self->{par}};
		3163	$self->update;
		3164	}
		3165
		3166	sub force_uptodate {
		3167	my ($self) = @_;
		3168
		3169	if (delete $self->{need_reflow}) {
		3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3171
		3172	my $height = 0;
		3173
		3174	for my $para (@{$self->{par}}) {
		3175	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3176	my $layout = $self->get_layout ($para);
		3177	my ($w, $h) = $layout->size;
		3178
		3179	$para->{w} = $w + $para->{indent};
		3180	$para->{h} = $h;
		3181	$para->{wrapped} = $layout->has_wrapped;
		3182	}
		3183
		3184	$para->{y} = $height;
		3185	$height += $para->{h};
		3186	}
		3187
2629	$self->{height} += $h;	3188	$self->{height} = $height;
2630	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3189	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631	}
2632		3190
2633	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3191	delete $self->{texture};
		3192	}
		3193
		3194	if (my $paridx = delete $self->{scroll_to}) {
		3195	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3196	}
2634	}	3197	}
2635		3198
2636	sub update {	3199	sub update {
2637	my ($self) = @_;	3200	my ($self) = @_;
2638		3201
…		…
2641	return unless $self->{h} > 0;	3204	return unless $self->{h} > 0;
2642		3205
2643	delete $self->{texture};	3206	delete $self->{texture};
2644		3207
2645	$ROOT->on_post_alloc ($self => sub {	3208	$ROOT->on_post_alloc ($self => sub {
		3209	$self->force_uptodate;
		3210
2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3211	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647		3212
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 {	3213	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676	glClearColor 0, 0, 0, 0;	3214	glClearColor 0, 0, 0, 0;
2677	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2678		3216
		3217	package CFPlus::UI::Base;
		3218	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3219	(0, 0, $self->{w}, $self->{h});
		3220
		3221	my $top = int $self->{children}[1]{range}[0];
		3222
		3223	my $paridx = 0;
		3224	my $top_paragraph;
2679	my $top = int $self->{children}[1]{range}[0];	3225	my $top = int $self->{children}[1]{range}[0];
2680		3226
2681	my $y0 = $top;	3227	my $y0 = $top;
2682	my $y1 = $top + $H;	3228	my $y1 = $top + $H;
2683		3229
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}}) {	3230	for my $para (@{$self->{par}}) {
2695	my $h = $par->[1];	3231	my $h = $para->{h};
		3232	my $y = $para->{y};
2696		3233
2697	if ($y0 < $y + $h && $y < $y1) {	3234	if ($y0 < $y + $h && $y < $y1) {
2698	$layout->set_foreground (@{ $par->[2] });	3235	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		3236
2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3237	$layout->render ($para->{indent}, $y - $y0);
2704		3238
2705	glRasterPos $par->[3], $y - $y0;	3239	if (my @w = @{ $para->{widget} }) {
2706	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3240	my @s = $layout->get_shapes;
		3241
		3242	for (@w) {
		3243	my ($dx, $dy) = splice @s, 0, 2, ();
		3244
		3245	$_->{x} = $dx + $para->{indent};
		3246	$_->{y} = $dy + $y - $y0;
		3247
		3248	$_->draw;
		3249	}
		3250	}
2707	}	3251	}
2708		3252
2709	$y += $h;	3253	$paridx++;
		3254	$top_paragraph ||= $paridx if $y >= $top;
2710	}	3255	}
2711		3256
2712	glDisable GL_BLEND;	3257	$self->{top_paragraph} = $top_paragraph;
2713	};	3258	};
2714	});	3259	});
		3260	}
		3261
		3262	sub reconfigure {
		3263	my ($self) = @_;
		3264
		3265	$self->SUPER::reconfigure;
		3266
		3267	$_->{w} = 1e10 for @{ $self->{par} };
		3268	$self->reflow;
2715	}	3269	}
2716		3270
2717	sub _draw {	3271	sub _draw {
2718	my ($self) = @_;	3272	my ($self) = @_;
2719		3273
…		…
2722	glColor 0, 0, 0, 1;	3276	glColor 0, 0, 0, 1;
2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3277	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724	glDisable GL_TEXTURE_2D;	3278	glDisable GL_TEXTURE_2D;
2725		3279
2726	$self->{children}[1]->draw;	3280	$self->{children}[1]->draw;
2727
2728	}	3281	}
2729		3282
2730	#############################################################################	3283	#############################################################################
2731		3284
2732	package CFClient::UI::Animator;	3285	package CFPlus::UI::Animator;
2733		3286
2734	use CFClient::OpenGL;	3287	use CFPlus::OpenGL;
2735		3288
2736	our @ISA = CFClient::UI::Bin::;	3289	our @ISA = CFPlus::UI::Bin::;
2737		3290
2738	sub moveto {	3291	sub moveto {
2739	my ($self, $x, $y) = @_;	3292	my ($self, $x, $y) = @_;
2740		3293
2741	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3294	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2769	glPopMatrix;	3322	glPopMatrix;
2770	}	3323	}
2771		3324
2772	#############################################################################	3325	#############################################################################
2773		3326
2774	package CFClient::UI::Flopper;	3327	package CFPlus::UI::Flopper;
2775		3328
2776	our @ISA = CFClient::UI::Button::;	3329	our @ISA = CFPlus::UI::Button::;
2777		3330
2778	sub new {	3331	sub new {
2779	my $class = shift;	3332	my $class = shift;
2780		3333
2781	my $self = $class->SUPER::new (	3334	my $self = $class->SUPER::new (
…		…
2793	$self->{other}->toggle_visibility;	3346	$self->{other}->toggle_visibility;
2794	}	3347	}
2795		3348
2796	#############################################################################	3349	#############################################################################
2797		3350
2798	package CFClient::UI::Tooltip;	3351	package CFPlus::UI::Tooltip;
2799		3352
2800	our @ISA = CFClient::UI::Bin::;	3353	our @ISA = CFPlus::UI::Bin::;
2801		3354
2802	use CFClient::OpenGL;	3355	use CFPlus::OpenGL;
2803		3356
2804	sub new {	3357	sub new {
2805	my $class = shift;	3358	my $class = shift;
2806		3359
2807	$class->SUPER::new (	3360	$class->SUPER::new (
…		…
2810	)	3363	)
2811	}	3364	}
2812		3365
2813	sub set_tooltip_from {	3366	sub set_tooltip_from {
2814	my ($self, $widget) = @_;	3367	my ($self, $widget) = @_;
		3368
		3369	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3370	if $widget->{tooltip} =~ /^#(.*)$/;
2815		3371
2816	my $tooltip = $widget->{tooltip};	3372	my $tooltip = $widget->{tooltip};
2817		3373
2818	if ($ENV{CFPLUS_DEBUG} & 2) {	3374	if ($ENV{CFPLUS_DEBUG} & 2) {
2819	$tooltip .= "\n\n" . (ref $widget) . "\n"	3375	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2823	}	3379	}
2824		3380
2825	$tooltip =~ s/^\n+//;	3381	$tooltip =~ s/^\n+//;
2826	$tooltip =~ s/\n+$//;	3382	$tooltip =~ s/\n+$//;
2827		3383
2828	$self->add (new CFClient::UI::Label	3384	$self->add (new CFPlus::UI::Label
2829	markup => $tooltip,	3385	markup => $tooltip,
2830	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3386	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831	fontsize => 0.8,	3387	fontsize => 0.8,
2832	fg => [0, 0, 0, 1],	3388	style => 1, # FLAG_INVERSE
2833	ellipsise => 0,	3389	ellipsise => 0,
2834	font => ($widget->{tooltip_font} || $::FONT_PROP),	3390	font => ($widget->{tooltip_font} || $::FONT_PROP),
2835	);	3391	);
2836	}	3392	}
2837		3393
…		…
2841	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3397	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842		3398
2843	($w + 4, $h + 4)	3399	($w + 4, $h + 4)
2844	}	3400	}
2845		3401
2846	sub size_allocate {	3402	sub invoke_size_allocate {
2847	my ($self, $w, $h) = @_;	3403	my ($self, $w, $h) = @_;
2848		3404
2849	$self->SUPER::size_allocate ($w - 4, $h - 4);	3405	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850	}	3406	}
2851		3407
2852	sub visibility_change {	3408	sub invoke_visibility_change {
2853	my ($self, $visible) = @_;	3409	my ($self, $visible) = @_;
2854		3410
2855	return unless $visible;	3411	return unless $visible;
2856		3412
2857	$self->{root}->on_post_alloc ("move_$self" => sub {	3413	$self->{root}->on_post_alloc ("move_$self" => sub {
2858	my $widget = $self->{owner}	3414	my $widget = $self->{owner}
2859	or return;	3415	or return;
2860		3416
		3417	if ($widget->{visible}) {
2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3418	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862		3419
2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3420	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864	if $x + $self->{w} > $self->{root}{w};	3421	if $x + $self->{w} > $self->{root}{w};
2865		3422
2866	$self->move_abs ($x, $y);	3423	$self->move_abs ($x, $y);
		3424	} else {
		3425	$self->hide;
		3426	}
2867	});	3427	});
2868	}	3428	}
2869		3429
2870	sub _draw {	3430	sub _draw {
2871	my ($self) = @_;	3431	my ($self) = @_;
…		…
2895	$self->SUPER::_draw;	3455	$self->SUPER::_draw;
2896	}	3456	}
2897		3457
2898	#############################################################################	3458	#############################################################################
2899		3459
2900	package CFClient::UI::Face;	3460	package CFPlus::UI::Face;
2901		3461
2902	our @ISA = CFClient::UI::Base::;	3462	our @ISA = CFPlus::UI::DrawBG::;
2903		3463
2904	use CFClient::OpenGL;	3464	use CFPlus::OpenGL;
2905		3465
2906	sub new {	3466	sub new {
2907	my $class = shift;	3467	my $class = shift;
2908		3468
2909	my $self = $class->SUPER::new (	3469	my $self = $class->SUPER::new (
		3470	size_w => 32,
		3471	size_h => 8,
2910	aspect => 1,	3472	aspect => 1,
2911	can_events => 0,	3473	can_events => 0,
2912	@_,	3474	@_,
2913	);	3475	);
2914		3476
2915	if ($self->{anim} && $self->{animspeed}) {	3477	if ($self->{anim} && $self->{animspeed}) {
2916	Scalar::Util::weaken (my $widget = $self);	3478	CFPlus::weaken (my $widget = $self);
2917		3479
		3480	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3481	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2918	$self->{timer} = Event->timer (	3482	$self->{timer} = Event->timer (
2919	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920	hard => 1,	3483	parked => 1,
2921	interval => $self->{animspeed},
2922	cb => sub {	3484	cb => sub {
		3485	return unless $::CONN && $widget;
		3486
2923	++$widget->{frame};	3487	++$widget->{frame};
		3488	$widget->update_face;
2924	$widget->update;	3489	$widget->update;
		3490
		3491	$widget->update_timer;
2925	},	3492	},
2926	);	3493	);
		3494
		3495	$self->update_face;
		3496	$self->update_timer;
2927	}	3497	}
2928		3498
2929	$self	3499	$self
2930	}	3500	}
2931		3501
		3502	sub update_timer {
		3503	my ($self) = @_;
		3504
		3505	return unless $self->{timer};
		3506
		3507	if ($self->{visible}) {
		3508	$self->{timer}->at (
		3509	$self->{anim_start}
		3510	+ $self->{animspeed}
		3511	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3512	);
		3513	$self->{timer}->start;
		3514	} else {
		3515	$self->{timer}->stop;
		3516	}
		3517	}
		3518
		3519	sub update_face {
		3520	my ($self) = @_;
		3521
		3522	return unless $::CONN;
		3523
		3524	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3525	if ($anim && @$anim) {
		3526	delete $self->{wait_face};
		3527	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3528	}
		3529	}
		3530	}
		3531
2932	sub size_request {	3532	sub size_request {
2933	(32, 8)	3533	my ($self) = @_;
		3534
		3535	if ($::CONN) {
		3536	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3537	if (my $tex = $::CONN->{texture}[$faceid]) {
		3538	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3539	} else {
		3540	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3541	$self->realloc;
		3542	});
		3543	}
		3544	}
		3545	}
		3546
		3547	($self->{size_w} || 8, $self->{size_h} || 8)
2934	}	3548	}
2935		3549
2936	sub update {	3550	sub update {
2937	my ($self) = @_;	3551	my ($self) = @_;
2938		3552
2939	return unless $self->{visible};	3553	return unless $self->{visible};
2940		3554
2941	$self->SUPER::update;	3555	$self->SUPER::update;
2942	}	3556	}
2943		3557
		3558	sub invoke_visibility_change {
		3559	my ($self) = @_;
		3560
		3561	$self->update_timer;
		3562
		3563	0
		3564	}
		3565
2944	sub _draw {	3566	sub _draw {
2945	my ($self) = @_;	3567	my ($self) = @_;
2946		3568
2947	return unless $::CONN;	3569	return unless $::CONN;
2948		3570
2949	my $face;	3571	$self->SUPER::_draw;
2950		3572
2951	if ($self->{frame}) {
2952	my $anim = $::CONN->{anim}[$self->{anim}];	3573	my $faceid = $::CONN->{faceid}[$self->{face}]
2953		3574	or return;
2954	$face = $anim->[ $self->{frame} % @$anim ]
2955	if $anim && @$anim;
2956	}
2957		3575
2958	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3576	my $tex = $::CONN->{texture}[$faceid];
2959		3577
2960	if ($tex) {	3578	if ($tex) {
2961	glEnable GL_TEXTURE_2D;	3579	glEnable GL_TEXTURE_2D;
2962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963	glColor 0, 0, 0, 1;	3581	glColor 0, 0, 0, 1;
…		…
2967	}	3585	}
2968		3586
2969	sub destroy {	3587	sub destroy {
2970	my ($self) = @_;	3588	my ($self) = @_;
2971		3589
2972	$self->{timer}->cancel	3590	(delete $self->{timer})->cancel
2973	if $self->{timer};	3591	if $self->{timer};
2974		3592
2975	$self->SUPER::destroy;	3593	$self->SUPER::destroy;
2976	}	3594	}
2977		3595
2978	#############################################################################	3596	#############################################################################
2979		3597
2980	package CFClient::UI::Buttonbar;	3598	package CFPlus::UI::Buttonbar;
2981		3599
2982	our @ISA = CFClient::UI::HBox::;	3600	our @ISA = CFPlus::UI::HBox::;
2983		3601
2984	# TODO: should actualyl wrap buttons and other goodies.	3602	# TODO: should actually wrap buttons and other goodies.
2985		3603
2986	#############################################################################	3604	#############################################################################
2987		3605
2988	package CFClient::UI::Menu;	3606	package CFPlus::UI::Menu;
2989		3607
2990	our @ISA = CFClient::UI::FancyFrame::;	3608	our @ISA = CFPlus::UI::Toplevel::;
2991		3609
2992	use CFClient::OpenGL;	3610	use CFPlus::OpenGL;
2993		3611
2994	sub new {	3612	sub new {
2995	my $class = shift;	3613	my $class = shift;
2996		3614
2997	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
2998	items => [],	3616	items => [],
2999	z => 100,	3617	z => 100,
3000	@_,	3618	@_,
3001	);	3619	);
3002		3620
3003	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3621	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004		3622
3005	for my $item (@{ $self->{items} }) {	3623	for my $item (@{ $self->{items} }) {
3006	my ($widget, $cb, $tooltip) = @$item;	3624	my ($widget, $cb, $tooltip) = @$item;
3007		3625
3008	# handle various types of items, only text for now	3626	# handle various types of items, only text for now
3009	if (!ref $widget) {	3627	if (!ref $widget) {
		3628	if ($widget =~ /\t/) {
		3629	my ($left, $right) = split /\t/, $widget, 2;
		3630
3010	$widget = new CFClient::UI::Label	3631	$widget = new CFPlus::UI::HBox
3011	can_hover => 1,	3632	can_hover => 1,
3012	can_events => 1,	3633	can_events => 1,
		3634	tooltip => $tooltip,
		3635	children => [
		3636	(new CFPlus::UI::Label markup => $left, expand => 1),
		3637	(new CFPlus::UI::Label markup => $right, align => +1),
		3638	],
		3639	;
		3640
		3641	} else {
		3642	$widget = new CFPlus::UI::Label
		3643	can_hover => 1,
		3644	can_events => 1,
3013	markup => $widget,	3645	markup => $widget,
3014	tooltip => $tooltip	3646	tooltip => $tooltip;
		3647	}
3015	}	3648	}
3016		3649
3017	$self->{item}{$widget} = $item;	3650	$self->{item}{$widget} = $item;
3018		3651
3019	$self->{vbox}->add ($widget);	3652	$self->{vbox}->add ($widget);
…		…
3024		3657
3025	# popup given the event (must be a mouse button down event currently)	3658	# popup given the event (must be a mouse button down event currently)
3026	sub popup {	3659	sub popup {
3027	my ($self, $ev) = @_;	3660	my ($self, $ev) = @_;
3028		3661
3029	$self->_emit ("popdown");	3662	$self->emit ("popdown");
3030		3663
3031	# maybe save $GRAB? must be careful about events...	3664	# maybe save $GRAB? must be careful about events...
3032	$GRAB = $self;	3665	$GRAB = $self;
3033	$self->{button} = $ev->{button};	3666	$self->{button} = $ev->{button};
3034		3667
3035	$self->show;	3668	$self->show;
3036	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3669	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037	}	3670	}
3038		3671
3039	sub mouse_motion {	3672	sub invoke_mouse_motion {
3040	my ($self, $ev, $x, $y) = @_;	3673	my ($self, $ev, $x, $y) = @_;
3041		3674
3042	# TODO: should use vbox->find_widget or so	3675	# TODO: should use vbox->find_widget or so
3043	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3676	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044	$self->{hover} = $self->{item}{$HOVER};	3677	$self->{hover} = $self->{item}{$HOVER};
3045		3678
3046	0	3679	0
3047	}	3680	}
3048		3681
3049	sub button_up {	3682	sub invoke_button_up {
3050	my ($self, $ev, $x, $y) = @_;	3683	my ($self, $ev, $x, $y) = @_;
3051		3684
3052	if ($ev->{button} == $self->{button}) {	3685	if ($ev->{button} == $self->{button}) {
3053	undef $GRAB;	3686	undef $GRAB;
3054	$self->hide;	3687	$self->hide;
3055		3688
3056	$self->_emit ("popdown");	3689	$self->emit ("popdown");
3057	$self->{hover}[1]->() if $self->{hover};	3690	$self->{hover}[1]->() if $self->{hover};
3058	} else {	3691	} else {
3059	return 0	3692	return 0
3060	}	3693	}
3061		3694
3062	1	3695	1
3063	}	3696	}
3064		3697
3065	#############################################################################	3698	#############################################################################
3066		3699
3067	package CFClient::UI::Multiplexer;	3700	package CFPlus::UI::Multiplexer;
3068		3701
3069	our @ISA = CFClient::UI::Container::;	3702	our @ISA = CFPlus::UI::Container::;
3070		3703
3071	sub new {	3704	sub new {
3072	my $class = shift;	3705	my $class = shift;
3073		3706
3074	my $self = $class->SUPER::new (	3707	my $self = $class->SUPER::new (
…		…
3088		3721
3089	$self->{current} = $self->{children}[0]	3722	$self->{current} = $self->{children}[0]
3090	if @{ $self->{children} };	3723	if @{ $self->{children} };
3091	}	3724	}
3092		3725
		3726	sub get_current_page {
		3727	my ($self) = @_;
		3728
		3729	$self->{current}
		3730	}
		3731
3093	sub set_current_page {	3732	sub set_current_page {
3094	my ($self, $page_or_widget) = @_;	3733	my ($self, $page_or_widget) = @_;
3095		3734
3096	my $widget = ref $page_or_widget	3735	my $widget = ref $page_or_widget
3097	? $page_or_widget	3736	? $page_or_widget
3098	: $self->{children}[$page_or_widget];	3737	: $self->{children}[$page_or_widget];
3099		3738
3100	$self->{current} = $widget;	3739	$self->{current} = $widget;
3101	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3740	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102		3741
3103	$self->_emit (page_changed => $self->{current});	3742	$self->emit (page_changed => $self->{current});
3104		3743
3105	$self->realloc;	3744	$self->realloc;
3106	}	3745	}
3107		3746
3108	sub visible_children {	3747	sub visible_children {
…		…
3113	my ($self) = @_;	3752	my ($self) = @_;
3114		3753
3115	$self->{current}->size_request	3754	$self->{current}->size_request
3116	}	3755	}
3117		3756
3118	sub size_allocate {	3757	sub invoke_size_allocate {
3119	my ($self, $w, $h) = @_;	3758	my ($self, $w, $h) = @_;
3120		3759
3121	$self->{current}->configure (0, 0, $w, $h);	3760	$self->{current}->configure (0, 0, $w, $h);
		3761
		3762	1
3122	}	3763	}
3123		3764
3124	sub _draw {	3765	sub _draw {
3125	my ($self) = @_;	3766	my ($self) = @_;
3126		3767
3127	$self->{current}->draw;	3768	$self->{current}->draw;
3128	}	3769	}
3129		3770
3130	#############################################################################	3771	#############################################################################
3131		3772
3132	package CFClient::UI::Notebook;	3773	package CFPlus::UI::Notebook;
3133		3774
3134	our @ISA = CFClient::UI::VBox::;	3775	our @ISA = CFPlus::UI::VBox::;
3135		3776
3136	sub new {	3777	sub new {
3137	my $class = shift;	3778	my $class = shift;
3138		3779
3139	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3140	buttonbar => (new CFClient::UI::Buttonbar),	3781	buttonbar => (new CFPlus::UI::Buttonbar),
3141	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3782	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142	# filter => # will be put between multiplexer and $self	3783	# filter => # will be put between multiplexer and $self
3143	@_,	3784	@_,
3144	);	3785	);
3145		3786
3146	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3787	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3150	}	3791	}
3151		3792
3152	sub add {	3793	sub add {
3153	my ($self, $title, $widget, $tooltip) = @_;	3794	my ($self, $title, $widget, $tooltip) = @_;
3154		3795
3155	Scalar::Util::weaken $self;	3796	CFPlus::weaken $self;
3156		3797
3157	$self->{buttonbar}->add (new CFClient::UI::Button	3798	$self->{buttonbar}->add (new CFPlus::UI::Button
3158	markup => $title,	3799	markup => $title,
3159	tooltip => $tooltip,	3800	tooltip => $tooltip,
3160	on_activate => sub { $self->set_current_page ($widget) },	3801	on_activate => sub { $self->set_current_page ($widget) },
3161	);	3802	);
3162		3803
3163	$self->{multiplexer}->add ($widget);	3804	$self->{multiplexer}->add ($widget);
3164	}	3805	}
3165		3806
		3807	sub get_current_page {
		3808	my ($self) = @_;
		3809
		3810	$self->{multiplexer}->get_current_page
		3811	}
		3812
3166	sub set_current_page {	3813	sub set_current_page {
3167	my ($self, $page) = @_;	3814	my ($self, $page) = @_;
3168		3815
3169	$self->{multiplexer}->set_current_page ($page);	3816	$self->{multiplexer}->set_current_page ($page);
3170	$self->_emit (page_changed => $self->{multiplexer}{current});	3817	$self->emit (page_changed => $self->{multiplexer}{current});
3171	}	3818	}
3172		3819
3173	#############################################################################	3820	#############################################################################
3174		3821
3175	package CFClient::UI::Combobox;	3822	package CFPlus::UI::Selector;
3176		3823
3177	use utf8;	3824	use utf8;
3178		3825
3179	our @ISA = CFClient::UI::Button::;	3826	our @ISA = CFPlus::UI::Button::;
3180		3827
3181	sub new {	3828	sub new {
3182	my $class = shift;	3829	my $class = shift;
3183		3830
3184	my $self = $class->SUPER::new (	3831	my $self = $class->SUPER::new (
…		…
3190	$self->_set_value ($self->{value});	3837	$self->_set_value ($self->{value});
3191		3838
3192	$self	3839	$self
3193	}	3840	}
3194		3841
3195	sub button_down {	3842	sub invoke_button_down {
3196	my ($self, $ev) = @_;	3843	my ($self, $ev) = @_;
3197		3844
3198	my @menu_items;	3845	my @menu_items;
3199		3846
3200	for (@{ $self->{options} }) {	3847	for (@{ $self->{options} }) {
3201	my ($value, $title, $tooltip) = @$_;	3848	my ($value, $title, $tooltip) = @$_;
3202		3849
3203	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3850	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204	}	3851	}
3205		3852
3206	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3853	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207	}	3854	}
3208		3855
3209	sub _set_value {	3856	sub _set_value {
3210	my ($self, $value) = @_;	3857	my ($self, $value) = @_;
3211		3858
…		…
3221	my ($self, $value) = @_;	3868	my ($self, $value) = @_;
3222		3869
3223	return unless $self->{value} ne $value;	3870	return unless $self->{value} ne $value;
3224		3871
3225	$self->_set_value ($value);	3872	$self->_set_value ($value);
3226	$self->_emit (changed => $value);	3873	$self->emit (changed => $value);
3227	}	3874	}
3228		3875
3229	#############################################################################	3876	#############################################################################
3230		3877
3231	package CFClient::UI::Statusbox;	3878	package CFPlus::UI::Statusbox;
3232		3879
3233	our @ISA = CFClient::UI::VBox::;	3880	our @ISA = CFPlus::UI::VBox::;
3234		3881
3235	sub new {	3882	sub new {
3236	my $class = shift;	3883	my $class = shift;
3237		3884
3238	my $self = $class->SUPER::new (	3885	my $self = $class->SUPER::new (
3239	fontsize => 0.8,	3886	fontsize => 0.8,
3240	@_,	3887	@_,
3241	);	3888	);
3242		3889
3243	Scalar::Util::weaken (my $this = $self);	3890	CFPlus::weaken (my $this = $self);
3244		3891
3245	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3892	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246		3893
3247	$self	3894	$self
3248	}	3895	}
…		…
3250	sub reorder {	3897	sub reorder {
3251	my ($self) = @_;	3898	my ($self) = @_;
3252	my $NOW = Time::HiRes::time;	3899	my $NOW = Time::HiRes::time;
3253		3900
3254	# freeze display when hovering over any label	3901	# freeze display when hovering over any label
3255	return if $CFClient::UI::TOOLTIP->{owner}	3902	return if $CFPlus::UI::TOOLTIP->{owner}
3256	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3903	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257	values %{ $self->{item} };	3904	values %{ $self->{item} };
3258		3905
3259	while (my ($k, $v) = each %{ $self->{item} }) {	3906	while (my ($k, $v) = each %{ $self->{item} }) {
3260	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3907	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261	}	3908	}
…		…
3282	for ($short) {	3929	for ($short) {
3283	s/^\s+//;	3930	s/^\s+//;
3284	s/\s+/ /g;	3931	s/\s+/ /g;
3285	}	3932	}
3286		3933
3287	new CFClient::UI::Label	3934	new CFPlus::UI::Label
3288	markup => $short,	3935	markup => $short,
3289	tooltip => $item->{tooltip},	3936	tooltip => $item->{tooltip},
3290	tooltip_font => $::FONT_PROP,	3937	tooltip_font => $::FONT_PROP,
3291	tooltip_width => 0.67,	3938	tooltip_width => 0.67,
3292	fontsize => $item->{fontsize} || $self->{fontsize},	3939	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3346	count => 1,	3993	count => 1,
3347	%arg,	3994	%arg,
3348	};	3995	};
3349	}	3996	}
3350		3997
		3998	$ROOT->on_refresh (reorder => sub {
3351	$self->reorder;	3999	$self->reorder;
		4000	});
3352	}	4001	}
3353		4002
3354	sub reconfigure {	4003	sub reconfigure {
3355	my ($self) = @_;	4004	my ($self) = @_;
3356		4005
…		…
3369	$self->SUPER::destroy;	4018	$self->SUPER::destroy;
3370	}	4019	}
3371		4020
3372	#############################################################################	4021	#############################################################################
3373		4022
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;	4023	package CFPlus::UI::Root;
3737		4024
3738	our @ISA = CFClient::UI::Container::;	4025	our @ISA = CFPlus::UI::Container::;
3739		4026
3740	use List::Util qw(min max);	4027	use List::Util qw(min max);
3741		4028
3742	use CFClient::OpenGL;	4029	use CFPlus::OpenGL;
3743		4030
3744	sub new {	4031	sub new {
3745	my $class = shift;	4032	my $class = shift;
3746		4033
3747	my $self = $class->SUPER::new (	4034	my $self = $class->SUPER::new (
3748	visible => 1,	4035	visible => 1,
3749	@_,	4036	@_,
3750	);	4037	);
3751		4038
3752	Scalar::Util::weaken ($self->{root} = $self);	4039	CFPlus::weaken ($self->{root} = $self);
3753		4040
3754	$self	4041	$self
3755	}	4042	}
3756		4043
3757	sub size_request {	4044	sub size_request {
…		…
3772	$coord = $max - $size if $coord > $max - $size;	4059	$coord = $max - $size if $coord > $max - $size;
3773		4060
3774	int $coord + 0.5	4061	int $coord + 0.5
3775	}	4062	}
3776		4063
3777	sub size_allocate {	4064	sub invoke_size_allocate {
3778	my ($self, $w, $h) = @_;	4065	my ($self, $w, $h) = @_;
3779		4066
3780	for my $child ($self->children) {	4067	for my $child ($self->children) {
3781	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4068	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782		4069
…		…
3786	$X = _to_pixel $X, $W, $self->{w};	4073	$X = _to_pixel $X, $W, $self->{w};
3787	$Y = _to_pixel $Y, $H, $self->{h};	4074	$Y = _to_pixel $Y, $H, $self->{h};
3788		4075
3789	$child->configure ($X, $Y, $W, $H);	4076	$child->configure ($X, $Y, $W, $H);
3790	}	4077	}
		4078
		4079	1
3791	}	4080	}
3792		4081
3793	sub coord2local {	4082	sub coord2local {
3794	my ($self, $x, $y) = @_;	4083	my ($self, $x, $y) = @_;
3795		4084
…		…
3921	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4210	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922		4211
3923	$w = 0 if $w < 0;	4212	$w = 0 if $w < 0;
3924	$h = 0 if $h < 0;	4213	$h = 0 if $h < 0;
3925		4214
		4215	$w = max $widget->{min_w}, $w;
		4216	$h = max $widget->{min_h}, $h;
		4217
		4218	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4219	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4220
		4221	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4222	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4223
3926	$w = int $w + 0.5;	4224	$w = int $w + 0.5;
3927	$h = int $h + 0.5;	4225	$h = int $h + 0.5;
3928		4226
3929	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4227	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930	$widget->{old_w} = $widget->{w};	4228	$widget->{old_w} = $widget->{w};
…		…
3940		4238
3941	while ($self->{post_alloc_hook}) {	4239	while ($self->{post_alloc_hook}) {
3942	$_->()	4240	$_->()
3943	for values %{delete $self->{post_alloc_hook}};	4241	for values %{delete $self->{post_alloc_hook}};
3944	}	4242	}
3945
3946		4243
3947	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4244	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3948	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4245	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3949	glClear GL_COLOR_BUFFER_BIT;	4246	glClear GL_COLOR_BUFFER_BIT;
3950		4247
…		…
3953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4250	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954	glMatrixMode GL_MODELVIEW;	4251	glMatrixMode GL_MODELVIEW;
3955	glLoadIdentity;	4252	glLoadIdentity;
3956		4253
3957	{	4254	{
3958	package CFClient::UI::Base;	4255	package CFPlus::UI::Base;
3959		4256
3960	($draw_x, $draw_y, $draw_w, $draw_h) =	4257	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961	(0, 0, $self->{w}, $self->{h});	4258	(0, 0, $self->{w}, $self->{h});
3962	}
3963		4259
3964	$self->_draw;	4260	$self->_draw;
		4261	}
3965	}	4262	}
3966		4263
3967	#############################################################################	4264	#############################################################################
3968		4265
3969	package CFClient::UI;	4266	package CFPlus::UI;
3970		4267
3971	$ROOT = new CFClient::UI::Root;	4268	$ROOT = new CFPlus::UI::Root;
3972	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4269	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973		4270
3974	1	4271	1
3975		4272

Diff Legend

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