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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC

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

Diff Legend

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