ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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