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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.378 by root, Mon Jul 16 20:22:39 2007 UTC

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

Diff Legend

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