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.180 by root, Fri Apr 28 18:06:12 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
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 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
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 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
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 my ($self) = @_; 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};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 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
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
237 $self->{w} = $w; 364 $self->{alloc_w} = $w;
238 $self->{h} = $h; 365 $self->{alloc_h} = $h;
239 366
240 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 } 368 }
243} 369}
244 370
245sub size_allocate { 371sub size_allocate {
246 # nothing to be done 372 # nothing to be done
247} 373}
248 374
249sub children { 375sub children {
376 # nop
250} 377}
251 378
252# call when resoltuion changes etc. 379sub visible_children {
253sub reconfigure { 380 $_[0]->children
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 381}
261 382
262sub set_max_size { 383sub set_max_size {
263 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
264 385
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268 388
269# return top left coordinates 389 $self->realloc;
270sub _topleft { 390}
391
392sub set_tooltip {
271 my ($self, $x, $y) = @_; 393 my ($self, $tooltip) = @_;
272 394
273 $self->{parent} 395 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 396 $tooltip =~ s/\s+$//;
275 397
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
277} 406}
278 407
279# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
280sub coord2local { 409sub coord2local {
281 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
282 411
283 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 413}
286 414
287# translate local coordinates to global coordinate system 415# translate local coordinates to global coordinate system
288sub coord2global { 416sub coord2global {
289 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
290 418
291 my ($X, $Y) = $self->_topleft; 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 420}
294 421
295sub focus_in { 422sub focus_in {
296 my ($self) = @_; 423 my ($self) = @_;
297 424
298 return if $FOCUS == $self; 425 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
300 427
301 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
302 429
303 $self->emit (focus_in => $focus); 430 $self->_emit (focus_in => $focus);
304 431
305 $focus->update if $focus; 432 $focus->update if $focus;
306 $FOCUS->update; 433 $FOCUS->update;
307} 434}
308 435
… …
311 438
312 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
313 440
314 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
315 442
316 $self->emit (focus_out => $focus); 443 $self->_emit (focus_out => $focus);
317 444
318 $focus->update if $focus; #? 445 $focus->update if $focus; #?
319}
320 446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
448 unless $FOCUS;
449}
450
321sub mouse_motion { } 451sub mouse_motion { 0 }
322sub button_up { } 452sub button_up { 0 }
323sub key_down { } 453sub key_down { 0 }
324sub key_up { } 454sub key_up { 0 }
325 455
326sub button_down { 456sub button_down {
327 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
328 458
329 $self->focus_in; 459 $self->focus_in;
330}
331 460
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
336sub 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
337 537
338sub draw { 538sub draw {
339 my ($self) = @_; 539 my ($self) = @_;
340 540
341 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);
342 552
343 glPushMatrix; 553 glPushMatrix;
344 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
345 $self->_draw;
346 glPopMatrix;
347 555
348 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
349 my ($x, $y) = @$self{qw(x y)};
350
351 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
352 glEnable GL_BLEND; 558 glEnable GL_BLEND;
353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
354 glBegin GL_QUADS; 560 glBegin GL_QUADS;
355 glVertex $x , $y;
356 glVertex $x + $self->{w}, $y;
357 glVertex $x + $self->{w}, $y + $self->{h};
358 glVertex $x , $y + $self->{h};
359 glEnd;
360 glDisable GL_BLEND;
361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 561 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
372 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;
373 glPopMatrix; 579 glPopMatrix;
374 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;
375 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
376} 585}
377 586
378sub _draw { 587sub _draw {
379 my ($self) = @_; 588 my ($self) = @_;
380 589
381 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
382} 591}
383 592
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 593sub DESTROY {
448 my ($self) = @_; 594 my ($self) = @_;
449 595
596 delete $WIDGET{$self+0};
450 #$self->deactivate; 597 #$self->deactivate;
451} 598}
452 599
453############################################################################# 600#############################################################################
454 601
… …
463 my $class = shift; 610 my $class = shift;
464 611
465 # range [value, low, high, page] 612 # range [value, low, high, page]
466 613
467 $class->SUPER::new ( 614 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 615 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 616 #active_bg => [1, 1, 1, 0.5],
470 @_ 617 @_
471 ) 618 )
472} 619}
473 620
474sub _draw { 621sub _draw {
475 my ($self) = @_; 622 my ($self) = @_;
476 623
624 my $color = $FOCUS == $self && $self->{active_bg}
625 ? $self->{active_bg}
626 : $self->{bg};
627
628 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
478 630
479 glEnable GL_BLEND; 631 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 633 glColor_premultiply @$color;
482 634
483 glBegin GL_QUADS; 635 glBegin GL_QUADS;
484 glVertex 0 , 0; 636 glVertex 0 , 0;
485 glVertex 0 , $h; 637 glVertex 0 , $h;
486 glVertex $w, $h; 638 glVertex $w, $h;
487 glVertex $w, 0; 639 glVertex $w, 0;
488 glEnd; 640 glEnd;
489 641
490 glDisable GL_BLEND; 642 glDisable GL_BLEND;
643 }
491} 644}
492 645
493############################################################################# 646#############################################################################
494 647
495package CFClient::UI::Empty; 648package CFClient::UI::Empty;
… …
500 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
502} 655}
503 656
504sub size_request { 657sub size_request {
505 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
506} 661}
507 662
508sub draw { } 663sub draw { }
509 664
510############################################################################# 665#############################################################################
… …
514our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
515 670
516sub new { 671sub new {
517 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
518 673
519 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
520 675
521 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
522 children => [], 677 children => [],
523 can_events => 0, 678 can_events => 0,
524 %arg, 679 %arg,
525 ); 680 );
681
526 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
527 684
528 $self 685 $self
529} 686}
530 687
531sub add { 688sub add {
532 my ($self, $child) = @_; 689 my ($self, @widgets) = @_;
533 690
534 $child->set_parent ($self); 691 $_->set_parent ($self)
692 for @widgets;
535 693
536 use sort 'stable'; 694 use sort 'stable';
537 695
538 $self->{children} = [ 696 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 698 @{$self->{children}}, @widgets
541 ]; 699 ];
542 700
543 $child->check_size; 701 $self->realloc;
544} 702}
545 703
546sub children { 704sub children {
547 @{ $_[0]{children} } 705 @{ $_[0]{children} }
548} 706}
… …
553 delete $child->{parent}; 711 delete $child->{parent};
554 $child->hide; 712 $child->hide;
555 713
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 715
558 $self->check_size; 716 $self->realloc;
559 $self->update;
560} 717}
561 718
562sub clear { 719sub clear {
563 my ($self) = @_; 720 my ($self) = @_;
564 721
… …
567 724
568 for (@$children) { 725 for (@$children) {
569 delete $_->{parent}; 726 delete $_->{parent};
570 $_->hide; 727 $_->hide;
571 } 728 }
729
730 $self->realloc;
572} 731}
573 732
574sub find_widget { 733sub find_widget {
575 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
576 735
577 $x -= $self->{x}; 736 $x -= $self->{x};
578 $y -= $self->{y}; 737 $y -= $self->{y};
579 738
580 my $res; 739 my $res;
581 740
582 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
583 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
584 and return $res; 743 and return $res;
585 } 744 }
586 745
587 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
636 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
637} 796}
638 797
639############################################################################# 798#############################################################################
640 799
800# back-buffered drawing area
801
641package CFClient::UI::Window; 802package CFClient::UI::Window;
642 803
643our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
644 805
645use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
651} 812}
652 813
653sub update { 814sub update {
654 my ($self) = @_; 815 my ($self) = @_;
655 816
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 817 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 818 $self->SUPER::update;
658} 819}
659 820
660sub size_allocate { 821sub size_allocate {
661 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
662 823
663 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 825 $self->update;
826}
827
828sub _render {
829 my ($self) = @_;
830
831 $self->{children}[0]->draw;
665} 832}
666 833
667sub render_child { 834sub render_child {
668 my ($self) = @_; 835 my ($self) = @_;
669 836
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 840
674# glColorMask 1, 1, 1, 0; 841 {
675# glEnable GL_BLEND; 842 package CFClient::UI::Base;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 843
677# glRasterPos 0, 0; 844 ($draw_x, $draw_y, $draw_w, $draw_h) =
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 845 (0, 0, $self->{w}, $self->{h});
679# glDisable GL_BLEND; 846 }
680# glColorMask 1, 1, 1, 1; 847
848 $self->_render;
681 }; 849 };
682} 850}
683 851
684sub _draw { 852sub _draw {
685 my ($self) = @_; 853 my ($self) = @_;
686 854
687 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
688 856
689 my $tex = $self->{texture} 857 my $tex = $self->{texture}
690 or return; 858 or return;
691 859
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 862 glColor 0, 0, 0, 1;
697 863
698 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 865
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
702} 867}
703 868
704############################################################################# 869#############################################################################
705 870
706package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
707 872
708our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 874
736sub new { 875sub new {
737 my $class = shift; 876 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 978 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 979 slider => $slider,
742 border => 0.8, 980 %arg,
743 @_
744 ); 981 );
745 982
983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
985
746 $self 986 $self
747} 987}
748 988
749sub _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 {
750 my ($self) = @_; 1006 my ($self, $w, $h) = @_;
751 1007
752 my ($w, $h) = ($self->{w}, $self->{h}); 1008 $self->SUPER::size_allocate ($w, $h);
753 1009
754 glEnable GL_BLEND; 1010 my $child = $self->{vp}->child;
755 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]);
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758
759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766
767
768 $self->child->draw;
769 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D;
771} 1012}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
772 1016
773############################################################################# 1017#############################################################################
774 1018
775package CFClient::UI::FancyFrame; 1019package CFClient::UI::Frame;
776 1020
777our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
778 1022
779use CFClient::OpenGL; 1023use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 1024
785sub new { 1025sub new {
786 my $class = shift; 1026 my $class = shift;
787 1027
788 # 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};
789 1077
790 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1081 border => 0.6,
794 can_events => 1, 1082 can_events => 1,
795 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
796 ); 1086 );
797 1087
798 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
799 align => 0, 1089 align => 0,
800 valign => 1, 1090 valign => 1,
801 text => $self->{title}, 1091 text => $title,
802 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
803 1094
804 $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};
805} 1103}
806 1104
807sub border { 1105sub border {
808 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
809} 1107}
810 1108
811sub size_request { 1109sub size_request {
812 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
813 1114
814 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
815 1116
816 ( 1117 (
817 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
820} 1121}
821 1122
822sub size_allocate { 1123sub size_allocate {
823 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
824 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
825 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
827 1136
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
831 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
832} 1138}
833 1139
834sub button_down { 1140sub button_down {
835 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
836 1142
… …
852 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
853 1159
854 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
856 1162
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size; 1167 $self->realloc;
861 }; 1168 };
862 1169
863 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1174 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
869 1176
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
871 1178
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
874 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
875 } 1187 1
876} 1188}
877 1189
878sub button_up { 1190sub button_up {
879 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
880 1192
881 delete $self->{motion}; 1193 !!delete $self->{motion}
882} 1194}
883 1195
884sub mouse_motion { 1196sub mouse_motion {
885 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
886 1198
887 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
888} 1202}
889 1203
890sub _draw { 1204sub _draw {
891 my ($self) = @_; 1205 my ($self) = @_;
892 1206
1207 my $child = $self->{children}[0];
1208
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
895 1211
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1214
901 my $border = $self->border; 1215 my $border = $self->border;
902 1216
903 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1222
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
911 1225
912 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
915
916 glColor @{ $self->{bg} };
917
918 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1231 }
922 1232
923 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1234
927 $self->{title}->draw if $self->{title};
928
929 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
930} 1241}
931 1242
932############################################################################# 1243#############################################################################
933 1244
934package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
942sub new { 1253sub new {
943 my $class = shift; 1254 my $class = shift;
944 1255
945 $class->SUPER::new ( 1256 $class->SUPER::new (
946 col_expand => [], 1257 col_expand => [],
947 @_ 1258 @_,
948 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1264}
950 1265
951sub add { 1266sub add {
952 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
953 1268
954 $child->set_parent ($self); 1269 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
956 1271
957 $child->check_size; 1272 $self->realloc;
958} 1273}
959 1274
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# 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?
965sub clear { 1276sub clear {
966 my ($self) = @_; 1277 my ($self) = @_;
967 1278
968 my @children = $self->children; 1279 my @children = $self->children;
969 delete $self->{children}; 1280 delete $self->{children};
… …
971 for (@children) { 1282 for (@children) {
972 delete $_->{parent}; 1283 delete $_->{parent};
973 $_->hide; 1284 $_->hide;
974 } 1285 }
975 1286
976 $self->update; 1287 $self->realloc;
977} 1288}
978 1289
979sub get_wh { 1290sub get_wh {
980 my ($self) = @_; 1291 my ($self) = @_;
981 1292
… …
1012sub size_allocate { 1323sub size_allocate {
1013 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1014 1325
1015 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1016 1327
1017 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1019 1330
1020 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1388 }
1078} 1389}
1079 1390
1080############################################################################# 1391#############################################################################
1081 1392
1082package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1394
1086our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1087 1396
1088sub size_request { 1397sub size_request {
1089 my ($self) = @_; 1398 my ($self) = @_;
1090 1399
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1092 1401 ? (
1093 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1404 )
1096 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1097} 1409}
1098 1410
1099sub size_allocate { 1411sub size_allocate {
1100 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1101 1413
1102 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1415 my $children = $self->{children};
1105 1416
1106 my @h = map $_->{req_w}, @$children; 1417 my @req;
1107 1418
1108 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1109 1420 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } 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 {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1435 }
1124 } 1436 }
1125 1437
1126 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1127 1439
1128 my $y = 0; 1440 my $pos = 0;
1129 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1444
1134 $y += $h; 1445 $pos += $alloc;
1135 } 1446 }
1136 1447
1137 1 1448 1
1138} 1449}
1139 1450
1140############################################################################# 1451#############################################################################
1141 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
1142package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1143 1469
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1147 1471
1148sub size_request { 1472sub new {
1149 my ($self) = @_; 1473 my $class = shift;
1150 1474
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1152 1476 vertical => 1,
1153 ( 1477 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1478 )
1157} 1479}
1158 1480
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1481#############################################################################
1197 1482
1198package CFClient::UI::Label; 1483package CFClient::UI::Label;
1199 1484
1200our @ISA = CFClient::UI::Base::; 1485our @ISA = CFClient::UI::DrawBG::;
1201 1486
1202use CFClient::OpenGL; 1487use CFClient::OpenGL;
1203 1488
1204sub new { 1489sub new {
1205 my ($class, %arg) = @_; 1490 my ($class, %arg) = @_;
1206 1491
1207 my $self = $class->SUPER::new ( 1492 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1494 #bg => none
1495 #active_bg => none
1209 #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),
1210 fontsize => 1, 1502 fontsize => 1,
1211 text => "",
1212 align => -1, 1503 align => -1,
1213 valign => -1, 1504 valign => -1,
1214 padding => 2, 1505 padding_x => 2,
1215 layout => new CFClient::Layout, 1506 padding_y => 2,
1216 can_events => 0, 1507 can_events => 0,
1217 %arg 1508 %arg
1218 ); 1509 );
1219 1510
1220 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1512 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1513 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1514 $self->{template} = $layout;
1224 } 1515 }
1225 1516
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1517 if (exists $self->{markup}) {
1227 $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 }
1228 1522
1229 $self 1523 $self
1230} 1524}
1231 1525
1232sub escape { 1526sub escape($) {
1233 local $_ = $_[1]; 1527 local $_ = $_[0];
1234 1528
1235 s/&/&amp;/g; 1529 s/&/&amp;/g;
1236 s/>/&gt;/g; 1530 s/>/&gt;/g;
1237 s/</&lt;/g; 1531 s/</&lt;/g;
1238 1532
1239 $_[1] 1533 $_
1240} 1534}
1241 1535
1242sub update { 1536sub update {
1243 my ($self) = @_; 1537 my ($self) = @_;
1244 1538
1245 delete $self->{texture}; 1539 delete $self->{texture};
1246 $self->SUPER::update; 1540 $self->SUPER::update;
1247} 1541}
1248 1542
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1543sub set_text {
1256 my ($self, $text) = @_; 1544 my ($self, $text) = @_;
1257 1545
1258 return if $self->{text} eq "T$text"; 1546 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1260 1548
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1262 1551
1263 delete $self->{texture}; 1552 $self->realloc;
1264 $self->update; 1553 $self->update;
1265 $self->check_size;
1266} 1554}
1267 1555
1268sub set_markup { 1556sub set_markup {
1269 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1270 1558
1271 return if $self->{text} eq "M$markup"; 1559 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1560 $self->{text} = "M$markup";
1273 1561
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1275 1566
1276 delete $self->{texture}; 1567 $self->realloc;
1277 $self->update; 1568 $self->update;
1278 $self->check_size;
1279} 1569}
1280 1570
1281sub size_request { 1571sub size_request {
1282 my ($self) = @_; 1572 my ($self) = @_;
1283 1573
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1574 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $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});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1579
1288 my ($w, $h) = $self->{layout}->size; 1580 my ($w, $h) = $self->{layout}->size;
1289 1581
1290 if (exists $self->{template}) { 1582 if (exists $self->{template}) {
… …
1295 1587
1296 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1298 } 1590 }
1299 1591
1300 ( 1592 ($w, $h)
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1593}
1305 1594
1306sub size_allocate { 1595sub size_allocate {
1307 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1308 1597
1598 delete $self->{ox};
1599
1309 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1310} 1602}
1311 1603
1312sub set_fontsize { 1604sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1314 1606
1315 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1608 delete $self->{texture};
1317 $self->check_size; 1609
1318 $self->update; 1610 $self->realloc;
1319} 1611}
1320 1612
1321sub _draw { 1613sub _draw {
1322 my ($self) = @_; 1614 my ($self) = @_;
1323 1615
1616 $self->SUPER::_draw; # draw background, if applicable
1617
1324 my $tex = $self->{texture} ||= do { 1618 my $tex = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1620 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $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});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625
1328 new_from_layout CFClient::Texture $self->{layout} 1626 new_from_layout CFClient::Texture $self->{layout}
1329 }; 1627 };
1330 1628
1331 glEnable GL_BLEND; 1629 unless (exists $self->{ox}) {
1332 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
1333 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1641
1336 glColor @{$self->{fg}}; 1642 glColor_premultiply @{$self->{fg}}
1643 if $tex->{format} == GL_ALPHA;
1337 1644
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1351 1646
1352 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1648}
1355 1649
1356############################################################################# 1650#############################################################################
1357 1651
1358package CFClient::UI::EntryBase; 1652package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1665 active_fg => [0, 0, 0],
1372 can_hover => 1, 1666 can_hover => 1,
1373 can_focus => 1, 1667 can_focus => 1,
1374 valign => 0, 1668 valign => 0,
1375 can_events => 1, 1669 can_events => 1,
1670 #text => ...
1376 @_ 1671 @_
1377 ) 1672 )
1378} 1673}
1379 1674
1380sub _set_text { 1675sub _set_text {
… …
1382 1677
1383 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1384 1679
1385 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1386 1681
1387 delete $self->{texture};
1388
1389 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1390 $self->{text} = $text; 1683 $self->{text} = $text;
1391 1684
1392 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1394 1687
1395 $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;
1396} 1699}
1397 1700
1398sub get_text { 1701sub get_text {
1399 $_[0]{text} 1702 $_[0]{text}
1400} 1703}
… …
1403 my ($self) = @_; 1706 my ($self) = @_;
1404 1707
1405 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1406 1709
1407 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1711}
1423 1712
1424sub key_down { 1713sub key_down {
1425 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1426 1715
… …
1428 my $sym = $ev->{sym}; 1717 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1718 my $uni = $ev->{unicode};
1430 1719
1431 my $text = $self->get_text; 1720 my $text = $self->get_text;
1432 1721
1433 if ($sym == 8) { 1722 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1724 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1725 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1726 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1727 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1728 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1729 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1734 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1735 $self->_emit ('escape');
1447 } elsif ($uni) { 1736 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1449 } 1740 }
1450 1741
1451 $self->_set_text ($text); 1742 $self->_set_text ($text);
1452 $self->update; 1743
1744 $self->realloc;
1745
1746 1
1453} 1747}
1454 1748
1455sub focus_in { 1749sub focus_in {
1456 my ($self) = @_; 1750 my ($self) = @_;
1457 1751
… …
1472 utf8::encode $text; 1766 utf8::encode $text;
1473 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1474 1768
1475 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1476 $self->update; 1770 $self->update;
1771
1772 1
1477} 1773}
1478 1774
1479sub mouse_motion { 1775sub mouse_motion {
1480 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1481# 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
1482} 1780}
1483 1781
1484sub _draw { 1782sub _draw {
1485 my ($self) = @_; 1783 my ($self) = @_;
1486 1784
1487 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1488 1786
1489 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1490 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1491 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1492 } else { 1790 } else {
1493 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1494 } 1792 }
1495 1793
1496 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1498 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1499 glVertex 0 , 0; 1797 glVertex 0 , 0;
1500 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1501 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1502 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1537 if ($sym == 13) { 1835 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1543 $self->update; 1841 $self->update;
1544 1842
1545 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1563 } else { 1861 } else {
1564 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1565 } 1863 }
1566 1864
1567 } else { 1865 } else {
1568 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1569 } 1869 1
1570
1571} 1870}
1572 1871
1573############################################################################# 1872#############################################################################
1574 1873
1575package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1584 1883
1585sub new { 1884sub new {
1586 my $class = shift; 1885 my $class = shift;
1587 1886
1588 $class->SUPER::new ( 1887 $class->SUPER::new (
1589 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1590 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1593 can_hover => 1, 1892 can_hover => 1,
1594 align => 0, 1893 align => 0,
1595 valign => 0, 1894 valign => 0,
1596 can_events => 1, 1895 can_events => 1,
1597 @_ 1896 @_
1598 ) 1897 )
1599} 1898}
1600 1899
1900sub activate { }
1901
1601sub button_up { 1902sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1603 1904
1905 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate"); 1908
1607 } 1909 1
1608} 1910}
1609 1911
1610sub _draw { 1912sub _draw {
1611 my ($self) = @_; 1913 my ($self) = @_;
1612 1914
1613 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1614 1916
1615 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg};
1617 }
1618
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1624 1920
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1922
1627 glDisable GL_TEXTURE_2D; 1923 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1924
1630 $self->SUPER::_draw; 1925 $self->SUPER::_draw;
1631} 1926}
1632 1927
1633############################################################################# 1928#############################################################################
… …
1644 1939
1645sub new { 1940sub new {
1646 my $class = shift; 1941 my $class = shift;
1647 1942
1648 $class->SUPER::new ( 1943 $class->SUPER::new (
1649 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1650 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1651 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],
1652 state => 0, 1950 state => 0,
1653 can_hover => 1, 1951 can_hover => 1,
1654 @_ 1952 @_
1655 ) 1953 )
1656} 1954}
1657 1955
1658sub size_request { 1956sub size_request {
1659 my ($self) = @_; 1957 my ($self) = @_;
1660 1958
1661 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1662} 1960}
1663 1961
1664sub button_down { 1962sub button_down {
1665 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1666 1964
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1671 } 1973 1
1672} 1974}
1673 1975
1674sub _draw { 1976sub _draw {
1675 my ($self) = @_; 1977 my ($self) = @_;
1676 1978
1677 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1678 1980
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 1982
1681 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;
1682 1986
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1988
1685 glEnable GL_BLEND; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1990
1686 glEnable GL_TEXTURE_2D; 1991 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1992 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1993 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1994}
1696 1995
1697############################################################################# 1996#############################################################################
1698 1997
1699package CFClient::UI::Image; 1998package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 2041 glTranslate 0, -$self->{w}, 0;
1743 2042
1744 ($w, $h) = ($h, $w); 2043 ($w, $h) = ($h, $w);
1745 } 2044 }
1746 2045
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 2046 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2047 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 2048
1752 $tex->draw_quad (0, 0, $w, $h); 2049 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 2050
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 2051 glDisable GL_TEXTURE_2D;
1756} 2052}
1757 2053
1758############################################################################# 2054#############################################################################
1759 2055
… …
1849 2145
1850 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1852 2148
1853 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1854 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;
1855 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1857 2154
1858 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
1859 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2245 qw(s1_slider.png s1_slider_bg.png);
1949 2246
1950sub new { 2247sub new {
1951 my $class = shift; 2248 my $class = shift;
1952 2249
1953 # range [value, low, high, page] 2250 # range [value, low, high, page, unit]
1954 2251
1955 # TODO: 0-width page 2252 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2253 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2254 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2255 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
1960 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],
1961 range => [0, 0, 100, 10], 2260 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2261 min_w => $::WIDTH / 80,
1963 req_h => 20, 2262 min_h => $::WIDTH / 80,
1964 vertical => 0, 2263 vertical => 0,
1965 can_hover => 1, 2264 can_hover => 1,
1966 inner_pad => 5, 2265 inner_pad => 0.02,
1967 @_ 2266 @_
1968 ); 2267 );
1969 2268
2269 $self->set_value ($self->{range}[0]);
2270 $self->update;
2271
1970 $self 2272 $self
1971} 2273}
1972 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
1973sub size_request { 2309sub size_request {
1974 my ($self) = @_; 2310 my ($self) = @_;
1975 2311
1976 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2313}
1981 2314
1982sub button_down { 2315sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
1984 2317
1985 $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
1986 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
1987} 2323}
1988 2324
1989sub mouse_motion { 2325sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
1991 2327
1992 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
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2357 my $range = ($hi - $page - $lo) || 1e-100;
1994 2358
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2359 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2360
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2361 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2362 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2363
2000 $x -= $inner_pad_px; # substract the padding 2364 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2365 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2366
2006 $self->emit (changed => $x); 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2368 $self->{knob_w} = $knob_w;
2008 } 2369 }
2009}
2010
2011# the inner_* stuff is for generating a padding for the slider handle,
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017}
2018
2019sub _draw {
2020 my ($self) = @_;
2021 2370
2022 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2023 2372
2024 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
2025 2374
2026 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
2028 2377
2378 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2380 }
2034 2381
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2384
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2385 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2387
2061 # draw background 2388 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2390
2064 # draw handle 2391 # draw handle
2065 $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);
2066 2393
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2069} 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 (@_) }
2070 2437
2071############################################################################# 2438#############################################################################
2072 2439
2073package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2074 2441
… …
2083 fontsize => 1, 2450 fontsize => 1,
2084 can_events => 0, 2451 can_events => 0,
2085 #font => default_font 2452 #font => default_font
2086 @_, 2453 @_,
2087 2454
2088 layout => (new CFClient::Layout), 2455 layout => (new CFClient::Layout 1),
2089 par => [], 2456 par => [],
2090 height => 0, 2457 height => 0,
2091 children => [ 2458 children => [
2092 (new CFClient::UI::Empty expand => 1), 2459 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2460 (new CFClient::UI::Slider vertical => 1),
… …
2104 2471
2105 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2473 $self->reflow;
2107} 2474}
2108 2475
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2476sub size_allocate {
2129 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2130 2478
2131 $self->SUPER::size_allocate ($w, $h); 2479 $self->SUPER::size_allocate ($w, $h);
2132 2480
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2484
2137 $self->reflow; 2485 $self->reflow;
2138} 2486}
2139 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
2140sub add_paragraph { 2522sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2142 2524
2143 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2144 2526 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2148 2530
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $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]);
2152 $self->{children}[1]->update;
2153} 2532}
2154 2533
2155sub update { 2534sub update {
2156 my ($self) = @_; 2535 my ($self) = @_;
2157 2536
… …
2159 2538
2160 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2161 2540
2162 delete $self->{texture}; 2541 delete $self->{texture};
2163 2542
2164 $ROOT->on_refresh ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2165 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2547 my $height = 0;
2167 2548
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2169 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 }
2170 2564
2171 $self->{height} = $height; 2565 $self->{height} = $height;
2172 2566
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2568
2175 delete $self->{texture}; 2569 delete $self->{texture};
2176 } 2570 }
2177 2571
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2573 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2181 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
2182 glEnable GL_BLEND; 2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2590
2198 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2592 my $h = $par->[1];
2200 2593
2201 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]);
2202 $layout->set_text ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2203 2598
2204 glColor @{ $par->[1] }; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2600
2206 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;
2207 } 2603 }
2208 2604
2209 $y += $h; 2605 $y += $h;
2210 } 2606 }
2211 2607
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2608 glDisable GL_BLEND;
2214 }; 2609 };
2215 }); 2610 });
2216} 2611}
2217 2612
2218sub _draw { 2613sub _draw {
2219 my ($self) = @_; 2614 my ($self) = @_;
2220 2615
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2621
2230 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2231 2623
2232} 2624}
2233 2625
… …
2281 2673
2282sub new { 2674sub new {
2283 my $class = shift; 2675 my $class = shift;
2284 2676
2285 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2286 state => 0, 2678 state => 0,
2287 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2288 @_ 2680 @_
2289 ); 2681 );
2290 2682
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2683 $self
2297} 2684}
2298 2685
2299sub toggle_flopper { 2686sub toggle_flopper {
2300 my ($self) = @_; 2687 my ($self) = @_;
2301 2688
2302 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2690}
2314 2691
2315############################################################################# 2692#############################################################################
2316 2693
2317package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2327 @_, 2704 @_,
2328 can_events => 0, 2705 can_events => 0,
2329 ) 2706 )
2330} 2707}
2331 2708
2332sub set_markup { 2709sub set_tooltip_from {
2333 my ($self, $text) = @_; 2710 my ($self, $widget) = @_;
2334 2711
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2712 my $tooltip = $widget->{tooltip};
2336 $self->{label}->set_markup ($text); 2713
2337 $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 );
2338} 2729}
2339 2730
2340sub size_request { 2731sub size_request {
2341 my ($self) = @_; 2732 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2733
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2735
2347 ($w + 4, $h + 4) 2736 ($w + 4, $h + 4)
2348} 2737}
… …
2351 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2352 2741
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354} 2743}
2355 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
2356sub _draw { 2763sub _draw {
2357 my ($self) = @_; 2764 my ($self) = @_;
2358 2765
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2766 glTranslate 0.375, 0.375;
2361 2767
2362 my ($w, $h) = @$self{qw(w h)}; 2768 my ($w, $h) = @$self{qw(w h)};
2363 2769
2364 glColor 1, 0.8, 0.4; 2770 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2781 glVertex 0 , $h;
2376 glVertex $w, $h; 2782 glVertex $w, $h;
2377 glVertex $w, 0; 2783 glVertex $w, 0;
2378 glEnd; 2784 glEnd;
2379 2785
2380 glPopMatrix; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2381 2787
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2384} 2789}
2385 2790
2386############################################################################# 2791#############################################################################
2387 2792
… …
2392use CFClient::OpenGL; 2797use CFClient::OpenGL;
2393 2798
2394sub new { 2799sub new {
2395 my $class = shift; 2800 my $class = shift;
2396 2801
2397 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2398 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2399 @_, 2805 @_,
2400 ) 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
2401} 2823}
2402 2824
2403sub size_request { 2825sub size_request {
2404 (32, 8) 2826 (32, 8)
2405} 2827}
2406 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2407sub _draw { 2837sub _draw {
2408 my ($self) = @_; 2838 my ($self) = @_;
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2852
2412 # TODO animation
2413 if ($tex) { 2853 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2859 }
2423} 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.
2424 2878
2425############################################################################# 2879#############################################################################
2426 2880
2427package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2428 2882
… …
2462 2916
2463# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2464sub popup { 2918sub popup {
2465 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2466 2920
2467 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2468 2922
2469 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2924 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2472 2926
2473 $self->show; 2927 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 2929}
2476 2930
2477sub mouse_motion { 2931sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2479 2933
2480 # TODO: should use vbox->fdind_widget or so 2934 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2483} 2939}
2484 2940
2485sub button_up { 2941sub button_up {
2486 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2487 2943
2488 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2945 undef $GRAB;
2490 $self->hide; 2946 $self->hide;
2491 2947
2492 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2494 } 2954 1
2495} 2955}
2496 2956
2497############################################################################# 2957#############################################################################
2498 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 => [],
3456 @_,
3457 )
3458}
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
2499package CFClient::UI::Root; 3502package CFClient::UI::Root;
2500 3503
2501our @ISA = CFClient::UI::Container::; 3504our @ISA = CFClient::UI::Container::;
2502 3505
3506use List::Util qw(min max);
3507
2503use CFClient::OpenGL; 3508use CFClient::OpenGL;
2504 3509
2505sub check_size { 3510sub new {
2506 my ($self) = @_; 3511 my $class = shift;
2507 3512
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
2509} 3521}
2510 3522
2511sub size_request { 3523sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3524 my ($self) = @_;
2513}
2514 3525
2515sub configure { 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
3541}
3542
3543sub size_allocate {
2516 my ($self, $x, $y, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
2517 3545
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3546 for my $child ($self->children) {
2521 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)};
2522 3548
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3549 $X = $child->{force_x} if exists $child->{force_x};
2524 $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
2525 $child->configure ($X, $Y, $W,$H); 3555 $child->configure ($X, $Y, $W, $H);
2526 } 3556 }
2527} 3557}
2528 3558
2529sub _topleft { 3559sub coord2local {
2530 my ($self, $x, $y) = @_; 3560 my ($self, $x, $y) = @_;
2531 3561
2532 ($x, $y) 3562 ($x, $y)
2533} 3563}
2534 3564
3565sub coord2global {
3566 my ($self, $x, $y) = @_;
3567
3568 ($x, $y)
3569}
3570
2535sub update { 3571sub update {
2536 my ($self) = @_; 3572 my ($self) = @_;
2537 3573
2538 $self->check_size; 3574 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3575}
2541 3576
2542sub add { 3577sub add {
2543 my ($self, $child) = @_; 3578 my ($self, @children) = @_;
2544 3579
2545 # integerize window positions 3580 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3581 for @children;
2547 $child->{y} = int $child->{y};
2548 3582
2549 $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 }
2550} 3599}
2551 3600
2552sub on_refresh { 3601sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3602 my ($self, $id, $cb) = @_;
2554 3603
2555 $self->{refresh_hook}{$id} = $cb; 3604 $self->{refresh_hook}{$id} = $cb;
2556} 3605}
2557 3606
3607sub on_post_alloc {
3608 my ($self, $id, $cb) = @_;
3609
3610 $self->{post_alloc_hook}{$id} = $cb;
3611}
3612
2558sub draw { 3613sub draw {
2559 my ($self) = @_; 3614 my ($self) = @_;
2560 3615
2561 while (my $rcb = delete $self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3617 $_->()
3618 for values %{delete $self->{refresh_hook}};
2563 } 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
2564 3712
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
2568 3716
2569 glMatrixMode GL_PROJECTION; 3717 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3718 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3721 glLoadIdentity;
2574 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
2575 $self->_draw; 3730 $self->_draw;
2576} 3731}
2577 3732
2578############################################################################# 3733#############################################################################
2579 3734
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1,
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # what information source to use for face size?
2631 # it should be configurable I guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->draw;
2674
2675 $hrem -= $chld->{h};
2676 $y += $chld->{h};
2677 } else {
2678 last
2679 }
2680 }
2681}
2682
2683
2684#############################################################################
2685
2686package CFClient::UI; 3735package CFClient::UI;
2687 3736
2688$ROOT = new CFClient::UI::Root; 3737$ROOT = new CFClient::UI::Root;
2689$TOOLTIP = new CFClient::UI::Tooltip; 3738$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2690 3739
26911 37401
2692 3741

Diff Legend

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