ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 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);
		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
1074		1363
1075	sub new {	1364	sub new {
1076	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1077		1366
1078	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1369	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1370	border => 0.6,
1082	can_events => 1,	1371	can_events => 1,
1083	min_w => 16,	1372	min_w => 64,
1084	min_h => 16,	1373	min_h => 32,
1085	%arg,	1374	%arg,
1086	);	1375	);
1087		1376
1088	$self->{title_widget} = new CFClient::UI::Label	1377	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1378	align => 0,
1090	valign => 1,	1379	valign => 1,
1091	text => $self->{title},	1380	text => $self->{title},
1092	fontsize => $self->{border},	1381	fontsize => $self->{border},
1093	if exists $self->{title};	1382	if exists $self->{title};
1094		1383
		1384	if ($self->{has_close_button}) {
		1385	$self->{close_button} =
		1386	new CFPlus::UI::ImageButton
		1387	path => 'x1_close.png',
		1388	on_activate => sub { $self->emit ("delete") };
		1389
		1390	$self->CFPlus::UI::Container::add ($self->{close_button});
		1391	}
		1392
1095	$self	1393	$self
1096	}	1394	}
1097		1395
1098	sub add {	1396	sub add {
1099	my ($self, @widgets) = @_;	1397	my ($self, @widgets) = @_;
1100		1398
1101	$self->SUPER::add (@widgets);	1399	$self->SUPER::add (@widgets);
		1400	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1401	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1402	}
1104		1403
1105	sub border {	1404	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1405	int $_[0]{border} * $::FONTSIZE
1107	}	1406	}
…		…
1109	sub size_request {	1408	sub size_request {
1110	my ($self) = @_;	1409	my ($self) = @_;
1111		1410
1112	$self->{title_widget}->size_request	1411	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1412	if $self->{title_widget};
		1413
		1414	$self->{close_button}->size_request
		1415	if $self->{close_button};
1114		1416
1115	my ($w, $h) = $self->SUPER::size_request;	1417	my ($w, $h) = $self->SUPER::size_request;
1116		1418
1117	(	1419	(
1118	$w + $self->border * 2,	1420	$w + $self->border * 2,
1119	$h + $self->border * 2,	1421	$h + $self->border * 2,
1120	)	1422	)
1121	}	1423	}
1122		1424
1123	sub size_allocate {	1425	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1426	my ($self, $w, $h) = @_;
1125		1427
1126	if ($self->{title_widget}) {	1428	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1429	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1430	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1431	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1432	}
1131		1433
1132	my $border = $self->border;	1434	my $border = $self->border;
1133		1435
1134	$h -= List::Util::max 0, $border * 2;	1436	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1437	$w -= List::Util::max 0, $border * 2;
		1438
		1439	$self->child->configure ($border, $border, $w, $h);
		1440
		1441	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1442	if $self->{close_button};
		1443
		1444	1
		1445	}
		1446
		1447	sub invoke_delete {
		1448	my ($self) = @_;
		1449
		1450	$self->hide;
1136		1451
1137	$self->child->configure ($border, $border, $w, $h);	1452	1
1138	}	1453	}
1139		1454
1140	sub button_down {	1455	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1456	my ($self, $ev, $x, $y) = @_;
1142		1457
1143	my ($w, $h) = @$self{qw(w h)};	1458	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1459	my $border = $self->border;
1145		1460
…		…
1176		1491
1177	($x, $y) = ($ev->{x}, $ev->{y});	1492	($x, $y) = ($ev->{x}, $ev->{y});
1178		1493
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1494	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1495	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1496	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1497	};
1183	} else {	1498	} else {
1184	return 0;	1499	return 0;
1185	}	1500	}
1186		1501
1187	1	1502	1
1188	}	1503	}
1189		1504
1190	sub button_up {	1505	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1506	my ($self, $ev, $x, $y) = @_;
1192		1507
1193	!!delete $self->{motion}	1508	! ! delete $self->{motion}
1194	}	1509	}
1195		1510
1196	sub mouse_motion {	1511	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1512	my ($self, $ev, $x, $y) = @_;
1198		1513
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1514	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1515
1201	!!$self->{motion}	1516	! ! $self->{motion}
		1517	}
		1518
		1519	sub invoke_visibility_change {
		1520	my ($self, $visible) = @_;
		1521
		1522	delete $self->{motion} unless $visible;
		1523
		1524	0
1202	}	1525	}
1203		1526
1204	sub _draw {	1527	sub _draw {
1205	my ($self) = @_;	1528	my ($self) = @_;
1206		1529
…		…
1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214		1537
1215	my $border = $self->border;	1538	my $border = $self->border;
1216		1539
1217	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222		1559
1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1225		1562
1226	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1235	$child->draw;	1572	$child->draw;
1236		1573
1237	if ($self->{title_widget}) {	1574	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1575	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1576	$self->{title_widget}->_draw;
		1577
		1578	glTranslate 0, - ($border - $self->{h});
1240	}	1579	}
		1580
		1581	$self->{close_button}->draw
		1582	if $self->{close_button};
1241	}	1583	}
1242		1584
1243	#############################################################################	1585	#############################################################################
1244		1586
1245	package CFClient::UI::Table;	1587	package CFPlus::UI::Table;
1246		1588
1247	our @ISA = CFClient::UI::Base::;	1589	our @ISA = CFPlus::UI::Base::;
1248		1590
1249	use List::Util qw(max sum);	1591	use List::Util qw(max sum);
1250		1592
1251	use CFClient::OpenGL;	1593	use CFPlus::OpenGL;
1252		1594
1253	sub new {	1595	sub new {
1254	my $class = shift;	1596	my $class = shift;
1255		1597
1256	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1257	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1258	@_,	1602	@_,
1259	)	1603	)
1260	}	1604	}
1261		1605
1262	sub children {	1606	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1608	}
1265		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1266	sub add {	1611	sub add {
1267	my ($self, $x, $y, $child) = @_;	1612	my ($self) = shift;
1268		1613
		1614	while (@_) {
		1615	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1616	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1617	$self->{children}[$y][$x] = $child;
		1618	}
1271		1619
		1620	$self->{force_realloc} = 1;
		1621	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1622	$self->realloc;
1273	}	1623	}
1274		1624
1275	sub remove {	1625	sub remove {
1276	my ($self, $child) = @_;	1626	my ($self, $child) = @_;
1277		1627
1278	# TODO: not yet implemented	1628	for (@{ $self->{children} }) {
		1629	for (@{ $_ || [] }) {
		1630	$_ = undef if $_ == $child;
		1631	}
		1632	}
1279	}	1633	}
1280		1634
1281	# TODO: move to container class maybe? send children a signal on removal?	1635	# TODO: move to container class maybe? send children a signal on removal?
1282	sub clear {	1636	sub clear {
1283	my ($self) = @_;	1637	my ($self) = @_;
…		…
1324	(sum @$ws),	1678	(sum @$ws),
1325	(sum @$hs),	1679	(sum @$hs),
1326	)	1680	)
1327	}	1681	}
1328		1682
1329	sub size_allocate {	1683	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1684	my ($self, $w, $h) = @_;
1331		1685
1332	my ($ws, $hs) = $self->get_wh;	1686	my ($ws, $hs) = $self->get_wh;
1333		1687
1334	my $req_w = (sum @$ws) || 1;	1688	my $req_w = (sum @$ws) || 1;
1335	my $req_h = (sum @$hs) || 1;	1689	my $req_h = (sum @$hs) || 1;
1336		1690
1337	# TODO: nicer code && do row_expand	1691	# TODO: nicer code
1338	my @col_expand = @{$self->{col_expand}};	1692	my @col_expand = @{$self->{col_expand}};
1339	@col_expand = (1) x @$ws unless @col_expand;	1693	@col_expand = (1) x @$ws unless @col_expand;
1340	my $col_expand = (sum @col_expand) || 1;	1694	my $col_expand = (sum @col_expand) || 1;
1341		1695
1342	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1696	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1697
1346	CFClient::UI::harmonize $ws;	1698	CFPlus::UI::harmonize $ws;
		1699
		1700	my @row_expand = @{$self->{row_expand}};
		1701	@row_expand = (1) x @$ws unless @row_expand;
		1702	my $row_expand = (sum @row_expand) || 1;
		1703
		1704	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1705
1347	CFClient::UI::harmonize $hs;	1706	CFPlus::UI::harmonize $hs;
1348		1707
1349	my $y;	1708	my $y;
1350		1709
1351	for my $r (0 .. $#{$self->{children}}) {	1710	for my $r (0 .. $#{$self->{children}}) {
1352	my $row = $self->{children}[$r]	1711	my $row = $self->{children}[$r]
…		…
1366	}	1725	}
1367		1726
1368	$y += $row_h;	1727	$y += $row_h;
1369	}	1728	}
1370		1729
		1730	1
1371	}	1731	}
1372		1732
1373	sub find_widget {	1733	sub find_widget {
1374	my ($self, $x, $y) = @_;	1734	my ($self, $x, $y) = @_;
1375		1735
…		…
1394	}	1754	}
1395	}	1755	}
1396		1756
1397	#############################################################################	1757	#############################################################################
1398		1758
1399	package CFClient::UI::Box;	1759	package CFPlus::UI::Fixed;
1400		1760
		1761	use List::Util qw(min max);
		1762
1401	our @ISA = CFClient::UI::Container::;	1763	our @ISA = CFPlus::UI::Container::;
		1764
		1765	sub add {
		1766	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1767
		1768	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1769	$self->SUPER::add ($child);
		1770	}
		1771
		1772	sub _scale($$$) {
		1773	my ($mode, $val, $max) = @_;
		1774
		1775	$mode eq "abs" ? $val
		1776	: $mode eq "rel" ? $val * $max
		1777	: 0
		1778	}
		1779
		1780	sub size_request {
		1781	my ($self) = @_;
		1782
		1783	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1784
		1785	# determine overall size by querying abs widgets
		1786	for my $child ($self->visible_children) {
		1787	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1788
		1789	if ($pos eq "abs") {
		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	# now layout remaining widgets
		1802	for my $child ($self->visible_children) {
		1803	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1804
		1805	if ($pos ne "abs") {
		1806	$x = _scale $pos, $x, $W;
		1807	$y = _scale $pos, $x, $H;
		1808	$w = _scale $size, $w, $child->{req_w};
		1809	$h = _scale $size, $h, $child->{req_h};
		1810
		1811	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1812	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1813	}
		1814	}
		1815
		1816	my $W = $x2 - $x1;
		1817	my $H = $y2 - $y1;
		1818
		1819	($W, $H)
		1820	}
		1821
		1822	sub invoke_size_allocate {
		1823	my ($self, $W, $H) = @_;
		1824
		1825	for my $child ($self->visible_children) {
		1826	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1827
		1828	$x = _scale $pos, $x, $W;
		1829	$y = _scale $pos, $x, $H;
		1830	$w = _scale $size, $w, $child->{req_w};
		1831	$h = _scale $size, $h, $child->{req_h};
		1832
		1833	$child->configure ($x, $y, $w, $h);
		1834	}
		1835
		1836	1
		1837	}
		1838
		1839	#############################################################################
		1840
		1841	package CFPlus::UI::Box;
		1842
		1843	our @ISA = CFPlus::UI::Container::;
1402		1844
1403	sub size_request {	1845	sub size_request {
1404	my ($self) = @_;	1846	my ($self) = @_;
1405		1847
1406	$self->{vertical}	1848	$self->{vertical}
…		…
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1854	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1855	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1414	)	1856	)
1415	}	1857	}
1416		1858
1417	sub size_allocate {	1859	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1860	my ($self, $w, $h) = @_;
1419		1861
1420	my $space = $self->{vertical} ? $h : $w;	1862	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1863	my @children = $self->visible_children;
1422		1864
1423	my @req;	1865	my @req;
1424		1866
1425	if ($self->{homogeneous}) {	1867	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1868	@req = ($space / (@children || 1)) x @children;
1427	} else {	1869	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1870	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1871	my $req = List::Util::sum @req;
1430		1872
1431	if ($req > $space) {	1873	if ($req > $space) {
1432	# ah well, not enough space	1874	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1875	$_ *= $space / $req for @req;
1434	} else {	1876	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1877	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1878
1437	$space = ($space - $req) / $expand; # remaining space to give away	1879	$space = ($space - $req) / $expand; # remaining space to give away
1438		1880
1439	$req[$_] += $space * $children->[$_]{expand}	1881	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1882	for 0 .. $#children;
1441	}	1883	}
1442	}	1884	}
1443		1885
1444	CFClient::UI::harmonize \@req;	1886	CFPlus::UI::harmonize \@req;
1445		1887
1446	my $pos = 0;	1888	my $pos = 0;
1447	for (0 .. $#$children) {	1889	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1890	my $alloc = $req[$_];
1449	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1891	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450		1892
1451	$pos += $alloc;	1893	$pos += $alloc;
1452	}	1894	}
1453		1895
1454	1	1896	1
1455	}	1897	}
1456		1898
1457	#############################################################################	1899	#############################################################################
1458		1900
1459	package CFClient::UI::HBox;	1901	package CFPlus::UI::HBox;
1460		1902
1461	our @ISA = CFClient::UI::Box::;	1903	our @ISA = CFPlus::UI::Box::;
1462		1904
1463	sub new {	1905	sub new {
1464	my $class = shift;	1906	my $class = shift;
1465		1907
1466	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1469	)	1911	)
1470	}	1912	}
1471		1913
1472	#############################################################################	1914	#############################################################################
1473		1915
1474	package CFClient::UI::VBox;	1916	package CFPlus::UI::VBox;
1475		1917
1476	our @ISA = CFClient::UI::Box::;	1918	our @ISA = CFPlus::UI::Box::;
1477		1919
1478	sub new {	1920	sub new {
1479	my $class = shift;	1921	my $class = shift;
1480		1922
1481	$class->SUPER::new (	1923	$class->SUPER::new (
…		…
1484	)	1926	)
1485	}	1927	}
1486		1928
1487	#############################################################################	1929	#############################################################################
1488		1930
1489	package CFClient::UI::Label;	1931	package CFPlus::UI::Label;
1490		1932
1491	our @ISA = CFClient::UI::DrawBG::;	1933	our @ISA = CFPlus::UI::DrawBG::;
1492		1934
1493	use CFClient::OpenGL;	1935	use CFPlus::OpenGL;
1494		1936
1495	sub new {	1937	sub new {
1496	my ($class, %arg) = @_;	1938	my ($class, %arg) = @_;
1497		1939
1498	my $self = $class->SUPER::new (	1940	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1943	#active_bg => none
1502	#font => default_font	1944	#font => default_font
1503	#text => initial text	1945	#text => initial text
1504	#markup => initial narkup	1946	#markup => initial narkup
1505	#max_w => maximum pixel width	1947	#max_w => maximum pixel width
		1948	#style => 0, # render flags
1506	ellipsise => 3, # end	1949	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1950	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1951	fontsize => 1,
1509	align => -1,	1952	align => -1,
1510	valign => -1,	1953	valign => -1,
1511	padding_x => 2,	1954	padding_x => 2,
1512	padding_y => 2,	1955	padding_y => 2,
1513	can_events => 0,	1956	can_events => 0,
1514	%arg	1957	%arg
1515	);	1958	);
1516		1959
1517	if (exists $self->{template}) {	1960	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1961	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1962	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1963	$self->{template} = $layout;
1521	}	1964	}
1522		1965
1523	if (exists $self->{markup}) {	1966	if (exists $self->{markup}) {
…		…
1527	}	1970	}
1528		1971
1529	$self	1972	$self
1530	}	1973	}
1531		1974
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1975	sub update {
1543	my ($self) = @_;	1976	my ($self) = @_;
1544		1977
1545	delete $self->{texture};	1978	delete $self->{texture};
1546	$self->SUPER::update;	1979	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1990	my ($self, $text) = @_;
1558		1991
1559	return if $self->{text} eq "T$text";	1992	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1993	$self->{text} = "T$text";
1561		1994
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1995	$self->{layout}->set_text ($text);
1564		1996
1565	delete $self->{size_req};	1997	delete $self->{size_req};
1566	$self->realloc;	1998	$self->realloc;
1567	$self->update;	1999	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	2005	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	2006	$self->{text} = "M$markup";
1575		2007
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2008	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		2009
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	2010	$self->{layout}->set_markup ($markup);
1580		2011
1581	delete $self->{size_req};	2012	delete $self->{size_req};
1582	$self->realloc;	2013	$self->realloc;
1583	$self->update;	2014	$self->update;
…		…
1595		2026
1596	my ($w, $h) = $self->{layout}->size;	2027	my ($w, $h) = $self->{layout}->size;
1597		2028
1598	if (exists $self->{template}) {	2029	if (exists $self->{template}) {
1599	$self->{template}->set_font ($self->{font}) if $self->{font};	2030	$self->{template}->set_font ($self->{font}) if $self->{font};
		2031	$self->{template}->set_width ($self->{max_w} || -1);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2032	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		2033
1602	my ($w2, $h2) = $self->{template}->size;	2034	my ($w2, $h2) = $self->{template}->size;
1603		2035
1604	$w = List::Util::max $w, $w2;	2036	$w = List::Util::max $w, $w2;
…		…
1609	};	2041	};
1610		2042
1611	@{ $self->{size_req} }	2043	@{ $self->{size_req} }
1612	}	2044	}
1613		2045
		2046	sub baseline_shift {
		2047	$_[0]{layout}->descent
		2048	}
		2049
1614	sub size_allocate {	2050	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	2051	my ($self, $w, $h) = @_;
1616		2052
1617	delete $self->{ox};	2053	delete $self->{ox};
1618		2054
1619	delete $self->{texture}	2055	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2056	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2057
		2058	1
1621	}	2059	}
1622		2060
1623	sub set_fontsize {	2061	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	2062	my ($self, $fontsize) = @_;
1625		2063
1626	$self->{fontsize} = $fontsize;	2064	$self->{fontsize} = $fontsize;
		2065	delete $self->{size_req};
1627	delete $self->{texture};	2066	delete $self->{texture};
1628		2067
1629	$self->realloc;	2068	$self->realloc;
1630	}	2069	}
1631		2070
1632	sub reconfigure {	2071	sub reconfigure {
1633	my ($self) = @_;	2072	my ($self) = @_;
1634		2073
1635	delete $self->{size_req};	2074	delete $self->{size_req};
		2075	delete $self->{texture};
1636		2076
1637	$self->SUPER::reconfigure;	2077	$self->SUPER::reconfigure;
1638	}	2078	}
1639		2079
1640	sub _draw {	2080	sub _draw {
1641	my ($self) = @_;	2081	my ($self) = @_;
1642		2082
1643	$self->SUPER::_draw; # draw background, if applicable	2083	$self->SUPER::_draw; # draw background, if applicable
1644		2084
1645	my $tex = $self->{texture} ||= do {	2085	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	2086	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	2087	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	2088	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	2089	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2090	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2091	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		2092
1653	new_from_layout CFClient::Texture $self->{layout}	2093	[$self->{layout}->size]
1654	};	2094	};
1655		2095
1656	unless (exists $self->{ox}) {	2096	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2097	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2098	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	2099	: ($self->{w} - $size->[0]) * 0.5);
1660		2100
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2101	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2102	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	2103	: ($self->{h} - $size->[1]) * 0.5);
1664	};	2104	};
1665		2105
1666	glEnable GL_TEXTURE_2D;
1667
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2106	my $w = List::Util::min $self->{w} + 4, $size->[0];
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2107	my $h = List::Util::min $self->{h} + 2, $size->[1];
1670		2108
1671	if ($tex->{format} == GL_ALPHA) {	2109	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}
1679
1680	glDisable GL_TEXTURE_2D;
1681	}	2110	}
1682		2111
1683	#############################################################################	2112	#############################################################################
1684		2113
1685	package CFClient::UI::EntryBase;	2114	package CFPlus::UI::EntryBase;
1686		2115
1687	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1688		2117
1689	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1690		2119
1691	sub new {	2120	sub new {
1692	my $class = shift;	2121	my $class = shift;
1693		2122
1694	$class->SUPER::new (	2123	$class->SUPER::new (
…		…
1698	active_fg => [0, 0, 0],	2127	active_fg => [0, 0, 0],
1699	can_hover => 1,	2128	can_hover => 1,
1700	can_focus => 1,	2129	can_focus => 1,
1701	valign => 0,	2130	valign => 0,
1702	can_events => 1,	2131	can_events => 1,
		2132	ellipsise => 0,
1703	#text => ...	2133	#text => ...
1704	#hidden => "*",	2134	#hidden => "*",
1705	@_	2135	@_
1706	)	2136	)
1707	}	2137	}
…		…
1718		2148
1719	$text =~ s/./*/g if $self->{hidden};	2149	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	2150	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	2151	delete $self->{size_req};
1722		2152
1723	$self->_emit (changed => $self->{text});	2153	$self->emit (changed => $self->{text});
1724		2154
1725	$self->realloc;	2155	$self->realloc;
1726	$self->update;	2156	$self->update;
1727	}	2157	}
1728		2158
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	2173	my ($w, $h) = $self->SUPER::size_request;
1744		2174
1745	($w + 1, $h) # add 1 for cursor	2175	($w + 1, $h) # add 1 for cursor
1746	}	2176	}
1747		2177
1748	sub key_down {	2178	sub invoke_key_down {
1749	my ($self, $ev) = @_;	2179	my ($self, $ev) = @_;
1750		2180
1751	my $mod = $ev->{mod};	2181	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	2182	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	2183	my $uni = $ev->{unicode};
1754		2184
1755	my $text = $self->get_text;	2185	my $text = $self->get_text;
		2186
		2187	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756		2188
1757	if ($uni == 8) {	2189	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2190	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	2191	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	2192	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	2193	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	2194	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	2195	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	2196	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} elsif ($sym == CFClient::SDLK_HOME) {	2197	} elsif ($sym == CFPlus::SDLK_HOME) {
		2198	# what a hack
		2199	$self->{cursor} =
		2200	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2201	? length $1
		2202	: 0;
		2203	} elsif ($sym == CFPlus::SDLK_END) {
		2204	# uh, again
		2205	$self->{cursor} =
		2206	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2207	? $self->{cursor} + length $1
		2208	: length $self->{text};
		2209	} elsif ($uni == 21) { # ctrl-u
		2210	$text = "";
1766	$self->{cursor} = 0;	2211	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {
1768	$self->{cursor} = length $text;
1769	} elsif ($uni == 27) {	2212	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	2213	$self->emit ('escape');
1771	} elsif ($uni) {	2214	} elsif ($uni == 0x0d) {
		2215	substr $text, $self->{cursor}++, 0, "\012";
		2216	} elsif ($uni >= 0x20) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	2217	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	2218	} else {
1774	return 0;	2219	return 0;
1775	}	2220	}
1776		2221
1777	$self->_set_text ($text);	2222	$self->_set_text ($text);
1778		2223
1779	$self->realloc;	2224	$self->realloc;
		2225	$self->update;
1780		2226
1781	1	2227	1
1782	}	2228	}
1783		2229
1784	sub focus_in {	2230	sub invoke_focus_in {
1785	my ($self) = @_;	2231	my ($self) = @_;
1786		2232
1787	$self->{last_activity} = $::NOW;	2233	$self->{last_activity} = $::NOW;
1788		2234
1789	$self->SUPER::focus_in;	2235	$self->SUPER::invoke_focus_in
1790	}	2236	}
1791		2237
1792	sub button_down {	2238	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2239	my ($self, $ev, $x, $y) = @_;
1794		2240
1795	$self->SUPER::button_down ($ev, $x, $y);	2241	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2242
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2243	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2244
1799	# byte-index to char-index	2245	# byte-index to char-index
1800	my $text = $self->{text};	2246	my $text = $self->{text};
1801	utf8::encode $text;	2247	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2248	$self->{cursor} = length $text;
1803		2249
1804	$self->_set_text ($self->{text});	2250	$self->_set_text ($self->{text});
1805	$self->update;	2251	$self->update;
1806		2252
1807	1	2253	1
1808	}	2254	}
1809		2255
1810	sub mouse_motion {	2256	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2257	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2258	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2259
1814	0	2260	1
1815	}	2261	}
1816		2262
1817	sub _draw {	2263	sub _draw {
1818	my ($self) = @_;	2264	my ($self) = @_;
1819		2265
…		…
1846	utf8::encode $text;	2292	utf8::encode $text;
1847		2293
1848	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2294	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849	}	2295	}
1850		2296
1851	glColor @{$self->{fg}};
1852	glBegin GL_LINES;	2297	glBegin GL_LINES;
1853	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2298	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2299	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855	glEnd;	2300	glEnd;
1856	}	2301	}
1857	}	2302	}
1858		2303
		2304	#############################################################################
		2305
1859	package CFClient::UI::Entry;	2306	package CFPlus::UI::Entry;
1860		2307
1861	our @ISA = CFClient::UI::EntryBase::;	2308	our @ISA = CFPlus::UI::EntryBase::;
1862		2309
1863	use CFClient::OpenGL;	2310	use CFPlus::OpenGL;
1864		2311
1865	sub key_down {	2312	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2313	my ($self, $ev) = @_;
1867		2314
1868	my $sym = $ev->{sym};	2315	my $sym = $ev->{sym};
1869		2316
1870	if ($sym == 13) {	2317	if ($ev->{uni} == 0x0d || $sym == 13) {
1871	unshift @{$self->{history}},	2318	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2319	my $txt = $self->get_text;
		2320
1873	$self->{history_pointer} = -1;	2321	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2322	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2323	$self->emit (activate => $txt);
1876	$self->update;	2324	$self->update;
1877		2325
1878	} elsif ($sym == CFClient::SDLK_UP) {	2326	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2327	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2328	$self->{history_saveback} = $self->get_text;
1881	}	2329	}
1882	if (@{$self->{history} || []} > 0) {	2330	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2331	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2333	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2334	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2335	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2336	}
1889		2337
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2338	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2339	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2340	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2341
1894	if ($self->{history_pointer} >= 0) {	2342	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2344	} else {
1897	$self->set_text ($self->{history_saveback});	2345	$self->set_text ($self->{history_saveback});
1898	}	2346	}
1899		2347
1900	} else {	2348	} else {
1901	return $self->SUPER::key_down ($ev)	2349	return $self->SUPER::invoke_key_down ($ev)
1902	}	2350	}
1903		2351
1904	1	2352	1
1905	}	2353	}
1906		2354
1907	#############################################################################	2355	#############################################################################
1908		2356
		2357	package CFPlus::UI::TextEdit;
		2358
		2359	our @ISA = CFPlus::UI::EntryBase::;
		2360
		2361	use CFPlus::OpenGL;
		2362
		2363	sub move_cursor_ver {
		2364	my ($self, $dy) = @_;
		2365
		2366	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2367
		2368	$y += $dy;
		2369
		2370	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2371	$self->{cursor} = $index;
		2372	delete $self->{cur_h};
		2373	$self->update;
		2374	return;
		2375	}
		2376	}
		2377
		2378	sub invoke_key_down {
		2379	my ($self, $ev) = @_;
		2380
		2381	my $sym = $ev->{sym};
		2382
		2383	if ($sym == CFPlus::SDLK_UP) {
		2384	$self->move_cursor_ver (-1);
		2385	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2386	$self->move_cursor_ver (+1);
		2387	} else {
		2388	return $self->SUPER::invoke_key_down ($ev)
		2389	}
		2390
		2391	1
		2392	}
		2393
		2394	#############################################################################
		2395
1909	package CFClient::UI::Button;	2396	package CFPlus::UI::Button;
1910		2397
1911	our @ISA = CFClient::UI::Label::;	2398	our @ISA = CFPlus::UI::Label::;
1912		2399
1913	use CFClient::OpenGL;	2400	use CFPlus::OpenGL;
1914		2401
1915	my @tex =	2402	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2403	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2404	qw(b1_button_inactive.png b1_button_active.png);
1918		2405
1919	sub new {	2406	sub new {
1920	my $class = shift;	2407	my $class = shift;
1921		2408
1922	$class->SUPER::new (	2409	$class->SUPER::new (
1923	padding_x => 4,	2410	padding_x => 4,
1924	padding_y => 4,	2411	padding_y => 4,
1925	fg => [1, 1, 1],	2412	fg => [1.0, 1.0, 1.0],
1926	active_fg => [0, 0, 1],	2413	active_fg => [0.8, 0.8, 0.8],
1927	can_hover => 1,	2414	can_hover => 1,
1928	align => 0,	2415	align => 0,
1929	valign => 0,	2416	valign => 0,
1930	can_events => 1,	2417	can_events => 1,
1931	@_	2418	@_
1932	)	2419	)
1933	}	2420	}
1934		2421
1935	sub activate { }
1936
1937	sub button_up {	2422	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2423	my ($self, $ev, $x, $y) = @_;
1939		2424
1940	$self->emit ("activate")	2425	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2426	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2427	&& $y >= 0 && $y < $self->{h};
…		…
1951		2436
1952	glEnable GL_TEXTURE_2D;	2437	glEnable GL_TEXTURE_2D;
1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2438	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954	glColor 0, 0, 0, 1;	2439	glColor 0, 0, 0, 1;
1955		2440
		2441	my $tex = $tex[$GRAB == $self];
1956	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2442	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957		2443
1958	glDisable GL_TEXTURE_2D;	2444	glDisable GL_TEXTURE_2D;
1959		2445
1960	$self->SUPER::_draw;	2446	$self->SUPER::_draw;
1961	}	2447	}
1962		2448
1963	#############################################################################	2449	#############################################################################
1964		2450
1965	package CFClient::UI::CheckBox;	2451	package CFPlus::UI::CheckBox;
1966		2452
1967	our @ISA = CFClient::UI::DrawBG::;	2453	our @ISA = CFPlus::UI::DrawBG::;
1968		2454
1969	my @tex =	2455	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2456	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2457	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2458
1973	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
1974		2460
1975	sub new {	2461	sub new {
1976	my $class = shift;	2462	my $class = shift;
1977		2463
1978	$class->SUPER::new (	2464	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2478	my ($self) = @_;
1993		2479
1994	(6) x 2	2480	(6) x 2
1995	}	2481	}
1996		2482
		2483	sub toggle {
		2484	my ($self) = @_;
		2485
		2486	$self->{state} = !$self->{state};
		2487	$self->emit (changed => $self->{state});
		2488	$self->update;
		2489	}
		2490
1997	sub button_down {	2491	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2492	my ($self, $ev, $x, $y) = @_;
1999		2493
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2494	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2495	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2496	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2497	} else {
2005	return 0	2498	return 0
2006	}	2499	}
2007		2500
2008	1	2501	1
…		…
2028	glDisable GL_TEXTURE_2D;	2521	glDisable GL_TEXTURE_2D;
2029	}	2522	}
2030		2523
2031	#############################################################################	2524	#############################################################################
2032		2525
2033	package CFClient::UI::Image;	2526	package CFPlus::UI::Image;
2034		2527
2035	our @ISA = CFClient::UI::Base::;	2528	our @ISA = CFPlus::UI::Base::;
2036		2529
2037	use CFClient::OpenGL;	2530	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2531
2040	our %loaded_images;	2532	our %texture_cache;
2041		2533
2042	sub new {	2534	sub new {
2043	my $class = shift;	2535	my $class = shift;
2044		2536
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2537	my $self = $class->SUPER::new (
		2538	can_events => 0,
		2539	@_,
		2540	);
2046		2541
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2542	$self->{path} || $self->{tex}
		2543	or Carp::croak "'path' or 'tex' attributes required";
2048		2544
2049	$loaded_images{$self->{image}} ||=	2545	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2546	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2547
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2548	CFPlus::weaken $texture_cache{$self->{path}};
2053		2549
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2550	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2551
2058	$self	2552	$self
2059	}	2553	}
2060		2554
		2555	sub STORABLE_freeze {
		2556	my ($self, $cloning) = @_;
		2557
		2558	$self->{path}
		2559	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2560
		2561	$self->{path}
		2562	}
		2563
		2564	sub STORABLE_attach {
		2565	my ($self, $cloning, $path) = @_;
		2566
		2567	$self->new (path => $path)
		2568	}
		2569
2061	sub size_request {	2570	sub size_request {
2062	my ($self) = @_;	2571	my ($self) = @_;
2063		2572
2064	($self->{tex}->{w}, $self->{tex}->{h})	2573	($self->{tex}{w}, $self->{tex}{h})
2065	}	2574	}
2066		2575
2067	sub _draw {	2576	sub _draw {
2068	my ($self) = @_;	2577	my ($self) = @_;
2069		2578
…		…
2079	}	2588	}
2080		2589
2081	glEnable GL_TEXTURE_2D;	2590	glEnable GL_TEXTURE_2D;
2082	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083		2592
2084	$tex->draw_quad_alpha (0, 0, $w, $h);	2593	$tex->draw_quad (0, 0, $w, $h);
2085		2594
2086	glDisable GL_TEXTURE_2D;	2595	glDisable GL_TEXTURE_2D;
2087	}	2596	}
2088		2597
2089	#############################################################################	2598	#############################################################################
2090		2599
		2600	package CFPlus::UI::ImageButton;
		2601
		2602	our @ISA = CFPlus::UI::Image::;
		2603
		2604	use CFPlus::OpenGL;
		2605
		2606	my %textures;
		2607
		2608	sub new {
		2609	my $class = shift;
		2610
		2611	my $self = $class->SUPER::new (
		2612	padding_x => 4,
		2613	padding_y => 4,
		2614	fg => [1, 1, 1],
		2615	active_fg => [0, 0, 1],
		2616	can_hover => 1,
		2617	align => 0,
		2618	valign => 0,
		2619	can_events => 1,
		2620	@_
		2621	);
		2622	}
		2623
		2624	sub invoke_button_up {
		2625	my ($self, $ev, $x, $y) = @_;
		2626
		2627	$self->emit ("activate")
		2628	if $x >= 0 && $x < $self->{w}
		2629	&& $y >= 0 && $y < $self->{h};
		2630
		2631	1
		2632	}
		2633
		2634	#############################################################################
		2635
2091	package CFClient::UI::VGauge;	2636	package CFPlus::UI::VGauge;
2092		2637
2093	our @ISA = CFClient::UI::Base::;	2638	our @ISA = CFPlus::UI::Base::;
2094		2639
2095	use List::Util qw(min max);	2640	use List::Util qw(min max);
2096		2641
2097	use CFClient::OpenGL;	2642	use CFPlus::OpenGL;
2098		2643
2099	my %tex = (	2644	my %tex = (
2100	food => [	2645	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2646	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2647	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2648	],
2104	grace => [	2649	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2650	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2651	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107	],	2652	],
2108	hp => [	2653	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2654	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2655	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2656	],
2112	mana => [	2657	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2658	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2659	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115	],	2660	],
2116	);	2661	);
2117		2662
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2663	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2723	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2724	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2725
2181	my $h1 = $self->{h} * (1 - $ycut1);	2726	my $h1 = $self->{h} * (1 - $ycut1);
2182	my $h2 = $self->{h} * (1 - $ycut2);	2727	my $h2 = $self->{h} * (1 - $ycut2);
		2728	my $h3 = $self->{h};
		2729
		2730	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183		2731
2184	glEnable GL_BLEND;	2732	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2733	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2734	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2735	glEnable GL_TEXTURE_2D;
…		…
2206		2754
2207	if ($t3) {	2755	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2756	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2757	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2758	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2759	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2760	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2761	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2762	glEnd;
2215	}	2763	}
2216		2764
2217	glDisable GL_BLEND;	2765	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2766	glDisable GL_TEXTURE_2D;
2219	}	2767	}
2220		2768
2221	#############################################################################	2769	#############################################################################
2222		2770
2223	package CFClient::UI::Gauge;	2771	package CFPlus::UI::Gauge;
2224		2772
2225	our @ISA = CFClient::UI::VBox::;	2773	our @ISA = CFPlus::UI::VBox::;
2226		2774
2227	sub new {	2775	sub new {
2228	my ($class, %arg) = @_;	2776	my ($class, %arg) = @_;
2229		2777
2230	my $self = $class->SUPER::new (	2778	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2780	can_hover => 1,
2233	can_events => 1,	2781	can_events => 1,
2234	%arg,	2782	%arg,
2235	);	2783	);
2236		2784
2237	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2785	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2786	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2787	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240		2788
2241	$self	2789	$self
2242	}	2790	}
2243		2791
2244	sub set_fontsize {	2792	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2813	$self->{value}->set_text ($val);
2266	}	2814	}
2267		2815
2268	#############################################################################	2816	#############################################################################
2269		2817
2270	package CFClient::UI::Slider;	2818	package CFPlus::UI::Slider;
2271		2819
2272	use strict;	2820	use strict;
2273		2821
2274	use CFClient::OpenGL;	2822	use CFPlus::OpenGL;
2275		2823
2276	our @ISA = CFClient::UI::DrawBG::;	2824	our @ISA = CFPlus::UI::DrawBG::;
2277		2825
2278	my @tex =	2826	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2827	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2828	qw(s1_slider.png s1_slider_bg.png);
2281		2829
2282	sub new {	2830	sub new {
2283	my $class = shift;	2831	my $class = shift;
2284		2832
…		…
2305	$self->update;	2853	$self->update;
2306		2854
2307	$self	2855	$self
2308	}	2856	}
2309		2857
2310	sub changed { }
2311
2312	sub set_range {	2858	sub set_range {
2313	my ($self, $range) = @_;	2859	my ($self, $range) = @_;
2314		2860
2315	($range, $self->{range}) = ($self->{range}, $range);	2861	($range, $self->{range}) = ($self->{range}, $range);
2316		2862
…		…
2336	if $unit;	2882	if $unit;
2337		2883
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2884	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2885
2340	if ($value != $old_value) {	2886	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2887	$self->emit (changed => $value);
2342	$self->update;	2888	$self->update;
2343	}	2889	}
2344	}	2890	}
2345		2891
2346	sub size_request {	2892	sub size_request {
2347	my ($self) = @_;	2893	my ($self) = @_;
2348		2894
2349	($self->{req_w}, $self->{req_h})	2895	($self->{req_w}, $self->{req_h})
2350	}	2896	}
2351		2897
2352	sub button_down {	2898	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2899	my ($self, $ev, $x, $y) = @_;
2354		2900
2355	$self->SUPER::button_down ($ev, $x, $y);	2901	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2902
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2903	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2904
2359	$self->mouse_motion ($ev, $x, $y)	2905	$self->invoke_mouse_motion ($ev, $x, $y)
2360	}	2906	}
2361		2907
2362	sub mouse_motion {	2908	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2909	my ($self, $ev, $x, $y) = @_;
2364		2910
2365	if ($GRAB == $self) {	2911	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2912	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2913
…		…
2373	} else {	2919	} else {
2374	return 0;	2920	return 0;
2375	}	2921	}
2376		2922
2377	1	2923	1
		2924	}
		2925
		2926	sub invoke_mouse_wheel {
		2927	my ($self, $ev) = @_;
		2928
		2929	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2930
		2931	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2932
		2933	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2934
		2935	! ! $delta
2378	}	2936	}
2379		2937
2380	sub update {	2938	sub update {
2381	my ($self) = @_;	2939	my ($self) = @_;
2382		2940
…		…
2431	glDisable GL_TEXTURE_2D;	2989	glDisable GL_TEXTURE_2D;
2432	}	2990	}
2433		2991
2434	#############################################################################	2992	#############################################################################
2435		2993
2436	package CFClient::UI::ValSlider;	2994	package CFPlus::UI::ValSlider;
2437		2995
2438	our @ISA = CFClient::UI::HBox::;	2996	our @ISA = CFPlus::UI::HBox::;
2439		2997
2440	sub new {	2998	sub new {
2441	my ($class, %arg) = @_;	2999	my ($class, %arg) = @_;
2442		3000
2443	my $range = delete $arg{range};	3001	my $range = delete $arg{range};
2444		3002
2445	my $self = $class->SUPER::new (	3003	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3004	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3005	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	3006	to_value => sub { shift },
2449	from_value => sub { shift },	3007	from_value => sub { shift },
2450	%arg,	3008	%arg,
2451	);	3009	);
2452		3010
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	3030	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	3031	sub set_value { shift->{slider}->set_value (@_) }
2474		3032
2475	#############################################################################	3033	#############################################################################
2476		3034
2477	package CFClient::UI::TextScroller;	3035	package CFPlus::UI::TextScroller;
2478		3036
2479	our @ISA = CFClient::UI::HBox::;	3037	our @ISA = CFPlus::UI::HBox::;
2480		3038
2481	use CFClient::OpenGL;	3039	use CFPlus::OpenGL;
2482		3040
2483	sub new {	3041	sub new {
2484	my $class = shift;	3042	my $class = shift;
2485		3043
2486	my $self = $class->SUPER::new (	3044	my $self = $class->SUPER::new (
2487	fontsize => 1,	3045	fontsize => 1,
2488	can_events => 0,	3046	can_events => 1,
2489	indent => 0,	3047	indent => 0,
2490	#font => default_font	3048	#font => default_font
2491	@_,	3049	@_,
2492		3050
2493	layout => (new CFClient::Layout 1),	3051	layout => (new CFPlus::Layout),
2494	par => [],	3052	par => [],
		3053	max_par => 0,
2495	height => 0,	3054	height => 0,
2496	children => [	3055	children => [
2497	(new CFClient::UI::Empty expand => 1),	3056	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	3057	(new CFPlus::UI::Slider vertical => 1),
2499	],	3058	],
2500	);	3059	);
2501		3060
2502	$self->{children}[1]->connect (changed => sub { $self->update });	3061	$self->{children}[1]->connect (changed => sub { $self->update });
2503		3062
…		…
2509		3068
2510	$self->{fontsize} = $fontsize;	3069	$self->{fontsize} = $fontsize;
2511	$self->reflow;	3070	$self->reflow;
2512	}	3071	}
2513		3072
		3073	sub size_request {
		3074	my ($self) = @_;
		3075
		3076	my ($empty, $slider) = @{ $self->{children} };
		3077
		3078	local $self->{children} = [$empty, $slider];
		3079	$self->SUPER::size_request
		3080	}
		3081
2514	sub size_allocate {	3082	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	3083	my ($self, $w, $h) = @_;
2516		3084
2517	$self->SUPER::size_allocate ($w, $h);	3085	my ($empty, $slider, @other) = @{ $self->{children} };
		3086	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		3087
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	3088	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3089	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	3090	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3091	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		3092
2524	$self->reflow;	3093	$self->reflow;
2525	}
2526		3094
2527	sub text_size {	3095	local $self->{children} = [$empty, $slider];
		3096	$self->SUPER::invoke_size_allocate ($w, $h)
		3097	}
		3098
		3099	sub invoke_mouse_wheel {
2528	my ($self, $text, $indent) = @_;	3100	my ($self, $ev) = @_;
		3101
		3102	return 0 unless $ev->{dy}; # only vertical movements
		3103
		3104	$self->{children}[1]->emit (mouse_wheel => $ev);
		3105
		3106	1
		3107	}
		3108
		3109	sub get_layout {
		3110	my ($self, $para) = @_;
2529		3111
2530	my $layout = $self->{layout};	3112	my $layout = $self->{layout};
2531		3113
		3114	$layout->set_font ($self->{font}) if $self->{font};
		3115	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3116	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	3117	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3118	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$layout->set_markup ($text);	3119	$layout->set_markup ($para->{markup});
		3120
		3121	$layout->set_shapes (
		3122	map
		3123	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3124	@{$para->{widget}}
2536		3125	);
		3126
2537	$layout->size	3127	$layout
2538	}	3128	}
2539		3129
2540	sub reflow {	3130	sub reflow {
2541	my ($self) = @_;	3131	my ($self) = @_;
2542		3132
…		…
2549		3139
2550	# todo: base offset on lines or so, not on pixels	3140	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	3141	$self->{children}[1]->set_value ($offset);
2552	}	3142	}
2553		3143
		3144	sub current_paragraph {
		3145	my ($self) = @_;
		3146
		3147	$self->{top_paragraph} - 1
		3148	}
		3149
		3150	sub scroll_to {
		3151	my ($self, $para) = @_;
		3152
		3153	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3154
		3155	$self->{scroll_to} = $para;
		3156	$self->update;
		3157	}
		3158
2554	sub clear {	3159	sub clear {
2555	my ($self) = @_;	3160	my ($self) = @_;
		3161
		3162	my (undef, undef, @other) = @{ $self->{children} };
		3163	$self->remove ($_) for @other;
2556		3164
2557	$self->{par} = [];	3165	$self->{par} = [];
2558	$self->{height} = 0;	3166	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3167	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	3168	}
2561		3169
2562	sub add_paragraph {	3170	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	3171	my $self = shift;
2564		3172
2565	for my $line (split /\n/, $text) {	3173	for my $para (@_) {
2566	my ($w, $h) = $self->text_size ($line);	3174	$para = {
		3175	fg => [1, 1, 1, 1],
		3176	indent => 0,
		3177	markup => "",
		3178	widget => [],
		3179	ref $para ? %$para : (markup => $para),
		3180	w => 1e10,
		3181	wrapped => 1,
		3182	};
		3183
		3184	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3185	push @{$self->{par}}, $para;
		3186	}
		3187
		3188	if (my $max = $self->{max_par}) {
		3189	shift @{$self->{par}} while @{$self->{par}} > $max;
		3190	}
		3191
		3192	$self->{need_reflow}++;
		3193	$self->update;
		3194	}
		3195
		3196	sub scroll_to_bottom {
		3197	my ($self) = @_;
		3198
		3199	$self->{scroll_to} = $#{$self->{par}};
		3200	$self->update;
		3201	}
		3202
		3203	sub force_uptodate {
		3204	my ($self) = @_;
		3205
		3206	if (delete $self->{need_reflow}) {
		3207	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3208
		3209	my $height = 0;
		3210
		3211	for my $para (@{$self->{par}}) {
		3212	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3213	my $layout = $self->get_layout ($para);
		3214	my ($w, $h) = $layout->size;
		3215
		3216	$para->{w} = $w + $para->{indent};
		3217	$para->{h} = $h;
		3218	$para->{wrapped} = $layout->has_wrapped;
		3219	}
		3220
		3221	$para->{y} = $height;
		3222	$height += $para->{h};
		3223	}
		3224
2567	$self->{height} += $h;	3225	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3226	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		3227
2571	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3228	delete $self->{texture};
		3229	}
		3230
		3231	if (my $paridx = delete $self->{scroll_to}) {
		3232	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3233	}
2572	}	3234	}
2573		3235
2574	sub update {	3236	sub update {
2575	my ($self) = @_;	3237	my ($self) = @_;
2576		3238
…		…
2579	return unless $self->{h} > 0;	3241	return unless $self->{h} > 0;
2580		3242
2581	delete $self->{texture};	3243	delete $self->{texture};
2582		3244
2583	$ROOT->on_post_alloc ($self => sub {	3245	$ROOT->on_post_alloc ($self => sub {
		3246	$self->force_uptodate;
		3247
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3248	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		3249
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3250	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	3251	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	3252	glClear GL_COLOR_BUFFER_BIT;
2616		3253
		3254	package CFPlus::UI::Base;
		3255	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3256	(0, 0, $self->{w}, $self->{h});
		3257
		3258	my $top = int $self->{children}[1]{range}[0];
		3259
		3260	my $paridx = 0;
		3261	my $top_paragraph;
2617	my $top = int $self->{children}[1]{range}[0];	3262	my $top = int $self->{children}[1]{range}[0];
2618		3263
2619	my $y0 = $top;	3264	my $y0 = $top;
2620	my $y1 = $top + $H;	3265	my $y1 = $top + $H;
2621		3266
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	3267	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	3268	my $h = $para->{h};
		3269	my $y = $para->{y};
2634		3270
2635	if ($y0 < $y + $h && $y < $y1) {	3271	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	3272	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		3273
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3274	$layout->render ($para->{indent}, $y - $y0);
2642		3275
2643	glRasterPos $par->[3], $y - $y0;	3276	if (my @w = @{ $para->{widget} }) {
2644	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3277	my @s = $layout->get_shapes;
		3278
		3279	for (@w) {
		3280	my ($dx, $dy) = splice @s, 0, 2, ();
		3281
		3282	$_->{x} = $dx + $para->{indent};
		3283	$_->{y} = $dy + $y - $y0;
		3284
		3285	$_->draw;
		3286	}
		3287	}
2645	}	3288	}
2646		3289
2647	$y += $h;	3290	$paridx++;
		3291	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3292	}
2649		3293
2650	glDisable GL_BLEND;	3294	$self->{top_paragraph} = $top_paragraph;
2651	};	3295	};
2652	});	3296	});
		3297	}
		3298
		3299	sub reconfigure {
		3300	my ($self) = @_;
		3301
		3302	$self->SUPER::reconfigure;
		3303
		3304	$_->{w} = 1e10 for @{ $self->{par} };
		3305	$self->reflow;
2653	}	3306	}
2654		3307
2655	sub _draw {	3308	sub _draw {
2656	my ($self) = @_;	3309	my ($self) = @_;
2657		3310
…		…
2660	glColor 0, 0, 0, 1;	3313	glColor 0, 0, 0, 1;
2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3314	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662	glDisable GL_TEXTURE_2D;	3315	glDisable GL_TEXTURE_2D;
2663		3316
2664	$self->{children}[1]->draw;	3317	$self->{children}[1]->draw;
2665
2666	}	3318	}
2667		3319
2668	#############################################################################	3320	#############################################################################
2669		3321
2670	package CFClient::UI::Animator;	3322	package CFPlus::UI::Animator;
2671		3323
2672	use CFClient::OpenGL;	3324	use CFPlus::OpenGL;
2673		3325
2674	our @ISA = CFClient::UI::Bin::;	3326	our @ISA = CFPlus::UI::Bin::;
2675		3327
2676	sub moveto {	3328	sub moveto {
2677	my ($self, $x, $y) = @_;	3329	my ($self, $x, $y) = @_;
2678		3330
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3331	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3359	glPopMatrix;
2708	}	3360	}
2709		3361
2710	#############################################################################	3362	#############################################################################
2711		3363
2712	package CFClient::UI::Flopper;	3364	package CFPlus::UI::Flopper;
2713		3365
2714	our @ISA = CFClient::UI::Button::;	3366	our @ISA = CFPlus::UI::Button::;
2715		3367
2716	sub new {	3368	sub new {
2717	my $class = shift;	3369	my $class = shift;
2718		3370
2719	my $self = $class->SUPER::new (	3371	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3383	$self->{other}->toggle_visibility;
2732	}	3384	}
2733		3385
2734	#############################################################################	3386	#############################################################################
2735		3387
2736	package CFClient::UI::Tooltip;	3388	package CFPlus::UI::Tooltip;
2737		3389
2738	our @ISA = CFClient::UI::Bin::;	3390	our @ISA = CFPlus::UI::Bin::;
2739		3391
2740	use CFClient::OpenGL;	3392	use CFPlus::OpenGL;
2741		3393
2742	sub new {	3394	sub new {
2743	my $class = shift;	3395	my $class = shift;
2744		3396
2745	$class->SUPER::new (	3397	$class->SUPER::new (
…		…
2748	)	3400	)
2749	}	3401	}
2750		3402
2751	sub set_tooltip_from {	3403	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3404	my ($self, $widget) = @_;
		3405
		3406	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3407	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3408
2754	my $tooltip = $widget->{tooltip};	3409	my $tooltip = $widget->{tooltip};
2755		3410
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3411	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3412	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3416	}
2762		3417
2763	$tooltip =~ s/^\n+//;	3418	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3419	$tooltip =~ s/\n+$//;
2765		3420
2766	$self->add (new CFClient::UI::Label	3421	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3422	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3423	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3424	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3425	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3426	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3427	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3428	);
2774	}	3429	}
2775		3430
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3434	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3435
2781	($w + 4, $h + 4)	3436	($w + 4, $h + 4)
2782	}	3437	}
2783		3438
2784	sub size_allocate {	3439	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3440	my ($self, $w, $h) = @_;
2786		3441
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3442	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3443	}
2789		3444
2790	sub visibility_change {	3445	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3446	my ($self, $visible) = @_;
2792		3447
2793	return unless $visible;	3448	return unless $visible;
2794		3449
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3450	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3451	my $widget = $self->{owner}
2797	or return;	3452	or return;
2798		3453
		3454	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3455	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3456
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3457	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3458	if $x + $self->{w} > $self->{root}{w};
2803		3459
2804	$self->move_abs ($x, $y);	3460	$self->move_abs ($x, $y);
		3461	} else {
		3462	$self->hide;
		3463	}
2805	});	3464	});
2806	}	3465	}
2807		3466
2808	sub _draw {	3467	sub _draw {
2809	my ($self) = @_;	3468	my ($self) = @_;
…		…
2833	$self->SUPER::_draw;	3492	$self->SUPER::_draw;
2834	}	3493	}
2835		3494
2836	#############################################################################	3495	#############################################################################
2837		3496
2838	package CFClient::UI::Face;	3497	package CFPlus::UI::Face;
2839		3498
2840	our @ISA = CFClient::UI::Base::;	3499	our @ISA = CFPlus::UI::DrawBG::;
2841		3500
2842	use CFClient::OpenGL;	3501	use CFPlus::OpenGL;
2843		3502
2844	sub new {	3503	sub new {
2845	my $class = shift;	3504	my $class = shift;
2846		3505
2847	my $self = $class->SUPER::new (	3506	my $self = $class->SUPER::new (
		3507	size_w => 32,
		3508	size_h => 8,
2848	aspect => 1,	3509	aspect => 1,
2849	can_events => 0,	3510	can_events => 0,
2850	@_,	3511	@_,
2851	);	3512	);
2852		3513
2853	if ($self->{anim} && $self->{animspeed}) {	3514	if ($self->{anim} && $self->{animspeed}) {
2854	Scalar::Util::weaken (my $widget = $self);	3515	CFPlus::weaken (my $widget = $self);
2855		3516
		3517	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3518	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2856	$self->{timer} = Event->timer (	3519	$self->{timer} = Event->timer (
2857	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858	hard => 1,	3520	parked => 1,
2859	interval => $self->{animspeed},
2860	cb => sub {	3521	cb => sub {
		3522	return unless $::CONN && $widget;
		3523
2861	++$widget->{frame};	3524	++$widget->{frame};
		3525	$widget->update_face;
2862	$widget->update;	3526	$widget->update;
		3527
		3528	$widget->update_timer;
2863	},	3529	},
2864	);	3530	);
		3531
		3532	$self->update_face;
		3533	$self->update_timer;
2865	}	3534	}
2866		3535
2867	$self	3536	$self
2868	}	3537	}
2869		3538
		3539	sub update_timer {
		3540	my ($self) = @_;
		3541
		3542	return unless $self->{timer};
		3543
		3544	if ($self->{visible}) {
		3545	$self->{timer}->at (
		3546	$self->{anim_start}
		3547	+ $self->{animspeed}
		3548	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3549	);
		3550	$self->{timer}->start;
		3551	} else {
		3552	$self->{timer}->stop;
		3553	}
		3554	}
		3555
		3556	sub update_face {
		3557	my ($self) = @_;
		3558
		3559	return unless $::CONN;
		3560
		3561	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3562	if ($anim && @$anim) {
		3563	delete $self->{wait_face};
		3564	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3565	}
		3566	}
		3567	}
		3568
2870	sub size_request {	3569	sub size_request {
2871	(32, 8)	3570	my ($self) = @_;
		3571
		3572	if ($::CONN) {
		3573	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3574	if (my $tex = $::CONN->{texture}[$faceid]) {
		3575	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3576	} else {
		3577	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3578	$self->realloc;
		3579	});
		3580	}
		3581	}
		3582	}
		3583
		3584	($self->{size_w} || 8, $self->{size_h} || 8)
2872	}	3585	}
2873		3586
2874	sub update {	3587	sub update {
2875	my ($self) = @_;	3588	my ($self) = @_;
2876		3589
2877	return unless $self->{visible};	3590	return unless $self->{visible};
2878		3591
2879	$self->SUPER::update;	3592	$self->SUPER::update;
2880	}	3593	}
2881		3594
		3595	sub invoke_visibility_change {
		3596	my ($self) = @_;
		3597
		3598	$self->update_timer;
		3599
		3600	0
		3601	}
		3602
2882	sub _draw {	3603	sub _draw {
2883	my ($self) = @_;	3604	my ($self) = @_;
2884		3605
2885	return unless $::CONN;	3606	return unless $::CONN;
2886		3607
2887	my $face;	3608	$self->SUPER::_draw;
2888		3609
2889	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];	3610	my $faceid = $::CONN->{faceid}[$self->{face}]
2891		3611	or return;
2892	$face = $anim->[ $self->{frame} % @$anim ]
2893	if $anim && @$anim;
2894	}
2895		3612
2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3613	my $tex = $::CONN->{texture}[$faceid];
2897		3614
2898	if ($tex) {	3615	if ($tex) {
2899	glEnable GL_TEXTURE_2D;	3616	glEnable GL_TEXTURE_2D;
2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901	glColor 0, 0, 0, 1;	3618	glColor 0, 0, 0, 1;
…		…
2905	}	3622	}
2906		3623
2907	sub destroy {	3624	sub destroy {
2908	my ($self) = @_;	3625	my ($self) = @_;
2909		3626
2910	$self->{timer}->cancel	3627	(delete $self->{timer})->cancel
2911	if $self->{timer};	3628	if $self->{timer};
2912		3629
2913	$self->SUPER::destroy;	3630	$self->SUPER::destroy;
2914	}	3631	}
2915		3632
2916	#############################################################################	3633	#############################################################################
2917		3634
2918	package CFClient::UI::Buttonbar;	3635	package CFPlus::UI::Buttonbar;
2919		3636
2920	our @ISA = CFClient::UI::HBox::;	3637	our @ISA = CFPlus::UI::HBox::;
2921		3638
2922	# TODO: should actualyl wrap buttons and other goodies.	3639	# TODO: should actually wrap buttons and other goodies.
2923		3640
2924	#############################################################################	3641	#############################################################################
2925		3642
2926	package CFClient::UI::Menu;	3643	package CFPlus::UI::Menu;
2927		3644
2928	our @ISA = CFClient::UI::FancyFrame::;	3645	our @ISA = CFPlus::UI::Toplevel::;
2929		3646
2930	use CFClient::OpenGL;	3647	use CFPlus::OpenGL;
2931		3648
2932	sub new {	3649	sub new {
2933	my $class = shift;	3650	my $class = shift;
2934		3651
2935	my $self = $class->SUPER::new (	3652	my $self = $class->SUPER::new (
2936	items => [],	3653	items => [],
2937	z => 100,	3654	z => 100,
2938	@_,	3655	@_,
2939	);	3656	);
2940		3657
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3658	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3659
2943	for my $item (@{ $self->{items} }) {	3660	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3661	my ($widget, $cb, $tooltip) = @$item;
2945		3662
2946	# handle various types of items, only text for now	3663	# handle various types of items, only text for now
2947	if (!ref $widget) {	3664	if (!ref $widget) {
		3665	if ($widget =~ /\t/) {
		3666	my ($left, $right) = split /\t/, $widget, 2;
		3667
2948	$widget = new CFClient::UI::Label	3668	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3669	can_hover => 1,
2950	can_events => 1,	3670	can_events => 1,
		3671	tooltip => $tooltip,
		3672	children => [
		3673	(new CFPlus::UI::Label markup => $left, expand => 1),
		3674	(new CFPlus::UI::Label markup => $right, align => +1),
		3675	],
		3676	;
		3677
		3678	} else {
		3679	$widget = new CFPlus::UI::Label
		3680	can_hover => 1,
		3681	can_events => 1,
2951	markup => $widget,	3682	markup => $widget,
2952	tooltip => $tooltip	3683	tooltip => $tooltip;
		3684	}
2953	}	3685	}
2954		3686
2955	$self->{item}{$widget} = $item;	3687	$self->{item}{$widget} = $item;
2956		3688
2957	$self->{vbox}->add ($widget);	3689	$self->{vbox}->add ($widget);
…		…
2962		3694
2963	# popup given the event (must be a mouse button down event currently)	3695	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3696	sub popup {
2965	my ($self, $ev) = @_;	3697	my ($self, $ev) = @_;
2966		3698
2967	$self->_emit ("popdown");	3699	$self->emit ("popdown");
2968		3700
2969	# maybe save $GRAB? must be careful about events...	3701	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3702	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3703	$self->{button} = $ev->{button};
2972		3704
2973	$self->show;	3705	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3706	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3707	}
2976		3708
2977	sub mouse_motion {	3709	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3710	my ($self, $ev, $x, $y) = @_;
2979		3711
2980	# TODO: should use vbox->find_widget or so	3712	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3713	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3714	$self->{hover} = $self->{item}{$HOVER};
2983		3715
2984	0	3716	0
2985	}	3717	}
2986		3718
2987	sub button_up {	3719	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3720	my ($self, $ev, $x, $y) = @_;
2989		3721
2990	if ($ev->{button} == $self->{button}) {	3722	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3723	undef $GRAB;
2992	$self->hide;	3724	$self->hide;
2993		3725
2994	$self->_emit ("popdown");	3726	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3727	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3728	} else {
2997	return 0	3729	return 0
2998	}	3730	}
2999		3731
3000	1	3732	1
3001	}	3733	}
3002		3734
3003	#############################################################################	3735	#############################################################################
3004		3736
3005	package CFClient::UI::Multiplexer;	3737	package CFPlus::UI::Multiplexer;
3006		3738
3007	our @ISA = CFClient::UI::Container::;	3739	our @ISA = CFPlus::UI::Container::;
3008		3740
3009	sub new {	3741	sub new {
3010	my $class = shift;	3742	my $class = shift;
3011		3743
3012	my $self = $class->SUPER::new (	3744	my $self = $class->SUPER::new (
…		…
3026		3758
3027	$self->{current} = $self->{children}[0]	3759	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3760	if @{ $self->{children} };
3029	}	3761	}
3030		3762
		3763	sub get_current_page {
		3764	my ($self) = @_;
		3765
		3766	$self->{current}
		3767	}
		3768
3031	sub set_current_page {	3769	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3770	my ($self, $page_or_widget) = @_;
3033		3771
3034	my $widget = ref $page_or_widget	3772	my $widget = ref $page_or_widget
3035	? $page_or_widget	3773	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3774	: $self->{children}[$page_or_widget];
3037		3775
3038	$self->{current} = $widget;	3776	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3777	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3778
3041	$self->_emit (page_changed => $self->{current});	3779	$self->emit (page_changed => $self->{current});
3042		3780
3043	$self->realloc;	3781	$self->realloc;
3044	}	3782	}
3045		3783
3046	sub visible_children {	3784	sub visible_children {
…		…
3051	my ($self) = @_;	3789	my ($self) = @_;
3052		3790
3053	$self->{current}->size_request	3791	$self->{current}->size_request
3054	}	3792	}
3055		3793
3056	sub size_allocate {	3794	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3795	my ($self, $w, $h) = @_;
3058		3796
3059	$self->{current}->configure (0, 0, $w, $h);	3797	$self->{current}->configure (0, 0, $w, $h);
		3798
		3799	1
3060	}	3800	}
3061		3801
3062	sub _draw {	3802	sub _draw {
3063	my ($self) = @_;	3803	my ($self) = @_;
3064		3804
3065	$self->{current}->draw;	3805	$self->{current}->draw;
3066	}	3806	}
3067		3807
3068	#############################################################################	3808	#############################################################################
3069		3809
3070	package CFClient::UI::Notebook;	3810	package CFPlus::UI::Notebook;
3071		3811
3072	our @ISA = CFClient::UI::VBox::;	3812	our @ISA = CFPlus::UI::VBox::;
3073		3813
3074	sub new {	3814	sub new {
3075	my $class = shift;	3815	my $class = shift;
3076		3816
3077	my $self = $class->SUPER::new (	3817	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3818	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3819	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3820	# filter => # will be put between multiplexer and $self
3081	@_,	3821	@_,
3082	);	3822	);
3083		3823
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3824	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3088	}	3828	}
3089		3829
3090	sub add {	3830	sub add {
3091	my ($self, $title, $widget, $tooltip) = @_;	3831	my ($self, $title, $widget, $tooltip) = @_;
3092		3832
3093	Scalar::Util::weaken $self;	3833	CFPlus::weaken $self;
3094		3834
3095	$self->{buttonbar}->add (new CFClient::UI::Button	3835	$self->{buttonbar}->add (new CFPlus::UI::Button
3096	markup => $title,	3836	markup => $title,
3097	tooltip => $tooltip,	3837	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },	3838	on_activate => sub { $self->set_current_page ($widget) },
3099	);	3839	);
3100		3840
3101	$self->{multiplexer}->add ($widget);	3841	$self->{multiplexer}->add ($widget);
3102	}	3842	}
3103		3843
		3844	sub get_current_page {
		3845	my ($self) = @_;
		3846
		3847	$self->{multiplexer}->get_current_page
		3848	}
		3849
3104	sub set_current_page {	3850	sub set_current_page {
3105	my ($self, $page) = @_;	3851	my ($self, $page) = @_;
3106		3852
3107	$self->{multiplexer}->set_current_page ($page);	3853	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3854	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3855	}
3110		3856
3111	#############################################################################	3857	#############################################################################
3112		3858
3113	package CFClient::UI::Combobox;	3859	package CFPlus::UI::Selector;
3114		3860
3115	use utf8;	3861	use utf8;
3116		3862
3117	our @ISA = CFClient::UI::Button::;	3863	our @ISA = CFPlus::UI::Button::;
3118		3864
3119	sub new {	3865	sub new {
3120	my $class = shift;	3866	my $class = shift;
3121		3867
3122	my $self = $class->SUPER::new (	3868	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3874	$self->_set_value ($self->{value});
3129		3875
3130	$self	3876	$self
3131	}	3877	}
3132		3878
3133	sub button_down {	3879	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3880	my ($self, $ev) = @_;
3135		3881
3136	my @menu_items;	3882	my @menu_items;
3137		3883
3138	for (@{ $self->{options} }) {	3884	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3885	my ($value, $title, $tooltip) = @$_;
3140		3886
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3887	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3888	}
3143		3889
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3890	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3891	}
3146		3892
3147	sub _set_value {	3893	sub _set_value {
3148	my ($self, $value) = @_;	3894	my ($self, $value) = @_;
3149		3895
…		…
3159	my ($self, $value) = @_;	3905	my ($self, $value) = @_;
3160		3906
3161	return unless $self->{value} ne $value;	3907	return unless $self->{value} ne $value;
3162		3908
3163	$self->_set_value ($value);	3909	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3910	$self->emit (changed => $value);
3165	}	3911	}
3166		3912
3167	#############################################################################	3913	#############################################################################
3168		3914
3169	package CFClient::UI::Statusbox;	3915	package CFPlus::UI::Statusbox;
3170		3916
3171	our @ISA = CFClient::UI::VBox::;	3917	our @ISA = CFPlus::UI::VBox::;
3172		3918
3173	sub new {	3919	sub new {
3174	my $class = shift;	3920	my $class = shift;
3175		3921
3176	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
3177	fontsize => 0.8,	3923	fontsize => 0.8,
3178	@_,	3924	@_,
3179	);	3925	);
3180		3926
3181	Scalar::Util::weaken (my $this = $self);	3927	CFPlus::weaken (my $this = $self);
3182		3928
3183	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3929	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184		3930
3185	$self	3931	$self
3186	}	3932	}
…		…
3188	sub reorder {	3934	sub reorder {
3189	my ($self) = @_;	3935	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	3936	my $NOW = Time::HiRes::time;
3191		3937
3192	# freeze display when hovering over any label	3938	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	3939	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3940	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	3941	values %{ $self->{item} };
3196		3942
3197	while (my ($k, $v) = each %{ $self->{item} }) {	3943	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3944	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	3945	}
…		…
3220	for ($short) {	3966	for ($short) {
3221	s/^\s+//;	3967	s/^\s+//;
3222	s/\s+/ /g;	3968	s/\s+/ /g;
3223	}	3969	}
3224		3970
3225	new CFClient::UI::Label	3971	new CFPlus::UI::Label
3226	markup => $short,	3972	markup => $short,
3227	tooltip => $item->{tooltip},	3973	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	3974	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	3975	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	3976	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	4030	count => 1,
3285	%arg,	4031	%arg,
3286	};	4032	};
3287	}	4033	}
3288		4034
		4035	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	4036	$self->reorder;
		4037	});
3290	}	4038	}
3291		4039
3292	sub reconfigure {	4040	sub reconfigure {
3293	my ($self) = @_;	4041	my ($self) = @_;
3294		4042
…		…
3307	$self->SUPER::destroy;	4055	$self->SUPER::destroy;
3308	}	4056	}
3309		4057
3310	#############################################################################	4058	#############################################################################
3311		4059
3312	package CFClient::UI::Inventory;
3313
3314	our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316	sub new {
3317	my $class = shift;
3318
3319	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321	@_,
3322	);
3323
3324	$self
3325	}
3326
3327	sub set_items {
3328	my ($self, $items) = @_;
3329
3330	$self->{child}->clear;
3331	return unless $items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}
3351
3352	#############################################################################
3353
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;
3552
3553	our @ISA = CFClient::UI::Table::;
3554
3555	sub new {
3556	my $class = shift;
3557
3558	my $self = $class->SUPER::new (
3559	binding => [],
3560	commands => [],
3561	@_,
3562	)
3563	}
3564
3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578	sub rebuild_spell_list {
3579	my ($self) = @_;
3580
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;
3583
3584	return unless $::CONN;
3585
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592	my $row = 0;
3593
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};
3596
3597	$row++;
3598
3599	my $spell_cb = sub {
3600	my ($widget, $ev) = @_;
3601
3602	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu
3608	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],
3612	)->popup ($ev);
3613	} else {
3614	return 0;
3615	}
3616
3617	1
3618	};
3619
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625	$self->add (0, $row, new CFClient::UI::Face
3626	face => $spell->{face},
3627	can_hover => 1,
3628	can_events => 1,
3629	tooltip => $tooltip,
3630	on_button_down => $spell_cb,
3631	);
3632
3633	$self->add (1, $row, new CFClient::UI::Label
3634	expand => 1,
3635	text => $spell->{name},
3636	can_hover => 1,
3637	can_events => 1,
3638	tooltip => $tooltip,
3639	on_button_down => $spell_cb,
3640	);
3641
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}
3647	});
3648	}
3649
3650	sub add_spell {
3651	my ($self, $spell) = @_;
3652
3653	$self->{spell}->{$spell->{name}} = $spell;
3654	$self->rebuild_spell_list;
3655	}
3656
3657	sub remove_spell {
3658	my ($self, $spell) = @_;
3659
3660	delete $self->{spell}->{$spell->{name}};
3661	$self->rebuild_spell_list;
3662	}
3663
3664	sub clear_spells {
3665	my ($self) = @_;
3666
3667	$self->{spell} = {};
3668	$self->rebuild_spell_list;
3669	}
3670
3671	#############################################################################
3672
3673	package CFClient::UI::Root;	4060	package CFPlus::UI::Root;
3674		4061
3675	our @ISA = CFClient::UI::Container::;	4062	our @ISA = CFPlus::UI::Container::;
3676		4063
3677	use List::Util qw(min max);	4064	use List::Util qw(min max);
3678		4065
3679	use CFClient::OpenGL;	4066	use CFPlus::OpenGL;
3680		4067
3681	sub new {	4068	sub new {
3682	my $class = shift;	4069	my $class = shift;
3683		4070
3684	my $self = $class->SUPER::new (	4071	my $self = $class->SUPER::new (
3685	visible => 1,	4072	visible => 1,
3686	@_,	4073	@_,
3687	);	4074	);
3688		4075
3689	Scalar::Util::weaken ($self->{root} = $self);	4076	CFPlus::weaken ($self->{root} = $self);
3690		4077
3691	$self	4078	$self
3692	}	4079	}
3693		4080
3694	sub size_request {	4081	sub size_request {
…		…
3709	$coord = $max - $size if $coord > $max - $size;	4096	$coord = $max - $size if $coord > $max - $size;
3710		4097
3711	int $coord + 0.5	4098	int $coord + 0.5
3712	}	4099	}
3713		4100
3714	sub size_allocate {	4101	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	4102	my ($self, $w, $h) = @_;
3716		4103
3717	for my $child ($self->children) {	4104	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4105	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		4106
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	4110	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	4111	$Y = _to_pixel $Y, $H, $self->{h};
3725		4112
3726	$child->configure ($X, $Y, $W, $H);	4113	$child->configure ($X, $Y, $W, $H);
3727	}	4114	}
		4115
		4116	1
3728	}	4117	}
3729		4118
3730	sub coord2local {	4119	sub coord2local {
3731	my ($self, $x, $y) = @_;	4120	my ($self, $x, $y) = @_;
3732		4121
…		…
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4247	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		4248
3860	$w = 0 if $w < 0;	4249	$w = 0 if $w < 0;
3861	$h = 0 if $h < 0;	4250	$h = 0 if $h < 0;
3862		4251
		4252	$w = max $widget->{min_w}, $w;
		4253	$h = max $widget->{min_h}, $h;
		4254
		4255	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4256	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4257
		4258	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4259	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4260
3863	$w = int $w + 0.5;	4261	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	4262	$h = int $h + 0.5;
3865		4263
3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4264	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867	$widget->{old_w} = $widget->{w};	4265	$widget->{old_w} = $widget->{w};
…		…
3877		4275
3878	while ($self->{post_alloc_hook}) {	4276	while ($self->{post_alloc_hook}) {
3879	$_->()	4277	$_->()
3880	for values %{delete $self->{post_alloc_hook}};	4278	for values %{delete $self->{post_alloc_hook}};
3881	}	4279	}
3882
3883		4280
3884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4281	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4282	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886	glClear GL_COLOR_BUFFER_BIT;	4283	glClear GL_COLOR_BUFFER_BIT;
3887		4284
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4287	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4288	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4289	glLoadIdentity;
3893		4290
3894	{	4291	{
3895	package CFClient::UI::Base;	4292	package CFPlus::UI::Base;
3896		4293
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4294	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4295	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4296
3901	$self->_draw;	4297	$self->_draw;
		4298	}
3902	}	4299	}
3903		4300
3904	#############################################################################	4301	#############################################################################
3905		4302
3906	package CFClient::UI;	4303	package CFPlus::UI;
3907		4304
3908	$ROOT = new CFClient::UI::Root;	4305	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4306	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4307
3911	1	4308	1
3912		4309

Diff Legend

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