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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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	{ __w_ => $_[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
…		…
534		593
535	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
536	# functions seems pointless.	595	# functions seems pointless.
537	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538		597
539	sub draw {	598	#sub draw {
540	my ($self) = @_;	599	#CFPlus.xs
541
542	return unless $self->{h} && $self->{w};
543
544	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549
550	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553
554	glPushMatrix;
555	glTranslate $self->{x}, $self->{y}, 0;
556
557	if ($self == $HOVER && $self->{can_hover}) {
558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
559	glEnable GL_BLEND;
560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
561	glBegin GL_QUADS;
562	glVertex 0 , 0;
563	glVertex $self->{w}, 0;
564	glVertex $self->{w}, $self->{h};
565	glVertex 0 , $self->{h};
566	glEnd;
567	glDisable GL_BLEND;
568	}
569
570	if ($ENV{CFPLUS_DEBUG} & 1) {
571	glPushMatrix;
572	glColor 1, 1, 0, 1;
573	glTranslate 0.375, 0.375;
574	glBegin GL_LINE_LOOP;
575	glVertex 0 , 0;
576	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;
579	glEnd;
580	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}
583
584	$self->_draw;
585	glPopMatrix;
586	}
587		600
588	sub _draw {	601	sub _draw {
589	my ($self) = @_;	602	my ($self) = @_;
590		603
591	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
592	}	605	}
593		606
594	sub DESTROY {	607	sub DESTROY {
595	my ($self) = @_;	608	my ($self) = @_;
596		609
597	delete $WIDGET{$self+0};	610	return if CFPlus::in_destruct;
598		611
		612	local $@;
599	eval { $self->destroy };	613	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		615
		616	delete $WIDGET{$self+0};
601	}	617	}
602		618
603	#############################################################################	619	#############################################################################
604		620
605	package CFClient::UI::DrawBG;	621	package CFPlus::UI::DrawBG;
606		622
607	our @ISA = CFClient::UI::Base::;	623	our @ISA = CFPlus::UI::Base::;
608		624
609	use strict;	625	use strict;
610	use CFClient::OpenGL;	626	use CFPlus::OpenGL;
611		627
612	sub new {	628	sub new {
613	my $class = shift;	629	my $class = shift;
614
615	# range [value, low, high, page]
616		630
617	$class->SUPER::new (	631	$class->SUPER::new (
618	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
619	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
620	@_	634	@_
…		…
632	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
633		647
634	glEnable GL_BLEND;	648	glEnable GL_BLEND;
635	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
636	glColor_premultiply @$color;	650	glColor_premultiply @$color;
637
638	glBegin GL_QUADS;
639	glVertex 0 , 0;
640	glVertex 0 , $h;
641	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
642	glVertex $w, 0;
643	glEnd;
644
645	glDisable GL_BLEND;	652	glDisable GL_BLEND;
646	}	653	}
647	}	654	}
648		655
649	#############################################################################	656	#############################################################################
650		657
651	package CFClient::UI::Empty;	658	package CFPlus::UI::Empty;
652		659
653	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
654		661
655	sub new {	662	sub new {
656	my ($class, %arg) = @_;	663	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	664	$class->SUPER::new (can_events => 0, %arg);
658	}	665	}
…		…
665		672
666	sub draw { }	673	sub draw { }
667		674
668	#############################################################################	675	#############################################################################
669		676
670	package CFClient::UI::Container;	677	package CFPlus::UI::Container;
671		678
672	our @ISA = CFClient::UI::Base::;	679	our @ISA = CFPlus::UI::Base::;
673		680
674	sub new {	681	sub new {
675	my ($class, %arg) = @_;	682	my ($class, %arg) = @_;
676		683
677	my $children = delete $arg{children};	684	my $children = delete $arg{children};
…		…
681	can_events => 0,	688	can_events => 0,
682	%arg,	689	%arg,
683	);	690	);
684		691
685	$self->add (@$children)	692	$self->add (@$children)
686	if $children;	693	if $children && @$children;
687		694
688	$self	695	$self
		696	}
		697
		698	sub realloc {
		699	my ($self) = @_;
		700
		701	$self->{force_realloc} = 1;
		702	$self->{force_size_alloc} = 1;
		703	$self->SUPER::realloc;
689	}	704	}
690		705
691	sub add {	706	sub add {
692	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
693		708
694	$_->set_parent ($self)	709	$_->set_parent ($self)
695	for @widgets;	710	for @widgets;
696		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
697	use sort 'stable';	713	use sort 'stable';
698		714
699	$self->{children} = [	715	$self->{children} = [
700	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
701	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
702	];	718	];
703		719
704	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
705	}	725	}
706		726
707	sub children {	727	sub children {
708	@{ $_[0]{children} }	728	@{ $_[0]{children} }
709	}	729	}
710		730
711	sub remove {	731	sub remove {
712	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
713		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
714	delete $child->{parent};	737	delete $child->{parent};
715	$child->hide;	738	$child->hide;
716
717	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
718		741
719	$self->realloc;	742	$self->realloc;
720	}	743	}
721		744
722	sub clear {	745	sub clear {
723	my ($self) = @_;	746	my ($self) = @_;
724		747
725	my $children = delete $self->{children};	748	my $children = $self->{children};
726	$self->{children} = [];	749	$self->{children} = [];
727		750
728	for (@$children) {	751	for (@$children) {
729	delete $_->{parent};	752	delete $_->{parent};
730	$_->hide;	753	$_->hide;
…		…
750	}	773	}
751		774
752	sub _draw {	775	sub _draw {
753	my ($self) = @_;	776	my ($self) = @_;
754		777
755	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
756	}	779	}
757		780
758	#############################################################################	781	#############################################################################
759		782
760	package CFClient::UI::Bin;	783	package CFPlus::UI::Bin;
761		784
762	our @ISA = CFClient::UI::Container::;	785	our @ISA = CFPlus::UI::Container::;
763		786
764	sub new {	787	sub new {
765	my ($class, %arg) = @_;	788	my ($class, %arg) = @_;
766		789
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	790	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		791
769	$class->SUPER::new (children => [$child], %arg)	792	$class->SUPER::new (children => [$child], %arg)
770	}	793	}
771		794
772	sub add {	795	sub add {
773	my ($self, $child) = @_;	796	my ($self, $child) = @_;
774		797
775	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
776	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
777	}	800	}
778		801
779	sub remove {	802	sub remove {
780	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
781		804
782	$self->SUPER::remove ($widget);	805	$self->SUPER::remove ($widget);
783		806
784	$self->{children} = [new CFClient::UI::Empty]	807	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	808	unless @{$self->{children}};
786	}	809	}
787		810
788	sub child { $_[0]->{children}[0] }	811	sub child { $_[0]->{children}[0] }
789		812
790	sub size_request {	813	sub size_request {
791	$_[0]{children}[0]->size_request	814	$_[0]{children}[0]->size_request
792	}	815	}
793		816
794	sub size_allocate {	817	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	818	my ($self, $w, $h) = @_;
796		819
797	$self->{children}[0]->configure (0, 0, $w, $h);	820	$self->{children}[0]->configure (0, 0, $w, $h);
		821
		822	1
798	}	823	}
799		824
800	#############################################################################	825	#############################################################################
801		826
802	# back-buffered drawing area	827	# back-buffered drawing area
803		828
804	package CFClient::UI::Window;	829	package CFPlus::UI::Window;
805		830
806	our @ISA = CFClient::UI::Bin::;	831	our @ISA = CFPlus::UI::Bin::;
807		832
808	use CFClient::OpenGL;	833	use CFPlus::OpenGL;
809		834
810	sub new {	835	sub new {
811	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
812		837
813	my $self = $class->SUPER::new (%arg);	838	my $self = $class->SUPER::new (%arg);
…		…
818		843
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	844	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	845	$self->SUPER::update;
821	}	846	}
822		847
823	sub size_allocate {	848	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	849	my ($self, $w, $h) = @_;
825		850
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	851	$self->update;
		852
		853	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	854	}
829		855
830	sub _render {	856	sub _render {
831	my ($self) = @_;	857	my ($self) = @_;
832		858
…		…
834	}	860	}
835		861
836	sub render_child {	862	sub render_child {
837	my ($self) = @_;	863	my ($self) = @_;
838		864
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	865	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	866	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	867	glClear GL_COLOR_BUFFER_BIT;
842		868
843	{	869	{
844	package CFClient::UI::Base;	870	package CFPlus::UI::Base;
845		871
846	($draw_x, $draw_y, $draw_w, $draw_h) =	872	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	873	(0, 0, $self->{w}, $self->{h});
		874
		875	$self->_render;
848	}	876	}
849
850	$self->_render;
851	};	877	};
852	}	878	}
853		879
854	sub _draw {	880	sub _draw {
855	my ($self) = @_;	881	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		882
859	my $tex = $self->{texture}	883	my $tex = $self->{texture}
860	or return;	884	or return;
861		885
862	glEnable GL_TEXTURE_2D;	886	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	888	glColor 0, 0, 0, 1;
865		889
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	890	$tex->draw_quad_alpha_premultiplied (0, 0);
867		891
868	glDisable GL_TEXTURE_2D;	892	glDisable GL_TEXTURE_2D;
869	}	893	}
870		894
871	#############################################################################	895	#############################################################################
872		896
873	package CFClient::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
874		898
		899	use List::Util qw(min max);
		900
875	our @ISA = CFClient::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
876		902
877	sub new {	903	sub new {
878	my $class = shift;	904	my $class = shift;
879		905
880	$class->SUPER::new (	906	$class->SUPER::new (
…		…
887	sub size_request {	913	sub size_request {
888	my ($self) = @_;	914	my ($self) = @_;
889		915
890	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891		917
892	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
893	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
894		920
895	($w, $h)	921	($w, $h)
896	}	922	}
897		923
898	sub size_allocate {	924	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	925	my ($self, $w, $h) = @_;
900		926
901	my $child = $self->child;	927	my $child = $self->child;
902		928
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	929	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	930	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		931
906	$self->child->configure (0, 0, $w, $h);	932	$self->child->configure (0, 0, $w, $h);
907	$self->update;	933	$self->update;
		934
		935	1
908	}	936	}
909		937
910	sub set_offset {	938	sub set_offset {
911	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
912		940
		941	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		942	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		943
		944	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
915		947
		948	$self->emit (changed => $x, $y);
916	$self->update;	949	$self->update;
		950	}
		951	}
		952
		953	sub set_center {
		954	my ($self, $x, $y) = @_;
		955
		956	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		957	}
		958
		959	sub make_visible {
		960	my ($self, $x, $y, $border) = @_;
		961
		962	if ( $x < $self->{view_x} + $self->{w} * $border
		963	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		964	|| $y < $self->{view_y} + $self->{h} * $border
		965	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		966	) {
		967	$self->set_center ($x, $y);
		968	}
917	}	969	}
918		970
919	# hmm, this does not work for topleft of $self... but we should not ask for that	971	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	972	sub coord2local {
921	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
937		989
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	992	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	993	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	994	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	996	}
945	}	997	}
946		998
947	sub _render {	999	sub _render {
948	my ($self) = @_;	1000	my ($self) = @_;
949		1001
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1002	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};	1003	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1004
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1005	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1006
955	$self->SUPER::_render;	1007	$self->SUPER::_render;
956	}	1008	}
957		1009
958	#############################################################################	1010	#############################################################################
959		1011
960	package CFClient::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
961		1013
962	our @ISA = CFClient::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
963		1015
964	sub new {	1016	sub new {
965	my ($class, %arg) = @_;	1017	my ($class, %arg) = @_;
966		1018
967	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
968		1020
969	my $self;	1021	my $self;
970		1022
971	my $slider = new CFClient::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
		1026	vertical => 0,
		1027	range => [0, 0, 1, 0.01], # HACK fix
		1028	on_changed => sub {
		1029	$self->{hpos} = $_[1];
		1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1031	},
		1032	;
		1033
		1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
972	vertical => 1,	1037	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1039	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1042	},
977	;	1043	;
978		1044
979	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
		1048	can_events => 1,
981	slider => $slider,	1049	hslider => $hslider,
		1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
982	%arg,	1053	%arg,
983	);	1054	);
984		1055
		1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
		1059	expand => 1,
		1060	scroll_x => $self->{scroll_x},
		1061	scroll_y => $self->{scroll_y},
		1062	on_changed => sub {
		1063	my ($vp, $x, $y) = @_;
		1064
		1065	$vp->{parent}{hslider}->set_value ($x);
		1066	$vp->{parent}{vslider}->set_value ($y);
		1067
		1068	0
		1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
		1075	;
		1076
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1077	$self->SUPER::add ($self->{vp});
		1078
986	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
987		1080
988	$self	1081	$self
989	}	1082	}
990		1083
…		…
992	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
993		1086
994	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
995	}	1088	}
996		1089
		1090	sub set_offset { shift->{vp}->set_offset (@_) }
		1091	sub set_center { shift->{vp}->set_center (@_) }
		1092	sub make_visible { shift->{vp}->make_visible (@_) }
		1093
997	sub update {	1094	sub update_slider {
		1095	my ($self) = @_;
		1096
		1097	my $child = ($self->{vp} or return)->child;
		1098
		1099	if ($self->{scroll_x}) {
		1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1101	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1102
		1103	my $visible = $w1 > $w2;
		1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
		1106	$visible ? $self->SUPER::add ($self->{hslider})
		1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
		1109	}
		1110
		1111	if ($self->{scroll_y}) {
		1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1113	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1114
		1115	my $visible = $h1 > $h2;
		1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
		1118	$visible ? $self->SUPER::add ($self->{vslider})
		1119	: $self->SUPER::remove ($self->{vslider});
		1120	}
		1121	}
		1122	}
		1123
		1124	sub start_dragging {
998	my ($self) = @_;	1125	my ($self, $ev) = @_;
999		1126
1000	$self->SUPER::update;	1127	$self->grab_focus;
1001		1128
1002	# todo: overwrite size_allocate of child	1129	my $ox = $self->{vp}{view_x};
1003	my $child = $self->{vp}->child;	1130	my $oy = $self->{vp}{view_y};
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1131
1005	}	1132	$self->{motion} = sub {
		1133	my ($ev, $x, $y) = @_;
1006		1134
		1135	$ox -= $ev->{xrel};
		1136	$oy -= $ev->{yrel};
		1137
		1138	$self->{vp}->set_offset ($ox, $oy);
		1139	};
		1140	}
		1141
		1142	sub invoke_mouse_wheel {
		1143	my ($self, $ev) = @_;
		1144
		1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
		1158
		1159	0
		1160	}
		1161
		1162	sub invoke_button_up {
		1163	my ($self, $ev, $x, $y) = @_;
		1164
		1165	if (delete $self->{motion}) {
		1166	return 1;
		1167	}
		1168
		1169	0
		1170	}
		1171
		1172	sub invoke_mouse_motion {
		1173	my ($self, $ev, $x, $y) = @_;
		1174
		1175	if ($self->{motion}) {
		1176	$self->{motion}->($ev, $x, $y);
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
1007	sub size_allocate {	1183	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1009		1185
		1186	$self->update_slider;
1010	$self->SUPER::size_allocate ($w, $h);	1187	$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	}	1188	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1189
1019	#############################################################################	1190	#############################################################################
1020		1191
1021	package CFClient::UI::Frame;	1192	package CFPlus::UI::Frame;
1022		1193
1023	our @ISA = CFClient::UI::Bin::;	1194	our @ISA = CFPlus::UI::Bin::;
1024		1195
1025	use CFClient::OpenGL;	1196	use CFPlus::OpenGL;
1026		1197
1027	sub new {	1198	sub new {
1028	my $class = shift;	1199	my $class = shift;
1029		1200
1030	$class->SUPER::new (	1201	$class->SUPER::new (
…		…
1040	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1041		1212
1042	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1045
1046	glBegin GL_QUADS;
1047	glVertex 0 , 0;
1048	glVertex 0 , $h;
1049	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1050	glVertex $w, 0;
1051	glEnd;
1052
1053	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1054	}	1218	}
1055		1219
1056	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1057	}	1221	}
1058		1222
1059	#############################################################################	1223	#############################################################################
1060		1224
1061	package CFClient::UI::FancyFrame;	1225	package CFPlus::UI::FancyFrame;
1062		1226
1063	our @ISA = CFClient::UI::Bin::;	1227	our @ISA = CFPlus::UI::Bin::;
1064		1228
1065	use CFClient::OpenGL;	1229	use CFPlus::OpenGL;
		1230
		1231	sub new {
		1232	my ($class, %arg) = @_;
		1233
		1234	if ((exists $arg{label}) && !ref $arg{label}) {
		1235	$arg{label} = new CFPlus::UI::Label
		1236	align => 1,
		1237	valign => 0,
		1238	text => $arg{label},
		1239	fontsize => ($arg{border} || 0.8) * 0.75;
		1240	}
		1241
		1242	my $self = $class->SUPER::new (
		1243	# label => "",
		1244	fg => [0.6, 0.3, 0.1],
		1245	border => 0.8,
		1246	style => 'single',
		1247	%arg,
		1248	);
		1249
		1250	$self
		1251	}
		1252
		1253	sub add {
		1254	my ($self, @widgets) = @_;
		1255
		1256	$self->SUPER::add (@widgets);
		1257	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1258	}
		1259
		1260	sub border {
		1261	int $_[0]{border} * $::FONTSIZE
		1262	}
		1263
		1264	sub size_request {
		1265	my ($self) = @_;
		1266
		1267	($self->{label_w}, undef) = $self->{label}->size_request
		1268	if $self->{label};
		1269
		1270	my ($w, $h) = $self->SUPER::size_request;
		1271
		1272	(
		1273	$w + $self->border * 2,
		1274	$h + $self->border * 2,
		1275	)
		1276	}
		1277
		1278	sub invoke_size_allocate {
		1279	my ($self, $w, $h) = @_;
		1280
		1281	my $border = $self->border;
		1282
		1283	$w -= List::Util::max 0, $border * 2;
		1284	$h -= List::Util::max 0, $border * 2;
		1285
		1286	if (my $label = $self->{label}) {
		1287	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1288	$label->{h} = List::Util::min $h, $border;
		1289	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1290	}
		1291
		1292	$self->child->configure ($border, $border, $w, $h);
		1293
		1294	1
		1295	}
		1296
		1297	sub _draw {
		1298	my ($self) = @_;
		1299
		1300	my $child = $self->{children}[0];
		1301
		1302	my $border = $self->border;
		1303	my ($w, $h) = ($self->{w}, $self->{h});
		1304
		1305	$child->draw;
		1306
		1307	glColor @{$self->{fg}};
		1308	glBegin GL_LINE_STRIP;
		1309	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1310	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1311	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1312	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1313	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1314	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1315	glEnd;
		1316
		1317	if ($self->{label}) {
		1318	glTranslate $border * 2, 0;
		1319	$self->{label}->_draw;
		1320	}
		1321	}
		1322
		1323	#############################################################################
		1324
		1325	package CFPlus::UI::Toplevel;
		1326
		1327	our @ISA = CFPlus::UI::Bin::;
		1328
		1329	use CFPlus::OpenGL;
1066		1330
1067	my $bg =	1331	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1332	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1333	mipmap => 1, wrap => 1;
1070		1334
1071	my @border =	1335	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1336	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);	1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1338
		1339	my @icon =
		1340	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1341	qw(x1_move.png x1_resize.png);
1074		1342
1075	sub new {	1343	sub new {
1076	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1077		1345
1078	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1348	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1349	border => 0.6,
1082	can_events => 1,	1350	can_events => 1,
1083	min_w => 16,	1351	min_w => 64,
1084	min_h => 16,	1352	min_h => 32,
1085	%arg,	1353	%arg,
1086	);	1354	);
1087		1355
1088	$self->{title_widget} = new CFClient::UI::Label	1356	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1357	align => 0,
1090	valign => 1,	1358	valign => 1,
1091	text => $self->{title},	1359	text => $self->{title},
1092	fontsize => $self->{border},	1360	fontsize => $self->{border},
1093	if exists $self->{title};	1361	if exists $self->{title};
1094		1362
		1363	if ($self->{has_close_button}) {
		1364	$self->{close_button} =
		1365	new CFPlus::UI::ImageButton
		1366	path => 'x1_close.png',
		1367	on_activate => sub { $self->emit ("delete") };
		1368
		1369	$self->CFPlus::UI::Container::add ($self->{close_button});
		1370	}
		1371
1095	$self	1372	$self
1096	}	1373	}
1097		1374
1098	sub add {	1375	sub add {
1099	my ($self, @widgets) = @_;	1376	my ($self, @widgets) = @_;
1100		1377
1101	$self->SUPER::add (@widgets);	1378	$self->SUPER::add (@widgets);
		1379	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1380	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1381	}
1104		1382
1105	sub border {	1383	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1384	int $_[0]{border} * $::FONTSIZE
1107	}	1385	}
…		…
1109	sub size_request {	1387	sub size_request {
1110	my ($self) = @_;	1388	my ($self) = @_;
1111		1389
1112	$self->{title_widget}->size_request	1390	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1391	if $self->{title_widget};
		1392
		1393	$self->{close_button}->size_request
		1394	if $self->{close_button};
1114		1395
1115	my ($w, $h) = $self->SUPER::size_request;	1396	my ($w, $h) = $self->SUPER::size_request;
1116		1397
1117	(	1398	(
1118	$w + $self->border * 2,	1399	$w + $self->border * 2,
1119	$h + $self->border * 2,	1400	$h + $self->border * 2,
1120	)	1401	)
1121	}	1402	}
1122		1403
1123	sub size_allocate {	1404	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1405	my ($self, $w, $h) = @_;
1125		1406
1126	if ($self->{title_widget}) {	1407	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1408	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1409	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1410	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1411	}
1131		1412
1132	my $border = $self->border;	1413	my $border = $self->border;
1133		1414
1134	$h -= List::Util::max 0, $border * 2;	1415	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1416	$w -= List::Util::max 0, $border * 2;
		1417
		1418	$self->child->configure ($border, $border, $w, $h);
		1419
		1420	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1421	if $self->{close_button};
		1422
		1423	1
		1424	}
		1425
		1426	sub invoke_delete {
		1427	my ($self) = @_;
		1428
		1429	$self->hide;
1136		1430
1137	$self->child->configure ($border, $border, $w, $h);	1431	1
1138	}	1432	}
1139		1433
1140	sub button_down {	1434	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1435	my ($self, $ev, $x, $y) = @_;
1142		1436
1143	my ($w, $h) = @$self{qw(w h)};	1437	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1438	my $border = $self->border;
1145		1439
…		…
1176		1470
1177	($x, $y) = ($ev->{x}, $ev->{y});	1471	($x, $y) = ($ev->{x}, $ev->{y});
1178		1472
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1473	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1474	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1475	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1476	};
1183	} else {	1477	} else {
1184	return 0;	1478	return 0;
1185	}	1479	}
1186		1480
1187	1	1481	1
1188	}	1482	}
1189		1483
1190	sub button_up {	1484	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1485	my ($self, $ev, $x, $y) = @_;
1192		1486
1193	!!delete $self->{motion}	1487	! ! delete $self->{motion}
1194	}	1488	}
1195		1489
1196	sub mouse_motion {	1490	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1491	my ($self, $ev, $x, $y) = @_;
1198		1492
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1493	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1494
1201	!!$self->{motion}	1495	! ! $self->{motion}
		1496	}
		1497
		1498	sub invoke_visibility_change {
		1499	my ($self, $visible) = @_;
		1500
		1501	delete $self->{motion} unless $visible;
		1502
		1503	0
1202	}	1504	}
1203		1505
1204	sub _draw {	1506	sub _draw {
1205	my ($self) = @_;	1507	my ($self) = @_;
1206		1508
…		…
1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214		1516
1215	my $border = $self->border;	1517	my $border = $self->border;
1216		1518
1217	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1523	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1524
		1525	# move
		1526	my $w2 = ($w - $border) * .5;
		1527	my $h2 = ($h - $border) * .5;
		1528	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1529	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1530	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1531
		1532	# resize
		1533	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1534	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1535	unless $self->{has_close_button};
		1536	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1537	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222		1538
1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1225		1541
1226	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1235	$child->draw;	1551	$child->draw;
1236		1552
1237	if ($self->{title_widget}) {	1553	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1554	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1555	$self->{title_widget}->_draw;
		1556
		1557	glTranslate 0, - ($border - $self->{h});
1240	}	1558	}
		1559
		1560	$self->{close_button}->draw
		1561	if $self->{close_button};
1241	}	1562	}
1242		1563
1243	#############################################################################	1564	#############################################################################
1244		1565
1245	package CFClient::UI::Table;	1566	package CFPlus::UI::Table;
1246		1567
1247	our @ISA = CFClient::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1248		1569
1249	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1250		1571
1251	use CFClient::OpenGL;	1572	use CFPlus::OpenGL;
1252		1573
1253	sub new {	1574	sub new {
1254	my $class = shift;	1575	my $class = shift;
1255		1576
1256	$class->SUPER::new (	1577	$class->SUPER::new (
1257	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1258	@_,	1580	@_,
1259	)	1581	)
1260	}	1582	}
1261		1583
1262	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}
1265
1266	sub add {	1584	sub add {
1267	my ($self, $x, $y, $child) = @_;	1585	my ($self, @widgets) = @_;
1268		1586
1269	$child->set_parent ($self);	1587	for my $child (@widgets) {
1270	$self->{children}[$y][$x] = $child;	1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
1271		1591
1272	$self->realloc;	1592	$self->SUPER::add (@widgets);
1273	}	1593	}
1274		1594
1275	sub remove {	1595	sub add_at {
		1596	my $self = shift;
		1597
		1598	my @widgets;
		1599
		1600	while (@_) {
		1601	my ($col, $row, $child) = splice @_, 0, 3, ();
		1602
		1603	$child->{c_row} = $row;
		1604	$child->{c_col} = $col;
		1605
		1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1276	my ($self, $child) = @_;	1613	my ($self) = @_;
1277		1614
1278	# TODO: not yet implemented	1615	my (@w, @h);
1279	}
1280
1281	# TODO: move to container class maybe? send children a signal on removal?
1282	sub clear {
1283	my ($self) = @_;
1284		1616
1285	my @children = $self->children;	1617	my @children = $self->children;
1286	delete $self->{children};	1618
		1619	# first pass, columns
		1620	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1621	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1622
		1623	my $sw = sum @w[$c .. $c + $cs - 1];
		1624
		1625	if ($w > $sw) {
		1626	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1627	}
1287		1628	}
1288	for (@children) {
1289	delete $_->{parent};
1290	$_->hide;
1291	}
1292		1629
1293	$self->realloc;	1630	# second pass, rows
1294	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1295
1296	sub get_wh {
1297	my ($self) = @_;
1298
1299	my (@w, @h);
1300
1301	for my $y (0 .. $#{$self->{children}}) {
1302	my $row = $self->{children}[$y]
1303	or next;
1304
1305	for my $x (0 .. $#$row) {
1306	my $widget = $row->[$x]
1307	or next;
1308	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1309		1633
1310	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1311	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312	}	1638	}
1313	}	1639	}
1314		1640
1315	(\@w, \@h)	1641	(\@w, \@h)
1316	}	1642	}
…		…
1324	(sum @$ws),	1650	(sum @$ws),
1325	(sum @$hs),	1651	(sum @$hs),
1326	)	1652	)
1327	}	1653	}
1328		1654
1329	sub size_allocate {	1655	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1656	my ($self, $w, $h) = @_;
1331		1657
1332	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1333		1659
1334	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1335	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1336		1662
1337	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1338	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1339	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1340	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1341		1667
1342	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1669
1346	CFClient::UI::harmonize $ws;	1670	CFPlus::UI::harmonize $ws;
		1671
		1672	my @row_expand = @{$self->{row_expand}};
		1673	@row_expand = (1) x @$ws unless @row_expand;
		1674	my $row_expand = (sum @row_expand) || 1;
		1675
		1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1677
1347	CFClient::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1348		1679
1349	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350		1682
1351	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1352	my $row = $self->{children}[$r]	1684	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1353	or next;
1354		1685
1355	my $x = 0;	1686	$widget->configure (
1356	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357		1689	);
1358	for my $c (0 .. $#$row) {	1690	}
1359	my $col_w = $ws->[$c];
1360		1691
1361	if (my $widget = $row->[$c]) {	1692	1
1362	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1363	}
1364		1694
1365	$x += $col_w;	1695	#############################################################################
		1696
		1697	package CFPlus::UI::Fixed;
		1698
		1699	use List::Util qw(min max);
		1700
		1701	our @ISA = CFPlus::UI::Container::;
		1702
		1703	sub _scale($$$) {
		1704	my ($rel, $val, $max) = @_;
		1705
		1706	$rel ? $val * $max : $val
		1707	}
		1708
		1709	sub size_request {
		1710	my ($self) = @_;
		1711
		1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1713
		1714	# determine overall size by querying abs widgets
		1715	for my $child ($self->visible_children) {
		1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
		1719
		1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1366	}	1722	}
1367
1368	$y += $row_h;
1369	}	1723	}
1370		1724
1371	}	1725	my $W = $x2 - $x1;
		1726	my $H = $y2 - $y1;
1372		1727
1373	sub find_widget {	1728	# now layout remaining widgets
		1729	for my $child ($self->visible_children) {
		1730	if ($child->{c_rel}) {
		1731	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1732	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
1374	my ($self, $x, $y) = @_;	1746	my ($self, $W, $H) = @_;
1375		1747
1376	$x -= $self->{x};	1748	for my $child ($self->visible_children) {
1377	$y -= $self->{y};	1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1378		1751
1379	my $res;	1752	$x += $child->{c_halign} * $child->{req_w};
		1753	$y += $child->{c_valign} * $child->{req_h};
1380		1754
1381	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1382	$res = $_->find_widget ($x, $y)	1756	}
1383	and return $res;	1757
1384	}	1758	1
1385
1386	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1387	}
1388
1389	sub _draw {
1390	my ($self) = @_;
1391
1392	for (grep $_, @{$self->{children}}) {
1393	$_->draw for grep $_, @$_;
1394	}
1395	}	1759	}
1396		1760
1397	#############################################################################	1761	#############################################################################
1398		1762
1399	package CFClient::UI::Box;	1763	package CFPlus::UI::Box;
1400		1764
1401	our @ISA = CFClient::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1402		1766
1403	sub size_request {	1767	sub size_request {
1404	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1405		1771
1406	$self->{vertical}	1772	$self->{vertical}
1407	? (	1773	? (
1408	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1409	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1410	)	1776	)
1411	: (	1777	: (
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1414	)	1780	)
1415	}	1781	}
1416		1782
1417	sub size_allocate {	1783	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
1419		1785
1420	my $space = $self->{vertical} ? $h : $w;	1786	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1787	my @children = $self->visible_children;
1422		1788
1423	my @req;	1789	my @req;
1424		1790
1425	if ($self->{homogeneous}) {	1791	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1792	@req = ($space / (@children || 1)) x @children;
1427	} else {	1793	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1794	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1795	my $req = List::Util::sum @req;
1430		1796
1431	if ($req > $space) {	1797	if ($req > $space) {
1432	# ah well, not enough space	1798	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1799	$_ *= $space / $req for @req;
1434	} else {	1800	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1801	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1802
1437	$space = ($space - $req) / $expand; # remaining space to give away	1803	$space = ($space - $req) / $expand; # remaining space to give away
1438		1804
1439	$req[$_] += $space * $children->[$_]{expand}	1805	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1806	for 0 .. $#children;
1441	}	1807	}
1442	}	1808	}
1443		1809
1444	CFClient::UI::harmonize \@req;	1810	CFPlus::UI::harmonize \@req;
1445		1811
1446	my $pos = 0;	1812	my $pos = 0;
1447	for (0 .. $#$children) {	1813	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1814	my $alloc = $req[$_];
1449	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1815	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450		1816
1451	$pos += $alloc;	1817	$pos += $alloc;
1452	}	1818	}
1453		1819
1454	1	1820	1
1455	}	1821	}
1456		1822
1457	#############################################################################	1823	#############################################################################
1458		1824
1459	package CFClient::UI::HBox;	1825	package CFPlus::UI::HBox;
1460		1826
1461	our @ISA = CFClient::UI::Box::;	1827	our @ISA = CFPlus::UI::Box::;
1462		1828
1463	sub new {	1829	sub new {
1464	my $class = shift;	1830	my $class = shift;
1465		1831
1466	$class->SUPER::new (	1832	$class->SUPER::new (
…		…
1469	)	1835	)
1470	}	1836	}
1471		1837
1472	#############################################################################	1838	#############################################################################
1473		1839
1474	package CFClient::UI::VBox;	1840	package CFPlus::UI::VBox;
1475		1841
1476	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1477		1843
1478	sub new {	1844	sub new {
1479	my $class = shift;	1845	my $class = shift;
1480		1846
1481	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1484	)	1850	)
1485	}	1851	}
1486		1852
1487	#############################################################################	1853	#############################################################################
1488		1854
1489	package CFClient::UI::Label;	1855	package CFPlus::UI::Label;
1490		1856
1491	our @ISA = CFClient::UI::DrawBG::;	1857	our @ISA = CFPlus::UI::DrawBG::;
1492		1858
1493	use CFClient::OpenGL;	1859	use CFPlus::OpenGL;
1494		1860
1495	sub new {	1861	sub new {
1496	my ($class, %arg) = @_;	1862	my ($class, %arg) = @_;
1497		1863
1498	my $self = $class->SUPER::new (	1864	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1867	#active_bg => none
1502	#font => default_font	1868	#font => default_font
1503	#text => initial text	1869	#text => initial text
1504	#markup => initial narkup	1870	#markup => initial narkup
1505	#max_w => maximum pixel width	1871	#max_w => maximum pixel width
		1872	#style => 0, # render flags
1506	ellipsise => 3, # end	1873	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1874	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1875	fontsize => 1,
1509	align => -1,	1876	align => -1,
1510	valign => -1,	1877	valign => -1,
1511	padding_x => 2,	1878	padding_x => 2,
1512	padding_y => 2,	1879	padding_y => 2,
1513	can_events => 0,	1880	can_events => 0,
1514	%arg	1881	%arg
1515	);	1882	);
1516		1883
1517	if (exists $self->{template}) {	1884	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1885	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1886	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1887	$self->{template} = $layout;
1521	}	1888	}
1522		1889
1523	if (exists $self->{markup}) {	1890	if (exists $self->{markup}) {
…		…
1527	}	1894	}
1528		1895
1529	$self	1896	$self
1530	}	1897	}
1531		1898
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1899	sub update {
1543	my ($self) = @_;	1900	my ($self) = @_;
1544		1901
1545	delete $self->{texture};	1902	delete $self->{texture};
1546	$self->SUPER::update;	1903	$self->SUPER::update;
…		…
1551		1908
1552	delete $self->{ox};	1909	delete $self->{ox};
1553	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1554	}	1911	}
1555		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1556	sub set_text {	1919	sub set_text {
1557	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1558		1921
1559	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
1561		1924
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1925	$self->{layout}->set_text ($text);
1564		1926
1565	delete $self->{size_req};	1927	delete $self->{size_req};
1566	$self->realloc;	1928	$self->realloc;
1567	$self->update;	1929	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	1935	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	1936	$self->{text} = "M$markup";
1575		1937
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1938	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		1939
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	1940	$self->{layout}->set_markup ($markup);
1580		1941
1581	delete $self->{size_req};	1942	delete $self->{size_req};
1582	$self->realloc;	1943	$self->realloc;
1583	$self->update;	1944	$self->update;
…		…
1595		1956
1596	my ($w, $h) = $self->{layout}->size;	1957	my ($w, $h) = $self->{layout}->size;
1597		1958
1598	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1599	$self->{template}->set_font ($self->{font}) if $self->{font};	1960	$self->{template}->set_font ($self->{font}) if $self->{font};
		1961	$self->{template}->set_width ($self->{max_w} || -1);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1962	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		1963
1602	my ($w2, $h2) = $self->{template}->size;	1964	my ($w2, $h2) = $self->{template}->size;
1603		1965
1604	$w = List::Util::max $w, $w2;	1966	$w = List::Util::max $w, $w2;
…		…
1609	};	1971	};
1610		1972
1611	@{ $self->{size_req} }	1973	@{ $self->{size_req} }
1612	}	1974	}
1613		1975
		1976	sub baseline_shift {
		1977	$_[0]{layout}->descent
		1978	}
		1979
1614	sub size_allocate {	1980	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	1981	my ($self, $w, $h) = @_;
1616		1982
1617	delete $self->{ox};	1983	delete $self->{ox};
1618		1984
1619	delete $self->{texture}	1985	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1986	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1987
		1988	1
1621	}	1989	}
1622		1990
1623	sub set_fontsize {	1991	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	1992	my ($self, $fontsize) = @_;
1625		1993
1626	$self->{fontsize} = $fontsize;	1994	$self->{fontsize} = $fontsize;
		1995	delete $self->{size_req};
1627	delete $self->{texture};	1996	delete $self->{texture};
1628		1997
1629	$self->realloc;	1998	$self->realloc;
1630	}	1999	}
1631		2000
1632	sub reconfigure {	2001	sub reconfigure {
1633	my ($self) = @_;	2002	my ($self) = @_;
1634		2003
1635	delete $self->{size_req};	2004	delete $self->{size_req};
		2005	delete $self->{texture};
1636		2006
1637	$self->SUPER::reconfigure;	2007	$self->SUPER::reconfigure;
1638	}	2008	}
1639		2009
1640	sub _draw {	2010	sub _draw {
1641	my ($self) = @_;	2011	my ($self) = @_;
1642		2012
1643	$self->SUPER::_draw; # draw background, if applicable	2013	$self->SUPER::_draw; # draw background, if applicable
1644		2014
1645	my $tex = $self->{texture} ||= do {	2015	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	2016	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	2017	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	2018	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	2019	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2020	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2021	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		2022
1653	new_from_layout CFClient::Texture $self->{layout}	2023	[$self->{layout}->size]
1654	};	2024	};
1655		2025
1656	unless (exists $self->{ox}) {	2026	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2027	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2028	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1660		2030
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664	};	2036	};
1665		2037
1666	glEnable GL_TEXTURE_2D;	2038	# unless ($self->{list}) {
1667		2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2040	# CFPlus::OpenGL::glNewList $self->{list};
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1670		2042	# CFPlus::OpenGL::glEndList;
1671	if ($tex->{format} == GL_ALPHA) {
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}	2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
1679		2046
1680	glDisable GL_TEXTURE_2D;	2047	$self->{layout}->draw;
1681	}	2048	}
		2049
		2050	#sub destroy {
		2051	# my ($self) = @_;
		2052	#
		2053	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2054	#
		2055	# $self->SUPER::destroy;
		2056	#}
1682		2057
1683	#############################################################################	2058	#############################################################################
1684		2059
1685	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1686		2061
1687	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1688		2063
1689	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1690		2065
1691	sub new {	2066	sub new {
1692	my $class = shift;	2067	my $class = shift;
1693		2068
1694	$class->SUPER::new (	2069	$class->SUPER::new (
1695	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1696	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1697	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1698	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1699	can_hover => 1,	2076	can_hover => 1,
1700	can_focus => 1,	2077	can_focus => 1,
1701	valign => 0,	2078	valign => 0,
1702	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1703	#text => ...	2081	#text => ...
1704	#hidden => "*",	2082	#hidden => "*",
1705	@_	2083	@_
1706	)	2084	)
1707	}	2085	}
…		…
1718		2096
1719	$text =~ s/./*/g if $self->{hidden};	2097	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	2098	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	2099	delete $self->{size_req};
1722		2100
1723	$self->_emit (changed => $self->{text});	2101	$self->emit (changed => $self->{text});
1724		2102
1725	$self->realloc;	2103	$self->realloc;
1726	$self->update;	2104	$self->update;
1727	}	2105	}
1728		2106
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	2121	my ($w, $h) = $self->SUPER::size_request;
1744		2122
1745	($w + 1, $h) # add 1 for cursor	2123	($w + 1, $h) # add 1 for cursor
1746	}	2124	}
1747		2125
1748	sub key_down {	2126	sub invoke_key_down {
1749	my ($self, $ev) = @_;	2127	my ($self, $ev) = @_;
1750		2128
1751	my $mod = $ev->{mod};	2129	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1754		2132
1755	my $text = $self->get_text;	2133	my $text = $self->get_text;
		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756		2136
1757	if ($uni == 8) {	2137	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} elsif ($sym == CFClient::SDLK_HOME) {	2145	} elsif ($sym == CFPlus::SDLK_HOME) {
		2146	# what a hack
		2147	$self->{cursor} =
		2148	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2149	? length $1
		2150	: 0;
		2151	} elsif ($sym == CFPlus::SDLK_END) {
		2152	# uh, again
		2153	$self->{cursor} =
		2154	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2155	? $self->{cursor} + length $1
		2156	: length $self->{text};
		2157	} elsif ($uni == 21) { # ctrl-u
		2158	$text = "";
1766	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {
1768	$self->{cursor} = length $text;
1769	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	2161	$self->emit ('escape');
1771	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	2166	} else {
1774	return 0;	2167	return 0;
1775	}	2168	}
1776		2169
1777	$self->_set_text ($text);	2170	$self->_set_text ($text);
1778		2171
1779	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1780		2174
1781	1	2175	1
1782	}	2176	}
1783		2177
1784	sub focus_in {	2178	sub invoke_focus_in {
1785	my ($self) = @_;	2179	my ($self) = @_;
1786		2180
1787	$self->{last_activity} = $::NOW;	2181	$self->{last_activity} = $::NOW;
1788		2182
1789	$self->SUPER::focus_in;	2183	$self->SUPER::invoke_focus_in
1790	}	2184	}
1791		2185
1792	sub button_down {	2186	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2187	my ($self, $ev, $x, $y) = @_;
1794		2188
1795	$self->SUPER::button_down ($ev, $x, $y);	2189	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2190
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2191	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2192
1799	# byte-index to char-index	2193	# byte-index to char-index
1800	my $text = $self->{text};	2194	my $text = $self->{text};
1801	utf8::encode $text;	2195	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2196	$self->{cursor} = length $text;
1803		2197
1804	$self->_set_text ($self->{text});	2198	$self->_set_text ($self->{text});
1805	$self->update;	2199	$self->update;
1806		2200
1807	1	2201	1
1808	}	2202	}
1809		2203
1810	sub mouse_motion {	2204	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2205	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2206	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2207
1814	0	2208	1
1815	}	2209	}
1816		2210
1817	sub _draw {	2211	sub _draw {
1818	my ($self) = @_;	2212	my ($self) = @_;
1819		2213
…		…
1826	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1827	}	2221	}
1828		2222
1829	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1830	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1831	glBegin GL_QUADS;
1832	glVertex 0 , 0;
1833	glVertex 0 , $self->{h};
1834	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1835	glVertex $self->{w}, 0;
1836	glEnd;
1837	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1838		2227
1839	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1840		2229
1841	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1843		2232
1844	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1845	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1846	utf8::encode $text;	2235	utf8::encode $text;
1847		2236
1848	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2237	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1849	}	2238	}
1850		2239
1851	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1852	glBegin GL_LINES;	2241	glBegin GL_LINES;
1853	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2242	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2243	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855	glEnd;	2244	glEnd;
1856	}
1857	}
1858		2245
		2246	glLineWidth 3;
		2247	glColor @{$self->{active_outline}};
		2248	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2249	glLineWidth 1;
		2250
		2251	} else {
		2252	glColor @{$self->{outline}};
		2253	glTranslate .375, .375;
		2254	glBegin GL_LINE_STRIP;
		2255	glVertex 0, $self->{h} * .5;
		2256	glVertex 0, $self->{h} - 3;
		2257	glVertex $self->{w} - 1, $self->{h} - 3;
		2258	glVertex $self->{w} - 1, $self->{h} * .5;
		2259	glEnd;
		2260	}
		2261	}
		2262
		2263	#############################################################################
		2264
1859	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1860		2266
1861	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1862		2268
1863	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1864		2270
1865	sub key_down {	2271	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1867		2273
1868	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1869		2275
1870	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1871	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
		2279
1873	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2282	$self->emit (activate => $txt);
1876	$self->update;	2283	$self->update;
1877		2284
1878	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1881	}	2288	}
1882	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2293	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2295	}
1889		2296
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2300
1894	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2303	} else {
1897	$self->set_text ($self->{history_saveback});	2304	$self->set_text ($self->{history_saveback});
1898	}	2305	}
1899		2306
1900	} else {	2307	} else {
1901	return $self->SUPER::key_down ($ev)	2308	return $self->SUPER::invoke_key_down ($ev)
1902	}	2309	}
1903		2310
1904	1	2311	1
1905	}	2312	}
1906		2313
1907	#############################################################################	2314	#############################################################################
1908		2315
		2316	package CFPlus::UI::TextEdit;
		2317
		2318	our @ISA = CFPlus::UI::EntryBase::;
		2319
		2320	use CFPlus::OpenGL;
		2321
		2322	sub move_cursor_ver {
		2323	my ($self, $dy) = @_;
		2324
		2325	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2326
		2327	$y += $dy;
		2328
		2329	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2330	$self->{cursor} = $index;
		2331	delete $self->{cur_h};
		2332	$self->update;
		2333	return;
		2334	}
		2335	}
		2336
		2337	sub invoke_key_down {
		2338	my ($self, $ev) = @_;
		2339
		2340	my $sym = $ev->{sym};
		2341
		2342	if ($sym == CFPlus::SDLK_UP) {
		2343	$self->move_cursor_ver (-1);
		2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2345	$self->move_cursor_ver (+1);
		2346	} else {
		2347	return $self->SUPER::invoke_key_down ($ev)
		2348	}
		2349
		2350	1
		2351	}
		2352
		2353	#############################################################################
		2354
1909	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
1910		2356
1911	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
1912		2358
1913	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1914		2360
1915	my @tex =	2361	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
1918		2364
1919	sub new {	2365	sub new {
1920	my $class = shift;	2366	my $class = shift;
1921		2367
1922	$class->SUPER::new (	2368	$class->SUPER::new (
1923	padding_x => 4,
1924	padding_y => 4,
1925	fg => [1, 1, 1],
1926	active_fg => [0, 0, 1],
1927	can_hover => 1,	2369	can_hover => 1,
1928	align => 0,	2370	align => 0,
1929	valign => 0,	2371	valign => 0,
1930	can_events => 1,	2372	can_events => 1,
1931	@_	2373	@_
1932	)	2374	)
1933	}	2375	}
1934		2376
1935	sub activate { }
1936
1937	sub button_up {	2377	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2378	my ($self, $ev, $x, $y) = @_;
1939		2379
1940	$self->emit ("activate")	2380	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2381	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2382	&& $y >= 0 && $y < $self->{h};
…		…
1945	}	2385	}
1946		2386
1947	sub _draw {	2387	sub _draw {
1948	my ($self) = @_;	2388	my ($self) = @_;
1949		2389
1950	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1951
1952	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
1955		2393
		2394	my $tex = $tex[$GRAB == $self];
1956	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957		2396
1958	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
1959		2398
1960	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
1961	}	2400	}
1962		2401
1963	#############################################################################	2402	#############################################################################
1964		2403
1965	package CFClient::UI::CheckBox;	2404	package CFPlus::UI::Button;
1966		2405
1967	our @ISA = CFClient::UI::DrawBG::;	2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
1968		2409
1969	my @tex =	2410	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2412	qw(b1_button_inactive.png b1_button_active.png);
		2413
		2414	sub new {
		2415	my $class = shift;
		2416
		2417	$class->SUPER::new (
		2418	padding_x => 4,
		2419	padding_y => 4,
		2420	fg => [1.0, 1.0, 1.0],
		2421	active_fg => [0.8, 0.8, 0.8],
		2422	can_hover => 1,
		2423	align => 0,
		2424	valign => 0,
		2425	can_events => 1,
		2426	@_
		2427	)
		2428	}
		2429
		2430	sub invoke_button_up {
		2431	my ($self, $ev, $x, $y) = @_;
		2432
		2433	$self->emit ("activate")
		2434	if $x >= 0 && $x < $self->{w}
		2435	&& $y >= 0 && $y < $self->{h};
		2436
		2437	1
		2438	}
		2439
		2440	sub _draw {
		2441	my ($self) = @_;
		2442
		2443	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2444
		2445	glEnable GL_TEXTURE_2D;
		2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2447	glColor 0, 0, 0, 1;
		2448
		2449	my $tex = $tex[$GRAB == $self];
		2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2451
		2452	glDisable GL_TEXTURE_2D;
		2453
		2454	$self->SUPER::_draw;
		2455	}
		2456
		2457	#############################################################################
		2458
		2459	package CFPlus::UI::CheckBox;
		2460
		2461	our @ISA = CFPlus::UI::DrawBG::;
		2462
		2463	my @tex =
		2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2466
1973	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
1974		2468
1975	sub new {	2469	sub new {
1976	my $class = shift;	2470	my $class = shift;
1977		2471
1978	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2486	my ($self) = @_;
1993		2487
1994	(6) x 2	2488	(6) x 2
1995	}	2489	}
1996		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
1997	sub button_down {	2499	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2500	my ($self, $ev, $x, $y) = @_;
1999		2501
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2504	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2505	} else {
2005	return 0	2506	return 0
2006	}	2507	}
2007		2508
2008	1	2509	1
…		…
2028	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
2029	}	2530	}
2030		2531
2031	#############################################################################	2532	#############################################################################
2032		2533
2033	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
2034		2535
2035	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
2036		2537
2037	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2539
2040	our %loaded_images;	2540	our %texture_cache;
2041		2541
2042	sub new {	2542	sub new {
2043	my $class = shift;	2543	my $class = shift;
2044		2544
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	scale => 1,
		2548	@_,
		2549	);
2046		2550
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2551	$self->{path} || $self->{tex}
		2552	or Carp::croak "'path' or 'tex' attributes required";
2048		2553
2049	$loaded_images{$self->{image}} ||=	2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2555	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2556
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2557	CFPlus::weaken $texture_cache{$self->{path}};
2053		2558
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2560
2058	$self	2561	$self
2059	}	2562	}
2060		2563
		2564	sub STORABLE_freeze {
		2565	my ($self, $cloning) = @_;
		2566
		2567	$self->{path}
		2568	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2569
		2570	$self->{path}
		2571	}
		2572
		2573	sub STORABLE_attach {
		2574	my ($self, $cloning, $path) = @_;
		2575
		2576	$self->new (path => $path)
		2577	}
		2578
2061	sub size_request {	2579	sub size_request {
2062	my ($self) = @_;	2580	my ($self) = @_;
2063		2581
2064	($self->{tex}->{w}, $self->{tex}->{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2065	}	2583	}
2066		2584
2067	sub _draw {	2585	sub _draw {
2068	my ($self) = @_;	2586	my ($self) = @_;
2069		2587
…		…
2086	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2087	}	2605	}
2088		2606
2089	#############################################################################	2607	#############################################################################
2090		2608
		2609	package CFPlus::UI::ImageButton;
		2610
		2611	our @ISA = CFPlus::UI::Image::;
		2612
		2613	use CFPlus::OpenGL;
		2614
		2615	my %textures;
		2616
		2617	sub new {
		2618	my $class = shift;
		2619
		2620	my $self = $class->SUPER::new (
		2621	padding_x => 4,
		2622	padding_y => 4,
		2623	fg => [1, 1, 1],
		2624	active_fg => [0, 0, 1],
		2625	can_hover => 1,
		2626	align => 0,
		2627	valign => 0,
		2628	can_events => 1,
		2629	@_
		2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
		2637	}
		2638
		2639	sub invoke_button_up {
		2640	my ($self, $ev, $x, $y) = @_;
		2641
		2642	$self->emit ("activate")
		2643	if $x >= 0 && $x < $self->{w}
		2644	&& $y >= 0 && $y < $self->{h};
		2645
		2646	1
		2647	}
		2648
		2649	#############################################################################
		2650
2091	package CFClient::UI::VGauge;	2651	package CFPlus::UI::VGauge;
2092		2652
2093	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2094		2654
2095	use List::Util qw(min max);	2655	use List::Util qw(min max);
2096		2656
2097	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2098		2658
2099	my %tex = (	2659	my %tex = (
2100	food => [	2660	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2663	],
2104	grace => [	2664	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2666	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107	],	2667	],
2108	hp => [	2668	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2671	],
2112	mana => [	2672	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2674	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115	],	2675	],
2116	);	2676	);
2117		2677
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2738	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2739	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2740
2181	my $h1 = $self->{h} * (1 - $ycut1);	2741	my $h1 = $self->{h} * (1 - $ycut1);
2182	my $h2 = $self->{h} * (1 - $ycut2);	2742	my $h2 = $self->{h} * (1 - $ycut2);
		2743	my $h3 = $self->{h};
		2744
		2745	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183		2746
2184	glEnable GL_BLEND;	2747	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2748	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2749	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
…		…
2206		2769
2207	if ($t3) {	2770	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2771	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2772	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2773	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2774	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2775	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2776	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2777	glEnd;
2215	}	2778	}
2216		2779
2217	glDisable GL_BLEND;	2780	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2219	}	2782	}
2220		2783
2221	#############################################################################	2784	#############################################################################
2222		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2223	package CFClient::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2224		2911
2225	our @ISA = CFClient::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2226		2913
2227	sub new {	2914	sub new {
2228	my ($class, %arg) = @_;	2915	my ($class, %arg) = @_;
2229		2916
2230	my $self = $class->SUPER::new (	2917	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2919	can_hover => 1,
2233	can_events => 1,	2920	can_events => 1,
2234	%arg,	2921	%arg,
2235	);	2922	);
2236		2923
2237	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2924	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2925	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2926	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240		2927
2241	$self	2928	$self
2242	}	2929	}
2243		2930
2244	sub set_fontsize {	2931	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2952	$self->{value}->set_text ($val);
2266	}	2953	}
2267		2954
2268	#############################################################################	2955	#############################################################################
2269		2956
2270	package CFClient::UI::Slider;	2957	package CFPlus::UI::Slider;
2271		2958
2272	use strict;	2959	use strict;
2273		2960
2274	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2275		2962
2276	our @ISA = CFClient::UI::DrawBG::;	2963	our @ISA = CFPlus::UI::DrawBG::;
2277		2964
2278	my @tex =	2965	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2966	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2967	qw(s1_slider.png s1_slider_bg.png);
2281		2968
2282	sub new {	2969	sub new {
2283	my $class = shift;	2970	my $class = shift;
2284		2971
…		…
2305	$self->update;	2992	$self->update;
2306		2993
2307	$self	2994	$self
2308	}	2995	}
2309		2996
2310	sub changed { }
2311
2312	sub set_range {	2997	sub set_range {
2313	my ($self, $range) = @_;	2998	my ($self, $range) = @_;
2314		2999
2315	($range, $self->{range}) = ($self->{range}, $range);	3000	($range, $self->{range}) = ($self->{range}, $range);
2316		3001
…		…
2336	if $unit;	3021	if $unit;
2337		3022
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3023	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		3024
2340	if ($value != $old_value) {	3025	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	3026	$self->emit (changed => $value);
2342	$self->update;	3027	$self->update;
2343	}	3028	}
2344	}	3029	}
2345		3030
2346	sub size_request {	3031	sub size_request {
2347	my ($self) = @_;	3032	my ($self) = @_;
2348		3033
2349	($self->{req_w}, $self->{req_h})	3034	($self->{req_w}, $self->{req_h})
2350	}	3035	}
2351		3036
2352	sub button_down {	3037	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	3038	my ($self, $ev, $x, $y) = @_;
2354		3039
2355	$self->SUPER::button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		3041
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		3043
2359	$self->mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
2360	}
2361		3045
		3046	1
		3047	}
		3048
2362	sub mouse_motion {	3049	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2364		3051
2365	if ($GRAB == $self) {	3052	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	3053	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		3054
…		…
2371		3058
2372	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3059	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373	} else {	3060	} else {
2374	return 0;	3061	return 0;
2375	}	3062	}
		3063
		3064	1
		3065	}
		3066
		3067	sub invoke_mouse_wheel {
		3068	my ($self, $ev) = @_;
		3069
		3070	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3071
		3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3073
		3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2376		3075
2377	1	3076	1
2378	}	3077	}
2379		3078
2380	sub update {	3079	sub update {
…		…
2431	glDisable GL_TEXTURE_2D;	3130	glDisable GL_TEXTURE_2D;
2432	}	3131	}
2433		3132
2434	#############################################################################	3133	#############################################################################
2435		3134
2436	package CFClient::UI::ValSlider;	3135	package CFPlus::UI::ValSlider;
2437		3136
2438	our @ISA = CFClient::UI::HBox::;	3137	our @ISA = CFPlus::UI::HBox::;
2439		3138
2440	sub new {	3139	sub new {
2441	my ($class, %arg) = @_;	3140	my ($class, %arg) = @_;
2442		3141
2443	my $range = delete $arg{range};	3142	my $range = delete $arg{range};
2444		3143
2445	my $self = $class->SUPER::new (	3144	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3145	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3146	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	3147	to_value => sub { shift },
2449	from_value => sub { shift },	3148	from_value => sub { shift },
2450	%arg,	3149	%arg,
2451	);	3150	);
2452		3151
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	3171	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	3172	sub set_value { shift->{slider}->set_value (@_) }
2474		3173
2475	#############################################################################	3174	#############################################################################
2476		3175
2477	package CFClient::UI::TextScroller;	3176	package CFPlus::UI::TextScroller;
2478		3177
2479	our @ISA = CFClient::UI::HBox::;	3178	our @ISA = CFPlus::UI::HBox::;
2480		3179
2481	use CFClient::OpenGL;	3180	use CFPlus::OpenGL;
2482		3181
2483	sub new {	3182	sub new {
2484	my $class = shift;	3183	my $class = shift;
2485		3184
2486	my $self = $class->SUPER::new (	3185	my $self = $class->SUPER::new (
2487	fontsize => 1,	3186	fontsize => 1,
2488	can_events => 0,	3187	can_events => 1,
2489	indent => 0,	3188	indent => 0,
2490	#font => default_font	3189	#font => default_font
2491	@_,	3190	@_,
2492		3191
2493	layout => (new CFClient::Layout 1),	3192	layout => (new CFPlus::Layout),
2494	par => [],	3193	par => [],
		3194	max_par => 0,
2495	height => 0,	3195	height => 0,
2496	children => [	3196	children => [
2497	(new CFClient::UI::Empty expand => 1),	3197	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	3198	(new CFPlus::UI::Slider vertical => 1),
2499	],	3199	],
2500	);	3200	);
2501		3201
2502	$self->{children}[1]->connect (changed => sub { $self->update });	3202	$self->{children}[1]->connect (changed => sub { $self->update });
2503		3203
…		…
2509		3209
2510	$self->{fontsize} = $fontsize;	3210	$self->{fontsize} = $fontsize;
2511	$self->reflow;	3211	$self->reflow;
2512	}	3212	}
2513		3213
		3214	sub size_request {
		3215	my ($self) = @_;
		3216
		3217	my ($empty, $slider) = $self->visible_children;
		3218
		3219	local $self->{children} = [$empty, $slider];
		3220	$self->SUPER::size_request
		3221	}
		3222
2514	sub size_allocate {	3223	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	3224	my ($self, $w, $h) = @_;
2516		3225
2517	$self->SUPER::size_allocate ($w, $h);	3226	my ($empty, $slider, @other) = @{ $self->{children} };
		3227	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		3228
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	3229	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3230	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	3231	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3232	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		3233
2524	$self->reflow;	3234	$self->reflow;
2525	}
2526		3235
2527	sub text_size {	3236	local $self->{children} = [$empty, $slider];
		3237	$self->SUPER::invoke_size_allocate ($w, $h)
		3238	}
		3239
		3240	sub invoke_mouse_wheel {
2528	my ($self, $text, $indent) = @_;	3241	my ($self, $ev) = @_;
		3242
		3243	return 0 unless $ev->{dy}; # only vertical movements
		3244
		3245	$self->{children}[1]->emit (mouse_wheel => $ev);
		3246
		3247	1
		3248	}
		3249
		3250	sub get_layout {
		3251	my ($self, $para) = @_;
2529		3252
2530	my $layout = $self->{layout};	3253	my $layout = $self->{layout};
2531		3254
		3255	$layout->set_font ($self->{font}) if $self->{font};
		3256	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3257	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	3258	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3259	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$layout->set_markup ($text);	3260	$layout->set_markup ($para->{markup});
		3261
		3262	$layout->set_shapes (
		3263	map
		3264	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3265	@{$para->{widget}}
2536		3266	);
		3267
2537	$layout->size	3268	$layout
2538	}	3269	}
2539		3270
2540	sub reflow {	3271	sub reflow {
2541	my ($self) = @_;	3272	my ($self) = @_;
2542		3273
…		…
2549		3280
2550	# todo: base offset on lines or so, not on pixels	3281	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	3282	$self->{children}[1]->set_value ($offset);
2552	}	3283	}
2553		3284
		3285	sub current_paragraph {
		3286	my ($self) = @_;
		3287
		3288	$self->{top_paragraph} - 1
		3289	}
		3290
		3291	sub scroll_to {
		3292	my ($self, $para) = @_;
		3293
		3294	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3295
		3296	$self->{scroll_to} = $para;
		3297	$self->update;
		3298	}
		3299
2554	sub clear {	3300	sub clear {
2555	my ($self) = @_;	3301	my ($self) = @_;
		3302
		3303	my (undef, undef, @other) = @{ $self->{children} };
		3304	$self->remove ($_) for @other;
2556		3305
2557	$self->{par} = [];	3306	$self->{par} = [];
2558	$self->{height} = 0;	3307	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3308	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	3309	}
2561		3310
2562	sub add_paragraph {	3311	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	3312	my $self = shift;
2564		3313
2565	for my $line (split /\n/, $text) {	3314	for my $para (@_) {
2566	my ($w, $h) = $self->text_size ($line);	3315	$para = {
		3316	fg => [1, 1, 1, 1],
		3317	indent => 0,
		3318	markup => "",
		3319	widget => [],
		3320	ref $para ? %$para : (markup => $para),
		3321	w => 1e10,
		3322	wrapped => 1,
		3323	};
		3324
		3325	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3326	push @{$self->{par}}, $para;
		3327	}
		3328
		3329	if (my $max = $self->{max_par}) {
		3330	shift @{$self->{par}} while @{$self->{par}} > $max;
		3331	}
		3332
		3333	$self->{need_reflow}++;
		3334	$self->update;
		3335	}
		3336
		3337	sub scroll_to_bottom {
		3338	my ($self) = @_;
		3339
		3340	$self->{scroll_to} = $#{$self->{par}};
		3341	$self->update;
		3342	}
		3343
		3344	sub force_uptodate {
		3345	my ($self) = @_;
		3346
		3347	if (delete $self->{need_reflow}) {
		3348	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3349
		3350	my $height = 0;
		3351
		3352	for my $para (@{$self->{par}}) {
		3353	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3354	my $layout = $self->get_layout ($para);
		3355	my ($w, $h) = $layout->size;
		3356
		3357	$para->{w} = $w + $para->{indent};
		3358	$para->{h} = $h;
		3359	$para->{wrapped} = $layout->has_wrapped;
		3360	}
		3361
		3362	$para->{y} = $height;
		3363	$height += $para->{h};
		3364	}
		3365
2567	$self->{height} += $h;	3366	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3367	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		3368
2571	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3369	delete $self->{texture};
		3370	}
		3371
		3372	if (my $paridx = delete $self->{scroll_to}) {
		3373	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3374	}
2572	}	3375	}
2573		3376
2574	sub update {	3377	sub update {
2575	my ($self) = @_;	3378	my ($self) = @_;
2576		3379
…		…
2579	return unless $self->{h} > 0;	3382	return unless $self->{h} > 0;
2580		3383
2581	delete $self->{texture};	3384	delete $self->{texture};
2582		3385
2583	$ROOT->on_post_alloc ($self => sub {	3386	$ROOT->on_post_alloc ($self => sub {
		3387	$self->force_uptodate;
		3388
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3389	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		3390
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3391	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	3392	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	3393	glClear GL_COLOR_BUFFER_BIT;
2616		3394
		3395	package CFPlus::UI::Base;
		3396	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3397	(0, 0, $self->{w}, $self->{h});
		3398
		3399	my $top = int $self->{children}[1]{range}[0];
		3400
		3401	my $paridx = 0;
		3402	my $top_paragraph;
2617	my $top = int $self->{children}[1]{range}[0];	3403	my $top = int $self->{children}[1]{range}[0];
2618		3404
2619	my $y0 = $top;	3405	my $y0 = $top;
2620	my $y1 = $top + $H;	3406	my $y1 = $top + $H;
2621		3407
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	3408	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	3409	my $h = $para->{h};
		3410	my $y = $para->{y};
2634		3411
2635	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	3413	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		3414
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3415	$layout->render ($para->{indent}, $y - $y0);
		3416	$layout->draw;
2642		3417
2643	glRasterPos $par->[3], $y - $y0;	3418	if (my @w = @{ $para->{widget} }) {
2644	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3419	my @s = $layout->get_shapes;
		3420
		3421	for (@w) {
		3422	my ($dx, $dy) = splice @s, 0, 2, ();
		3423
		3424	$_->{x} = $dx + $para->{indent};
		3425	$_->{y} = $dy + $y - $y0;
		3426
		3427	$_->draw;
		3428	}
		3429	}
2645	}	3430	}
2646		3431
2647	$y += $h;	3432	$paridx++;
		3433	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3434	}
2649		3435
2650	glDisable GL_BLEND;	3436	$self->{top_paragraph} = $top_paragraph;
2651	};	3437	};
2652	});	3438	});
		3439	}
		3440
		3441	sub reconfigure {
		3442	my ($self) = @_;
		3443
		3444	$self->SUPER::reconfigure;
		3445
		3446	$_->{w} = 1e10 for @{ $self->{par} };
		3447	$self->reflow;
2653	}	3448	}
2654		3449
2655	sub _draw {	3450	sub _draw {
2656	my ($self) = @_;	3451	my ($self) = @_;
2657		3452
…		…
2660	glColor 0, 0, 0, 1;	3455	glColor 0, 0, 0, 1;
2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3456	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662	glDisable GL_TEXTURE_2D;	3457	glDisable GL_TEXTURE_2D;
2663		3458
2664	$self->{children}[1]->draw;	3459	$self->{children}[1]->draw;
2665
2666	}	3460	}
2667		3461
2668	#############################################################################	3462	#############################################################################
2669		3463
2670	package CFClient::UI::Animator;	3464	package CFPlus::UI::Animator;
2671		3465
2672	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2673		3467
2674	our @ISA = CFClient::UI::Bin::;	3468	our @ISA = CFPlus::UI::Bin::;
2675		3469
2676	sub moveto {	3470	sub moveto {
2677	my ($self, $x, $y) = @_;	3471	my ($self, $x, $y) = @_;
2678		3472
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3473	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3501	glPopMatrix;
2708	}	3502	}
2709		3503
2710	#############################################################################	3504	#############################################################################
2711		3505
2712	package CFClient::UI::Flopper;	3506	package CFPlus::UI::Flopper;
2713		3507
2714	our @ISA = CFClient::UI::Button::;	3508	our @ISA = CFPlus::UI::Button::;
2715		3509
2716	sub new {	3510	sub new {
2717	my $class = shift;	3511	my $class = shift;
2718		3512
2719	my $self = $class->SUPER::new (	3513	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3525	$self->{other}->toggle_visibility;
2732	}	3526	}
2733		3527
2734	#############################################################################	3528	#############################################################################
2735		3529
2736	package CFClient::UI::Tooltip;	3530	package CFPlus::UI::Tooltip;
2737		3531
2738	our @ISA = CFClient::UI::Bin::;	3532	our @ISA = CFPlus::UI::Bin::;
2739		3533
2740	use CFClient::OpenGL;	3534	use CFPlus::OpenGL;
2741		3535
2742	sub new {	3536	sub new {
2743	my $class = shift;	3537	my $class = shift;
2744		3538
2745	$class->SUPER::new (	3539	$class->SUPER::new (
…		…
2748	)	3542	)
2749	}	3543	}
2750		3544
2751	sub set_tooltip_from {	3545	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3546	my ($self, $widget) = @_;
		3547
		3548	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3549	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3550
2754	my $tooltip = $widget->{tooltip};	3551	my $tooltip = $widget->{tooltip};
2755		3552
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3553	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3554	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3558	}
2762		3559
2763	$tooltip =~ s/^\n+//;	3560	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3561	$tooltip =~ s/\n+$//;
2765		3562
2766	$self->add (new CFClient::UI::Label	3563	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3564	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3565	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3566	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3567	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3568	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3569	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3570	);
2774	}	3571	}
2775		3572
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3576	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3577
2781	($w + 4, $h + 4)	3578	($w + 4, $h + 4)
2782	}	3579	}
2783		3580
2784	sub size_allocate {	3581	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3582	my ($self, $w, $h) = @_;
2786		3583
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3584	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3585	}
2789		3586
2790	sub visibility_change {	3587	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3588	my ($self, $visible) = @_;
2792		3589
2793	return unless $visible;	3590	return unless $visible;
2794		3591
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3592	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3593	my $widget = $self->{owner}
2797	or return;	3594	or return;
2798		3595
		3596	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3597	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3598
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3599	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3600	if $x + $self->{w} > $self->{root}{w};
2803		3601
2804	$self->move_abs ($x, $y);	3602	$self->move_abs ($x, $y);
		3603	} else {
		3604	$self->hide;
		3605	}
2805	});	3606	});
2806	}	3607	}
2807		3608
2808	sub _draw {	3609	sub _draw {
2809	my ($self) = @_;	3610	my ($self) = @_;
…		…
2811	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
2812		3613
2813	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
2814		3615
2815	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
2816	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
2817	glVertex 0 , 0;
2818	glVertex 0 , $h;
2819	glVertex $w, $h;
2820	glVertex $w, 0;
2821	glEnd;
2822		3618
2823	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
2824	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
2825	glVertex 0 , 0;
2826	glVertex 0 , $h;
2827	glVertex $w, $h;
2828	glVertex $w, 0;
2829	glEnd;
2830		3621
2831	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
2832		3623
2833	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
2834	}	3625	}
2835		3626
2836	#############################################################################	3627	#############################################################################
2837		3628
2838	package CFClient::UI::Face;	3629	package CFPlus::UI::Face;
2839		3630
2840	our @ISA = CFClient::UI::Base::;	3631	our @ISA = CFPlus::UI::DrawBG::;
2841		3632
2842	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
2843		3634
2844	sub new {	3635	sub new {
2845	my $class = shift;	3636	my $class = shift;
2846		3637
2847	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
2848	aspect => 1,	3641	aspect => 1,
2849	can_events => 0,	3642	can_events => 0,
2850	@_,	3643	@_,
2851	);	3644	);
2852		3645
2853	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
2854	Scalar::Util::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
2855		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2856	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
2857	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858	hard => 1,	3652	parked => 1,
2859	interval => $self->{animspeed},
2860	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
2861	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
2862	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
2863	},	3665	},
2864	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
2865	}	3670	}
2866		3671
2867	$self	3672	$self
2868	}	3673	}
2869		3674
		3675	sub update_timer {
		3676	my ($self) = @_;
		3677
		3678	return unless $self->{timer};
		3679
		3680	if ($self->{visible}) {
		3681	$self->{timer}->at (
		3682	$self->{anim_start}
		3683	+ $self->{animspeed}
		3684	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3685	);
		3686	$self->{timer}->start;
		3687	} else {
		3688	$self->{timer}->stop;
		3689	}
		3690	}
		3691
		3692	sub update_face {
		3693	my ($self) = @_;
		3694
		3695	if ($::CONN) {
		3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3697	if ($anim && @$anim) {
		3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3699	delete $self->{face_change_cb};
		3700
		3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
		3705	}
		3706	}
		3707	}
		3708	}
		3709	}
		3710
2870	sub size_request {	3711	sub size_request {
2871	(32, 8)	3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
		3727
		3728	($self->{size_w} || 8, $self->{size_h} || 8)
2872	}	3729	}
2873		3730
2874	sub update {	3731	sub update {
2875	my ($self) = @_;	3732	my ($self) = @_;
2876		3733
2877	return unless $self->{visible};	3734	return unless $self->{visible};
2878		3735
2879	$self->SUPER::update;	3736	$self->SUPER::update;
2880	}	3737	}
2881		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
2882	sub _draw {	3747	sub _draw {
2883	my ($self) = @_;	3748	my ($self) = @_;
2884		3749
2885	return unless $::CONN;	3750	$self->SUPER::_draw;
2886		3751
2887	my $face;	3752	if (my $tex = $self->{tex}) {
2888
2889	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];
2891
2892	$face = $anim->[ $self->{frame} % @$anim ]
2893	if $anim && @$anim;
2894	}
2895
2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2897
2898	if ($tex) {
2899	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
2902	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
2905	}	3759	}
2906		3760
2907	sub destroy {	3761	sub destroy {
2908	my ($self) = @_;	3762	my ($self) = @_;
2909		3763
2910	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
2911	if $self->{timer};	3765	if $self->{timer};
2912		3766
2913	$self->SUPER::destroy;	3767	$self->SUPER::destroy;
2914	}	3768	}
2915		3769
2916	#############################################################################	3770	#############################################################################
2917		3771
2918	package CFClient::UI::Buttonbar;	3772	package CFPlus::UI::Buttonbar;
2919		3773
2920	our @ISA = CFClient::UI::HBox::;	3774	our @ISA = CFPlus::UI::HBox::;
2921		3775
2922	# TODO: should actualyl wrap buttons and other goodies.	3776	# TODO: should actually wrap buttons and other goodies.
2923		3777
2924	#############################################################################	3778	#############################################################################
2925		3779
2926	package CFClient::UI::Menu;	3780	package CFPlus::UI::Menu;
2927		3781
2928	our @ISA = CFClient::UI::FancyFrame::;	3782	our @ISA = CFPlus::UI::Toplevel::;
2929		3783
2930	use CFClient::OpenGL;	3784	use CFPlus::OpenGL;
2931		3785
2932	sub new {	3786	sub new {
2933	my $class = shift;	3787	my $class = shift;
2934		3788
2935	my $self = $class->SUPER::new (	3789	my $self = $class->SUPER::new (
2936	items => [],	3790	items => [],
2937	z => 100,	3791	z => 100,
2938	@_,	3792	@_,
2939	);	3793	);
2940		3794
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3795	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3796
2943	for my $item (@{ $self->{items} }) {	3797	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3798	my ($widget, $cb, $tooltip) = @$item;
2945		3799
2946	# handle various types of items, only text for now	3800	# handle various types of items, only text for now
2947	if (!ref $widget) {	3801	if (!ref $widget) {
		3802	if ($widget =~ /\t/) {
		3803	my ($left, $right) = split /\t/, $widget, 2;
		3804
2948	$widget = new CFClient::UI::Label	3805	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3806	can_hover => 1,
2950	can_events => 1,	3807	can_events => 1,
		3808	tooltip => $tooltip,
		3809	children => [
		3810	(new CFPlus::UI::Label markup => $left, expand => 1),
		3811	(new CFPlus::UI::Label markup => $right, align => +1),
		3812	],
		3813	;
		3814
		3815	} else {
		3816	$widget = new CFPlus::UI::Label
		3817	can_hover => 1,
		3818	can_events => 1,
2951	markup => $widget,	3819	markup => $widget,
2952	tooltip => $tooltip	3820	tooltip => $tooltip;
		3821	}
2953	}	3822	}
2954		3823
2955	$self->{item}{$widget} = $item;	3824	$self->{item}{$widget} = $item;
2956		3825
2957	$self->{vbox}->add ($widget);	3826	$self->{vbox}->add ($widget);
…		…
2962		3831
2963	# popup given the event (must be a mouse button down event currently)	3832	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3833	sub popup {
2965	my ($self, $ev) = @_;	3834	my ($self, $ev) = @_;
2966		3835
2967	$self->_emit ("popdown");	3836	$self->emit ("popdown");
2968		3837
2969	# maybe save $GRAB? must be careful about events...	3838	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3839	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3840	$self->{button} = $ev->{button};
2972		3841
2973	$self->show;	3842	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3843	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3844	}
2976		3845
2977	sub mouse_motion {	3846	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3847	my ($self, $ev, $x, $y) = @_;
2979		3848
2980	# TODO: should use vbox->find_widget or so	3849	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3851	$self->{hover} = $self->{item}{$HOVER};
2983		3852
2984	0	3853	0
2985	}	3854	}
2986		3855
2987	sub button_up {	3856	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3857	my ($self, $ev, $x, $y) = @_;
2989		3858
2990	if ($ev->{button} == $self->{button}) {	3859	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3860	undef $GRAB;
2992	$self->hide;	3861	$self->hide;
2993		3862
2994	$self->_emit ("popdown");	3863	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3864	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3865	} else {
2997	return 0	3866	return 0
2998	}	3867	}
2999		3868
3000	1	3869	1
3001	}	3870	}
3002		3871
3003	#############################################################################	3872	#############################################################################
3004		3873
3005	package CFClient::UI::Multiplexer;	3874	package CFPlus::UI::Multiplexer;
3006		3875
3007	our @ISA = CFClient::UI::Container::;	3876	our @ISA = CFPlus::UI::Container::;
3008		3877
3009	sub new {	3878	sub new {
3010	my $class = shift;	3879	my $class = shift;
3011		3880
3012	my $self = $class->SUPER::new (	3881	my $self = $class->SUPER::new (
…		…
3026		3895
3027	$self->{current} = $self->{children}[0]	3896	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3897	if @{ $self->{children} };
3029	}	3898	}
3030		3899
		3900	sub get_current_page {
		3901	my ($self) = @_;
		3902
		3903	$self->{current}
		3904	}
		3905
3031	sub set_current_page {	3906	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3907	my ($self, $page_or_widget) = @_;
3033		3908
3034	my $widget = ref $page_or_widget	3909	my $widget = ref $page_or_widget
3035	? $page_or_widget	3910	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3911	: $self->{children}[$page_or_widget];
3037		3912
3038	$self->{current} = $widget;	3913	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3914	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3915
3041	$self->_emit (page_changed => $self->{current});	3916	$self->emit (page_changed => $self->{current});
3042		3917
3043	$self->realloc;	3918	$self->realloc;
3044	}	3919	}
3045		3920
3046	sub visible_children {	3921	sub visible_children {
…		…
3051	my ($self) = @_;	3926	my ($self) = @_;
3052		3927
3053	$self->{current}->size_request	3928	$self->{current}->size_request
3054	}	3929	}
3055		3930
3056	sub size_allocate {	3931	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3932	my ($self, $w, $h) = @_;
3058		3933
3059	$self->{current}->configure (0, 0, $w, $h);	3934	$self->{current}->configure (0, 0, $w, $h);
		3935
		3936	1
3060	}	3937	}
3061		3938
3062	sub _draw {	3939	sub _draw {
3063	my ($self) = @_;	3940	my ($self) = @_;
3064		3941
3065	$self->{current}->draw;	3942	$self->{current}->draw;
3066	}	3943	}
3067		3944
3068	#############################################################################	3945	#############################################################################
3069		3946
3070	package CFClient::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3071		3948
		3949	use CFPlus::OpenGL;
		3950
3072	our @ISA = CFClient::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3073		3952
3074	sub new {	3953	sub new {
3075	my $class = shift;	3954	my $class = shift;
3076		3955
3077	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3080	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3081	@_,	3961	@_,
3082	);	3962	);
3083		3963
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3087	$self	4001	$self
3088	}	4002	}
3089		4003
3090	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3091	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3092		4023
3093	Scalar::Util::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3094		4026
3095	$self->{buttonbar}->add (new CFClient::UI::Button
3096	markup => $title,
3097	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },
3099	);
3100
3101	$self->{multiplexer}->add ($widget);	4027	$self->add ($widget);
		4028	}
		4029
		4030	sub get_current_page {
		4031	my ($self) = @_;
		4032
		4033	$self->{multiplexer}->get_current_page
3102	}	4034	}
3103		4035
3104	sub set_current_page {	4036	sub set_current_page {
3105	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3106		4038
3107	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
		4041	}
		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
3109	}	4057	}
3110		4058
3111	#############################################################################	4059	#############################################################################
3112		4060
3113	package CFClient::UI::Combobox;	4061	package CFPlus::UI::Selector;
3114		4062
3115	use utf8;	4063	use utf8;
3116		4064
3117	our @ISA = CFClient::UI::Button::;	4065	our @ISA = CFPlus::UI::Button::;
3118		4066
3119	sub new {	4067	sub new {
3120	my $class = shift;	4068	my $class = shift;
3121		4069
3122	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	4076	$self->_set_value ($self->{value});
3129		4077
3130	$self	4078	$self
3131	}	4079	}
3132		4080
3133	sub button_down {	4081	sub invoke_button_down {
3134	my ($self, $ev) = @_;	4082	my ($self, $ev) = @_;
3135		4083
3136	my @menu_items;	4084	my @menu_items;
3137		4085
3138	for (@{ $self->{options} }) {	4086	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	4087	my ($value, $title, $tooltip) = @$_;
3140		4088
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4089	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	4090	}
3143		4091
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4092	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	4093	}
3146		4094
3147	sub _set_value {	4095	sub _set_value {
3148	my ($self, $value) = @_;	4096	my ($self, $value) = @_;
3149		4097
…		…
3159	my ($self, $value) = @_;	4107	my ($self, $value) = @_;
3160		4108
3161	return unless $self->{value} ne $value;	4109	return unless $self->{value} ne $value;
3162		4110
3163	$self->_set_value ($value);	4111	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	4112	$self->emit (changed => $value);
3165	}	4113	}
3166		4114
3167	#############################################################################	4115	#############################################################################
3168		4116
3169	package CFClient::UI::Statusbox;	4117	package CFPlus::UI::Statusbox;
3170		4118
3171	our @ISA = CFClient::UI::VBox::;	4119	our @ISA = CFPlus::UI::VBox::;
3172		4120
3173	sub new {	4121	sub new {
3174	my $class = shift;	4122	my $class = shift;
3175		4123
3176	my $self = $class->SUPER::new (	4124	my $self = $class->SUPER::new (
3177	fontsize => 0.8,	4125	fontsize => 0.8,
3178	@_,	4126	@_,
3179	);	4127	);
3180		4128
3181	Scalar::Util::weaken (my $this = $self);	4129	CFPlus::weaken (my $this = $self);
3182		4130
3183	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4131	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184		4132
3185	$self	4133	$self
3186	}	4134	}
…		…
3188	sub reorder {	4136	sub reorder {
3189	my ($self) = @_;	4137	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	4138	my $NOW = Time::HiRes::time;
3191		4139
3192	# freeze display when hovering over any label	4140	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	4141	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4142	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	4143	values %{ $self->{item} };
3196		4144
3197	while (my ($k, $v) = each %{ $self->{item} }) {	4145	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4146	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	4147	}
…		…
3220	for ($short) {	4168	for ($short) {
3221	s/^\s+//;	4169	s/^\s+//;
3222	s/\s+/ /g;	4170	s/\s+/ /g;
3223	}	4171	}
3224		4172
3225	new CFClient::UI::Label	4173	new CFPlus::UI::Label
3226	markup => $short,	4174	markup => $short,
3227	tooltip => $item->{tooltip},	4175	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	4176	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	4177	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	4178	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	4232	count => 1,
3285	%arg,	4233	%arg,
3286	};	4234	};
3287	}	4235	}
3288		4236
		4237	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	4238	$self->reorder;
		4239	});
3290	}	4240	}
3291		4241
3292	sub reconfigure {	4242	sub reconfigure {
3293	my ($self) = @_;	4243	my ($self) = @_;
3294		4244
…		…
3307	$self->SUPER::destroy;	4257	$self->SUPER::destroy;
3308	}	4258	}
3309		4259
3310	#############################################################################	4260	#############################################################################
3311		4261
3312	package CFClient::UI::Inventory;
3313
3314	our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316	sub new {
3317	my $class = shift;
3318
3319	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321	@_,
3322	);
3323
3324	$self
3325	}
3326
3327	sub set_items {
3328	my ($self, $items) = @_;
3329
3330	$self->{child}->clear;
3331	return unless $items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}
3351
3352	#############################################################################
3353
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;
3552
3553	our @ISA = CFClient::UI::Table::;
3554
3555	sub new {
3556	my $class = shift;
3557
3558	my $self = $class->SUPER::new (
3559	binding => [],
3560	commands => [],
3561	@_,
3562	)
3563	}
3564
3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578	sub rebuild_spell_list {
3579	my ($self) = @_;
3580
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;
3583
3584	return unless $::CONN;
3585
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592	my $row = 0;
3593
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};
3596
3597	$row++;
3598
3599	my $spell_cb = sub {
3600	my ($widget, $ev) = @_;
3601
3602	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu
3608	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],
3612	)->popup ($ev);
3613	} else {
3614	return 0;
3615	}
3616
3617	1
3618	};
3619
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625	$self->add (0, $row, new CFClient::UI::Face
3626	face => $spell->{face},
3627	can_hover => 1,
3628	can_events => 1,
3629	tooltip => $tooltip,
3630	on_button_down => $spell_cb,
3631	);
3632
3633	$self->add (1, $row, new CFClient::UI::Label
3634	expand => 1,
3635	text => $spell->{name},
3636	can_hover => 1,
3637	can_events => 1,
3638	tooltip => $tooltip,
3639	on_button_down => $spell_cb,
3640	);
3641
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}
3647	});
3648	}
3649
3650	sub add_spell {
3651	my ($self, $spell) = @_;
3652
3653	$self->{spell}->{$spell->{name}} = $spell;
3654	$self->rebuild_spell_list;
3655	}
3656
3657	sub remove_spell {
3658	my ($self, $spell) = @_;
3659
3660	delete $self->{spell}->{$spell->{name}};
3661	$self->rebuild_spell_list;
3662	}
3663
3664	sub clear_spells {
3665	my ($self) = @_;
3666
3667	$self->{spell} = {};
3668	$self->rebuild_spell_list;
3669	}
3670
3671	#############################################################################
3672
3673	package CFClient::UI::Root;	4262	package CFPlus::UI::Root;
3674		4263
3675	our @ISA = CFClient::UI::Container::;	4264	our @ISA = CFPlus::UI::Container::;
3676		4265
3677	use List::Util qw(min max);	4266	use List::Util qw(min max);
3678		4267
3679	use CFClient::OpenGL;	4268	use CFPlus::OpenGL;
3680		4269
3681	sub new {	4270	sub new {
3682	my $class = shift;	4271	my $class = shift;
3683		4272
3684	my $self = $class->SUPER::new (	4273	my $self = $class->SUPER::new (
3685	visible => 1,	4274	visible => 1,
3686	@_,	4275	@_,
3687	);	4276	);
3688		4277
3689	Scalar::Util::weaken ($self->{root} = $self);	4278	CFPlus::weaken ($self->{root} = $self);
3690		4279
3691	$self	4280	$self
3692	}	4281	}
3693		4282
3694	sub size_request {	4283	sub size_request {
…		…
3709	$coord = $max - $size if $coord > $max - $size;	4298	$coord = $max - $size if $coord > $max - $size;
3710		4299
3711	int $coord + 0.5	4300	int $coord + 0.5
3712	}	4301	}
3713		4302
3714	sub size_allocate {	4303	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	4304	my ($self, $w, $h) = @_;
3716		4305
3717	for my $child ($self->children) {	4306	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4307	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		4308
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	4312	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	4313	$Y = _to_pixel $Y, $H, $self->{h};
3725		4314
3726	$child->configure ($X, $Y, $W, $H);	4315	$child->configure ($X, $Y, $W, $H);
3727	}	4316	}
		4317
		4318	1
3728	}	4319	}
3729		4320
3730	sub coord2local {	4321	sub coord2local {
3731	my ($self, $x, $y) = @_;	4322	my ($self, $x, $y) = @_;
3732		4323
…		…
3740	}	4331	}
3741		4332
3742	sub update {	4333	sub update {
3743	my ($self) = @_;	4334	my ($self) = @_;
3744		4335
3745	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3746	}	4337	}
3747		4338
3748	sub add {	4339	sub add {
3749	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3750		4341
…		…
3787	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
3788	$_->()	4379	$_->()
3789	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
3790	}	4381	}
3791		4382
3792	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
3793	my %queue;	4384	my %queue;
3794	my @queue;	4385	my @queue;
3795	my $widget;	4386	my $widget;
3796		4387
3797	outer:	4388	outer:
…		…
3844	}	4435	}
3845	}	4436	}
3846		4437
3847	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
3848	}	4439	}
3849	}
3850		4440
3851	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
3852	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
3853	values %$size_alloc;	4443	values %$size_alloc;
3854		4444
3855	while () {	4445	while () {
3856	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
3857		4447
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		4449
3860	$w = 0 if $w < 0;	4450	$w = max $widget->{min_w}, $w;
3861	$h = 0 if $h < 0;	4451	$h = max $widget->{min_h}, $h;
3862		4452
		4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4455
		4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4458
3863	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
3865		4461
3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
3868	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
3869		4465
3870	$widget->{w} = $w;	4466	$widget->{w} = $w;
3871	$widget->{h} = $h;	4467	$widget->{h} = $h;
3872		4468
3873	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
3874	}	4471	}
3875	}	4472	}
3876	}	4473	}
3877		4474
3878	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
3879	$_->()	4476	$_->()
3880	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
3881	}	4478	}
3882
3883		4479
3884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
3887		4483
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4486	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4487	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4488	glLoadIdentity;
3893		4489
3894	{	4490	{
3895	package CFClient::UI::Base;	4491	package CFPlus::UI::Base;
3896		4492
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4493	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4494	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4495
3901	$self->_draw;	4496	$self->_draw;
		4497	}
3902	}	4498	}
3903		4499
3904	#############################################################################	4500	#############################################################################
3905		4501
3906	package CFClient::UI;	4502	package CFPlus::UI;
3907		4503
3908	$ROOT = new CFClient::UI::Root;	4504	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4505	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4506
3911	1	4507	1
3912		4508

Diff Legend

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