ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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