ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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