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

Diff Legend

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