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

Diff Legend

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