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

Diff Legend

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