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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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