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

Diff Legend

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