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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.381 by root, Thu Jul 19 13:45:18 2007 UTC

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

Diff Legend

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