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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 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
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 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
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 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 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 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;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
… …
378 446
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 448 unless $FOCUS;
381} 449}
382 450
383sub mouse_motion { } 451sub mouse_motion { 0 }
384sub button_up { } 452sub button_up { 0 }
385sub key_down { } 453sub key_down { 0 }
386sub key_up { } 454sub key_up { 0 }
387 455
388sub button_down { 456sub button_down {
389 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
390 458
391 $self->focus_in; 459 $self->focus_in;
392}
393 460
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
398sub 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
399 537
400sub draw { 538sub draw {
401 my ($self) = @_; 539 my ($self) = @_;
402 540
403 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);
404 552
405 glPushMatrix; 553 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 555
410 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 558 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 560 glBegin GL_QUADS;
417 glVertex $x , $y; 561 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
421 glEnd; 565 glEnd;
422 glDisable GL_BLEND; 566 glDisable GL_BLEND;
423 } 567 }
424 568
425 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 570 glPushMatrix;
427 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 574 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
434 glEnd; 578 glEnd;
435 glPopMatrix; 579 glPopMatrix;
436 #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;
437 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
438} 585}
439 586
440sub _draw { 587sub _draw {
441 my ($self) = @_; 588 my ($self) = @_;
442 589
443 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504} 591}
505 592
506sub DESTROY { 593sub DESTROY {
507 my ($self) = @_; 594 my ($self) = @_;
508 595
… …
540 627
541 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
543 630
544 glEnable GL_BLEND; 631 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 633 glColor_premultiply @$color;
547 634
548 glBegin GL_QUADS; 635 glBegin GL_QUADS;
549 glVertex 0 , 0; 636 glVertex 0 , 0;
550 glVertex 0 , $h; 637 glVertex 0 , $h;
551 glVertex $w, $h; 638 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
568} 655}
569 656
570sub size_request { 657sub size_request {
571 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
572} 661}
573 662
574sub draw { } 663sub draw { }
575 664
576############################################################################# 665#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
581 670
582sub new { 671sub new {
583 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
584 673
585 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
586 675
587 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
588 children => [], 677 children => [],
589 can_events => 0, 678 can_events => 0,
590 %arg, 679 %arg,
591 ); 680 );
681
592 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
593 684
594 $self 685 $self
595} 686}
596 687
597sub add { 688sub add {
… …
605 $self->{children} = [ 696 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
608 ]; 699 ];
609 700
610 $self->check_size (1); 701 $self->realloc;
611 $self->update;
612} 702}
613 703
614sub children { 704sub children {
615 @{ $_[0]{children} } 705 @{ $_[0]{children} }
616} 706}
… …
621 delete $child->{parent}; 711 delete $child->{parent};
622 $child->hide; 712 $child->hide;
623 713
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 715
626 $self->check_size (1); 716 $self->realloc;
627 $self->update;
628} 717}
629 718
630sub clear { 719sub clear {
631 my ($self) = @_; 720 my ($self) = @_;
632 721
… …
636 for (@$children) { 725 for (@$children) {
637 delete $_->{parent}; 726 delete $_->{parent};
638 $_->hide; 727 $_->hide;
639 } 728 }
640 729
641 $self->check_size; 730 $self->realloc;
642 $self->update;
643} 731}
644 732
645sub find_widget { 733sub find_widget {
646 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
647 735
648 $x -= $self->{x}; 736 $x -= $self->{x};
649 $y -= $self->{y}; 737 $y -= $self->{y};
650 738
651 my $res; 739 my $res;
652 740
653 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
655 and return $res; 743 and return $res;
656 } 744 }
657 745
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
708} 796}
709 797
710############################################################################# 798#############################################################################
711 799
800# back-buffered drawing area
801
712package CFClient::UI::Window; 802package CFClient::UI::Window;
713 803
714our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
715 805
716use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 825 $self->update;
736} 826}
737 827
738sub _render { 828sub _render {
829 my ($self) = @_;
830
739 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
740} 832}
741 833
742sub render_child { 834sub render_child {
743 my ($self) = @_; 835 my ($self) = @_;
744 836
745 $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 {
746 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
748 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
749 $self->_render; 848 $self->_render;
750 }; 849 };
751} 850}
752 851
753sub _draw { 852sub _draw {
754 my ($self) = @_; 853 my ($self) = @_;
755 854
756 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
757 856
758 my $tex = $self->{texture} 857 my $tex = $self->{texture}
759 or return; 858 or return;
760 859
761 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
764 863
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 865
767 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
768} 867}
… …
784} 883}
785 884
786sub size_request { 885sub size_request {
787 my ($self) = @_; 886 my ($self) = @_;
788 887
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 889
791 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
792} 894}
793 895
794sub size_allocate { 896sub size_allocate {
795 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
796 898
899 my $child = $self->child;
900
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 903
800 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
801 $self->update; 905 $self->update;
802} 906}
803 907
… …
839} 943}
840 944
841sub _render { 945sub _render {
842 my ($self) = @_; 946 my ($self) = @_;
843 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
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 952
846 $self->SUPER::_render; 953 $self->SUPER::_render;
847} 954}
848 955
… …
851package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
852 959
853our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
854 961
855sub new { 962sub new {
856 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
857 966
858 my $self; 967 my $self;
859 968
860 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
861 vertical => 1, 970 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 972 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
865 }, 974 },
866 ; 975 ;
867 976
868 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 979 slider => $slider,
871 @_, 980 %arg,
872 ); 981 );
873 982
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
877 985
878 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
879} 993}
880 994
881sub update { 995sub update {
882 my ($self) = @_; 996 my ($self) = @_;
883 997
… …
922 1036
923 if ($self->{bg}) { 1037 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
925 1039
926 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
928 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
929 1043
930 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
931 glVertex 0 , 0; 1045 glVertex 0 , 0;
932 glVertex 0 , $h; 1046 glVertex 0 , $h;
933 glVertex $w, $h; 1047 glVertex $w, $h;
… …
946 1060
947our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
948 1062
949use CFClient::OpenGL; 1063use CFClient::OpenGL;
950 1064
951my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1072
955sub new { 1073sub new {
956 my $class = shift; 1074 my ($class, %arg) = @_;
957 1075
958 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
959 1077
960 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1081 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1082 can_events => 1,
966 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
967 ); 1086 );
968 1087
969 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
970 align => 0, 1089 align => 0,
971 valign => 1, 1090 valign => 1,
972 text => $self->{title}, 1091 text => $title,
973 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
974 1094
975 $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};
976} 1103}
977 1104
978sub border { 1105sub border {
979 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
980} 1107}
981 1108
982sub size_request { 1109sub size_request {
983 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
984 1114
985 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
986 1116
987 ( 1117 (
988 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
991} 1121}
992 1122
993sub size_allocate { 1123sub size_allocate {
994 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
995 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
996 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
998 1136
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000 if $self->{title};
1001
1002 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1003} 1138}
1004 1139
1005sub button_down { 1140sub button_down {
1006 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1007 1142
… …
1023 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1024 1159
1025 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1027 1162
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size; 1167 $self->realloc;
1032 }; 1168 };
1033 1169
1034 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1174 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1040 1176
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1178
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1046 } 1187 1
1047} 1188}
1048 1189
1049sub button_up { 1190sub button_up {
1050 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1051 1192
1052 delete $self->{motion}; 1193 !!delete $self->{motion}
1053} 1194}
1054 1195
1055sub mouse_motion { 1196sub mouse_motion {
1056 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1057 1198
1058 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1059} 1202}
1060 1203
1061sub _draw { 1204sub _draw {
1062 my ($self) = @_; 1205 my ($self) = @_;
1063 1206
1207 my $child = $self->{children}[0];
1208
1064 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1066 1211
1067 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1214
1070 my $border = $self->border; 1215 my $border = $self->border;
1071 1216
1072 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1222
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1080 1225
1081 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1231 }
1092 1232
1093 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1094 1234
1095 $self->{title}->draw if $self->{title};
1096
1097 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1098} 1241}
1099 1242
1100############################################################################# 1243#############################################################################
1101 1244
1102package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1124 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1125 1268
1126 $child->set_parent ($self); 1269 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1128 1271
1129 $self->check_size (1); 1272 $self->realloc;
1130} 1273}
1131 1274
1132# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1276sub clear {
1134 my ($self) = @_; 1277 my ($self) = @_;
… …
1139 for (@children) { 1282 for (@children) {
1140 delete $_->{parent}; 1283 delete $_->{parent};
1141 $_->hide; 1284 $_->hide;
1142 } 1285 }
1143 1286
1144 $self->check_size (1); 1287 $self->realloc;
1145 $self->update;
1146} 1288}
1147 1289
1148sub get_wh { 1290sub get_wh {
1149 my ($self) = @_; 1291 my ($self) = @_;
1150 1292
… …
1246 } 1388 }
1247} 1389}
1248 1390
1249############################################################################# 1391#############################################################################
1250 1392
1251package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1252
1253# TODO: wrap into common Box base class
1254 1394
1255our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1256 1396
1257sub size_request { 1397sub size_request {
1258 my ($self) = @_; 1398 my ($self) = @_;
1259 1399
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1261 1401 ? (
1262 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1263 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264 (List::Util::max map $_->[1], @alloc), 1404 )
1265 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1266} 1409}
1267 1410
1268sub size_allocate { 1411sub size_allocate {
1269 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1270 1413
1271 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1272
1273 my $children = $self->{children}; 1415 my $children = $self->{children};
1274 1416
1275 my @h = map $_->{req_w}, @$children; 1417 my @req;
1276 1418
1277 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1278 1420 @req = ($space / (@$children || 1)) x @$children;
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } 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 {
1283 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284 $exp ||= 1;
1285 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1286 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 } 1435 }
1293 } 1436 }
1294 1437
1295 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1296 1439
1297 my $y = 0; 1440 my $pos = 0;
1298 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1301 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302 1444
1303 $y += $h; 1445 $pos += $alloc;
1304 } 1446 }
1305 1447
1306 1 1448 1
1307} 1449}
1308 1450
1309############################################################################# 1451#############################################################################
1310 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
1311package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1312 1469
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1316 1471
1317sub size_request { 1472sub new {
1318 my ($self) = @_; 1473 my $class = shift;
1319 1474
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1321 1476 vertical => 1,
1322 ( 1477 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1478 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1479}
1366 1480
1367############################################################################# 1481#############################################################################
1368 1482
1369package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1500 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1388 fontsize => 1, 1502 fontsize => 1,
1389 align => -1, 1503 align => -1,
1390 valign => -1, 1504 valign => -1,
1391 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1392 can_events => 0, 1507 can_events => 0,
1393 %arg 1508 %arg
1394 ); 1509 );
1395 1510
1396 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1423 1538
1424 delete $self->{texture}; 1539 delete $self->{texture};
1425 $self->SUPER::update; 1540 $self->SUPER::update;
1426} 1541}
1427 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1428sub set_text { 1551sub set_text {
1429 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1430 1553
1431 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1432 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1433 1556
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1436 1559
1560 $self->realloc;
1437 $self->update; 1561 $self->update;
1438 $self->check_size;
1439} 1562}
1440 1563
1441sub set_markup { 1564sub set_markup {
1442 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1443 1566
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1571
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1451 1574
1575 $self->realloc;
1452 $self->update; 1576 $self->update;
1453 $self->check_size;
1454} 1577}
1455 1578
1456sub size_request { 1579sub size_request {
1457 my ($self) = @_; 1580 my ($self) = @_;
1458 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1459 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1460 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1464 1590
1465 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1466 1592
1467 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1468 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1469 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1470 1596
1471 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1472 1598
1473 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1475 } 1601 }
1476 1602
1603 ($w, $h)
1477 ( 1604 }
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1605}
1482 1606
1483sub size_allocate { 1607sub size_allocate {
1484 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1485 1609
1610 delete $self->{ox};
1611
1486 delete $self->{texture}; 1612 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487} 1614}
1488 1615
1489sub set_fontsize { 1616sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1491 1618
1492 $self->{fontsize} = $fontsize; 1619 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1620 delete $self->{texture};
1494 1621
1495 $self->update; 1622 $self->realloc;
1496 $self->check_size;
1497} 1623}
1498 1624
1499sub _draw { 1625sub _draw {
1500 my ($self) = @_; 1626 my ($self) = @_;
1501 1627
… …
1507 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1637
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1513 1640
1641 unless (exists $self->{ox}) {
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1517 1645
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1523 }; 1649 };
1524 1650
1525 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1527 1653
1654 glColor_premultiply @{$self->{fg}}
1528 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1529 glColor @{$self->{fg}}; 1656
1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1531 } else {
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1533 }
1534 1658
1535 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1536} 1660}
1537 1661
1538############################################################################# 1662#############################################################################
… …
1565 1689
1566 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1567 1691
1568 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1569 1693
1570 delete $self->{texture};
1571
1572 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1573 $self->{text} = $text; 1695 $self->{text} = $text;
1574 1696
1575 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1576 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1577 1699
1578 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1579} 1702}
1580 1703
1581sub set_text { 1704sub set_text {
1582 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1583 1706
1584 $self->{cursor} = length $text; 1707 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1708 $self->_set_text ($text);
1586 $self->update; 1709
1587 $self->check_size; 1710 $self->realloc;
1588} 1711}
1589 1712
1590sub get_text { 1713sub get_text {
1591 $_[0]{text} 1714 $_[0]{text}
1592} 1715}
… …
1622 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1623 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1624 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1625 } elsif ($uni) { 1748 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1627 } 1752 }
1628 1753
1629 $self->_set_text ($text); 1754 $self->_set_text ($text);
1630 $self->update; 1755
1631 $self->check_size; 1756 $self->realloc;
1757
1758 1
1632} 1759}
1633 1760
1634sub focus_in { 1761sub focus_in {
1635 my ($self) = @_; 1762 my ($self) = @_;
1636 1763
… …
1651 utf8::encode $text; 1778 utf8::encode $text;
1652 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1653 1780
1654 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1655 $self->update; 1782 $self->update;
1783
1784 1
1656} 1785}
1657 1786
1658sub mouse_motion { 1787sub mouse_motion {
1659 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1660# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1661} 1792}
1662 1793
1663sub _draw { 1794sub _draw {
1664 my ($self) = @_; 1795 my ($self) = @_;
1665 1796
1666 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1667 1798
1668 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1669 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1670 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1671 } else { 1802 } else {
1672 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1673 } 1804 }
1674 1805
1675 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1677 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1678 glVertex 0 , 0; 1809 glVertex 0 , 0;
1679 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1680 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1681 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
… …
1742 } else { 1873 } else {
1743 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1744 } 1875 }
1745 1876
1746 } else { 1877 } else {
1747 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1748 } 1881 1
1749
1750} 1882}
1751 1883
1752############################################################################# 1884#############################################################################
1753 1885
1754package CFClient::UI::Button; 1886package CFClient::UI::Button;
… …
1763 1895
1764sub new { 1896sub new {
1765 my $class = shift; 1897 my $class = shift;
1766 1898
1767 $class->SUPER::new ( 1899 $class->SUPER::new (
1768 padding => 4, 1900 padding_x => 4,
1901 padding_y => 4,
1769 fg => [1, 1, 1], 1902 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1903 active_fg => [0, 0, 1],
1771 can_hover => 1, 1904 can_hover => 1,
1772 align => 0, 1905 align => 0,
1773 valign => 0, 1906 valign => 0,
… …
1782 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1783 1916
1784 $self->emit ("activate") 1917 $self->emit ("activate")
1785 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1786 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1787} 1922}
1788 1923
1789sub _draw { 1924sub _draw {
1790 my ($self) = @_; 1925 my ($self) = @_;
1791 1926
1792 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1793
1794 if ($GRAB == $self) {
1795 $self->{fg} = $self->{active_fg};
1796 }
1797 1928
1798 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1801 1932
… …
1820 1951
1821sub new { 1952sub new {
1822 my $class = shift; 1953 my $class = shift;
1823 1954
1824 $class->SUPER::new ( 1955 $class->SUPER::new (
1825 padding => 2, 1956 padding_x => 2,
1957 padding_y => 2,
1826 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 1959 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 1960 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 1961 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 1962 state => 0,
… …
1834} 1966}
1835 1967
1836sub size_request { 1968sub size_request {
1837 my ($self) = @_; 1969 my ($self) = @_;
1838 1970
1839 ($self->{padding} * 2 + 6) x 2 1971 (6) x 2
1840} 1972}
1841 1973
1842sub button_down { 1974sub button_down {
1843 my ($self, $ev, $x, $y) = @_; 1975 my ($self, $ev, $x, $y) = @_;
1844 1976
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1849 } 1985 1
1850} 1986}
1851 1987
1852sub _draw { 1988sub _draw {
1853 my ($self) = @_; 1989 my ($self) = @_;
1854 1990
1855 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1856 1992
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1993 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 1994
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1995 my ($w, $h) = @$self{qw(w h)};
1996
1997 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 1998
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1999 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 2000
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2001 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 2002
… …
2019 2157
2020 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2021 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2022 2160
2023 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2025 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2026 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2027 2166
2028 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2029 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
… …
2129 fg => [1, 1, 1], 2268 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2269 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2270 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2271 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2272 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2273 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2274 min_h => $::WIDTH / 80,
2136 vertical => 0, 2275 vertical => 0,
2137 can_hover => 1, 2276 can_hover => 1,
2138 inner_pad => 0.02, 2277 inner_pad => 0.02,
2139 @_ 2278 @_
2140 ); 2279 );
… …
2143 $self->update; 2282 $self->update;
2144 2283
2145 $self 2284 $self
2146} 2285}
2147 2286
2287sub changed { }
2288
2148sub set_range { 2289sub set_range {
2149 my ($self, $range) = @_; 2290 my ($self, $range) = @_;
2150 2291
2151 ($range, $self->{range}) = ($self->{range}, $range); 2292 ($range, $self->{range}) = ($self->{range}, $range);
2152 2293
… …
2178} 2319}
2179 2320
2180sub size_request { 2321sub size_request {
2181 my ($self) = @_; 2322 my ($self) = @_;
2182 2323
2183 my $w = $self->{req_w}; 2324 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2325}
2188 2326
2189sub button_down { 2327sub button_down {
2190 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2191 2329
2192 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2193 2331
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195 2333
2196 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2197} 2335}
2198 2336
2199sub mouse_motion { 2337sub mouse_motion {
2200 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2201 2339
… …
2205 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206 2344
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208 2346
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2210 } 2352 1
2211} 2353}
2212 2354
2213sub update { 2355sub update {
2214 my ($self) = @_; 2356 my ($self) = @_;
2215 2357
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2217 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2218 2367
2219 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2221 2370
… …
2227 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2228 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2229 2378
2230 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2231 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2232 }); 2381 }
2233
2234 $self->SUPER::update;
2235}
2236
2237sub _draw {
2238 my ($self) = @_;
2239 2382
2240 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2241 2384
2242 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2243 2386
… …
2437 2580
2438 delete $self->{texture}; 2581 delete $self->{texture};
2439 } 2582 }
2440 2583
2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2442 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2443 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2444 2587
2445 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2446 2589
2447 my $y0 = $top; 2590 my $y0 = $top;
… …
2482sub _draw { 2625sub _draw {
2483 my ($self) = @_; 2626 my ($self) = @_;
2484 2627
2485 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2489 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2490 2633
2491 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2492 2635
2493} 2636}
… …
2542 2685
2543sub new { 2686sub new {
2544 my $class = shift; 2687 my $class = shift;
2545 2688
2546 my $self = $class->SUPER::new ( 2689 my $self = $class->SUPER::new (
2547 state => 0, 2690 state => 0,
2548 connect_activate => \&toggle_flopper, 2691 on_activate => \&toggle_flopper,
2549 @_ 2692 @_
2550 ); 2693 );
2551 2694
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2695 $self
2558} 2696}
2559 2697
2560sub toggle_flopper { 2698sub toggle_flopper {
2561 my ($self) = @_; 2699 my ($self) = @_;
2562 2700
2563 # TODO: use animation 2701 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2702}
2575 2703
2576############################################################################# 2704#############################################################################
2577 2705
2578package CFClient::UI::Tooltip; 2706package CFClient::UI::Tooltip;
… …
2591} 2719}
2592 2720
2593sub set_tooltip_from { 2721sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2722 my ($self, $widget) = @_;
2595 2723
2724 my $tooltip = $widget->{tooltip};
2725
2726 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}";
2731 }
2732
2596 $self->add (new CFClient::UI::Label 2733 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2734 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2736 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2737 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2738 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2739 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2613 2750
2614sub size_allocate { 2751sub size_allocate {
2615 my ($self, $w, $h) = @_; 2752 my ($self, $w, $h) = @_;
2616 2753
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2754 $self->SUPER::size_allocate ($w - 4, $h - 4);
2755}
2756
2757sub visibility_change {
2758 my ($self, $visible) = @_;
2759
2760 return unless $visible;
2761
2762 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner}
2764 or return;
2765
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH;
2770
2771 $self->move_abs ($x, $y);
2772 });
2618} 2773}
2619 2774
2620sub _draw { 2775sub _draw {
2621 my ($self) = @_; 2776 my ($self) = @_;
2622 2777
… …
2639 glVertex $w, $h; 2794 glVertex $w, $h;
2640 glVertex $w, 0; 2795 glVertex $w, 0;
2641 glEnd; 2796 glEnd;
2642 2797
2643 glTranslate 2 - 0.375, 2 - 0.375; 2798 glTranslate 2 - 0.375, 2 - 0.375;
2799
2644 $self->SUPER::_draw; 2800 $self->SUPER::_draw;
2645} 2801}
2646 2802
2647############################################################################# 2803#############################################################################
2648 2804
… …
2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2708 2864
2709 if ($tex) { 2865 if ($tex) {
2710 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2712 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2714 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2715 } 2871 }
2716} 2872}
2717 2873
… …
2724 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2725} 2881}
2726 2882
2727############################################################################# 2883#############################################################################
2728 2884
2729package CFClient::UI::Inventory; 2885package CFClient::UI::Buttonbar;
2730 2886
2731our @ISA = CFClient::UI::ScrolledWindow::; 2887our @ISA = CFClient::UI::HBox::;
2732 2888
2733sub new { 2889# TODO: should actualyl wrap buttons and other goodies.
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773 2890
2774############################################################################# 2891#############################################################################
2775 2892
2776package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2777 2894
… …
2818 # maybe save $GRAB? must be careful about events... 2935 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 2936 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 2937 $self->{button} = $ev->{button};
2821 2938
2822 $self->show; 2939 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 2941}
2825 2942
2826sub mouse_motion { 2943sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2828 2945
2829 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2832} 2951}
2833 2952
2834sub button_up { 2953sub button_up {
2835 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2836 2955
… …
2838 undef $GRAB; 2957 undef $GRAB;
2839 $self->hide; 2958 $self->hide;
2840 2959
2841 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2843 } 2966 1
2844} 2967}
2845 2968
2846############################################################################# 2969#############################################################################
2847 2970
2848package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2849 2972
2850our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2851 2974
2852sub new { 2975sub new {
2853 my $class = shift; 2976 my $class = shift;
2854 2977
2855 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2856 fontsize => 0.8, 3087 fontsize => 0.8,
2857 @_, 3088 @_,
2858 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2859} 3096}
2860 3097
2861sub reorder { 3098sub reorder {
2862 my ($self) = @_; 3099 my ($self) = @_;
2863 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2864 3106
2865 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 } 3109 }
2868 3110
… …
2871 my @items = sort { 3113 my @items = sort {
2872 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2875 3117
3118 $self->{timer}->interval (1);
3119
2876 my $count = 10 + 1; 3120 my $count = 10 + 1;
2877 for my $item (@items) { 3121 for my $item (@items) {
2878 last unless --$count; 3122 last unless --$count;
2879 3123
2880 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text}; 3128 : $item->{text};
2885 3129
… …
2893 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2899 can_events => 1, 3143 can_events => 1,
2900 can_hover => 1 3144 can_hover => 1
2901 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2902 } 3158 }
2903 3159
2904 $self->clear; 3160 $self->clear;
2905 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2906} 3162}
… …
2911 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2913 3169
2914 return unless $text; 3170 return unless $text;
2915 3171
2916 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2917 3173
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919 3175
2920 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
2951 3207
2952 $self->reorder; 3208 $self->reorder;
2953 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
2954} 3210}
2955 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
2956############################################################################# 3220#############################################################################
2957 3221
2958package CFClient::UI::Root; 3222package CFClient::UI::Inventory;
2959 3223
2960our @ISA = CFClient::UI::Container::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962use CFClient::OpenGL;
2963 3225
2964sub new { 3226sub new {
2965 my $class = shift; 3227 my $class = shift;
2966 3228
2967 $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
2968 @_, 3471 @_,
2969 ) 3472 )
2970} 3473}
2971 3474
2972sub configure { 3475# XXX: Do sorting? Argl...
2973 my ($self, $x, $y, $w, $h) = @_; 3476sub add_spell {
2974
2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2978
2979sub check_size {
2980 my ($self) = @_; 3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
2981 3479
2982 $self->size_allocate ($self->{w}, $self->{h}) 3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2983 if $self->{w}; 3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root;
3518
3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3522
3523use CFClient::OpenGL;
3524
3525sub new {
3526 my $class = shift;
3527
3528 my $self = $class->SUPER::new (
3529 visible => 1,
3530 @_,
3531 );
3532
3533 Scalar::Util::weaken ($self->{root} = $self);
3534
3535 $self
2984} 3536}
2985 3537
2986sub size_request { 3538sub size_request {
2987 my ($self) = @_; 3539 my ($self) = @_;
2988 3540
2989 ($self->{w}, $self->{h}) 3541 ($self->{w}, $self->{h})
3542}
3543
3544sub _to_pixel {
3545 my ($coord, $size, $max) = @_;
3546
3547 $coord =
3548 $coord eq "center" ? ($max - $size) * 0.5
3549 : $coord eq "max" ? $max
3550 : $coord;
3551
3552 $coord = 0 if $coord < 0;
3553 $coord = $max - $size if $coord > $max - $size;
3554
3555 int $coord + 0.5
2990} 3556}
2991 3557
2992sub size_allocate { 3558sub size_allocate {
2993 my ($self, $w, $h) = @_; 3559 my ($self, $w, $h) = @_;
2994 3560
2995 for my $child ($self->children) { 3561 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3563
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3564 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3565 $Y = $child->{force_y} if exists $child->{force_y};
3000 3566
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3567 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3568 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3569
3007 $child->configure ($X, $Y, $W, $H); 3570 $child->configure ($X, $Y, $W, $H);
3008 } 3571 }
3009} 3572}
3010 3573
… …
3021} 3584}
3022 3585
3023sub update { 3586sub update {
3024 my ($self) = @_; 3587 my ($self) = @_;
3025 3588
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3589 $::WANT_REFRESH++;
3028} 3590}
3029 3591
3030sub add { 3592sub add {
3031 my ($self, @children) = @_; 3593 my ($self, @children) = @_;
3032 3594
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3595 $_->{is_toplevel} = 1
3041 3596 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3597
3047 $self->SUPER::add (@children); 3598 $self->SUPER::add (@children);
3048} 3599}
3049 3600
3050sub remove { 3601sub remove {
3051 my ($self, @children) = @_; 3602 my ($self, @children) = @_;
3052 3603
3053 $self->SUPER::remove (@children); 3604 $self->SUPER::remove (@children);
3605
3606 delete $self->{is_toplevel}
3607 for @children;
3054 3608
3055 while (@children) { 3609 while (@children) {
3056 my $w = pop @children; 3610 my $w = pop @children;
3057 push @children, $w->children; 3611 push @children, $w->children;
3058 $w->set_invisible; 3612 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3631 while ($self->{refresh_hook}) {
3078 $_->() 3632 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
3080 } 3634 }
3081 3635
3082 if ($self->{check_size}) { 3636 if ($self->{realloc}) {
3083 my @queue = ([], []); 3637 my %queue;
3638 my @queue;
3639 my $widget;
3084 3640
3085 for (;;) { 3641 outer:
3086 if ($self->{check_size}) { 3642 while () {
3087 # heuristic: check containers last 3643 if (my $realloc = delete $self->{realloc}) {
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3644 for $widget (values %$realloc) {
3089 for values %{delete $self->{check_size}} 3645 $widget->{visible} or next; # do not resize invisible widgets
3646
3647 $queue{$widget+0}++ and next; # duplicates are common
3648
3649 push @{ $queue[$widget->{visible}] }, $widget;
3650 }
3090 } 3651 }
3091 3652
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3653 while () {
3654 @queue or last outer;
3093 3655
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3656 $widget = pop @{ $queue[-1] || [] }
3095 ? @$widget{qw(user_w user_h)} 3657 and last;
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101 3658
3659 pop @queue;
3660 }
3661
3662 delete $queue{$widget+0};
3663
3664 my ($w, $h) = $widget->size_request;
3665
3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3671
3672 $w = $widget->{force_w} if exists $widget->{force_w};
3673 $h = $widget->{force_h} if exists $widget->{force_h};
3674
3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3676 || delete $widget->{force_realloc}) {
3102 $widget->{req_w} = $w; 3677 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3104 3679
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3680 $self->{size_alloc}{$widget+0} = $widget;
3106 3681
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3682 if (my $parent = $widget->{parent}) {
3683 $self->{realloc}{$parent+0} = $parent
3684 unless $queue{$parent+0};
3685
3686 $parent->{force_size_alloc} = 1;
3687 $self->{size_alloc}{$parent+0} = $parent;
3688 }
3109 } 3689 }
3690
3691 delete $self->{realloc}{$widget+0};
3110 } 3692 }
3111 } 3693 }
3112 3694
3113 while ($self->{size_alloc}) { 3695 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3696 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3697 values %$size_alloc;
3698
3699 while () {
3700 my $widget = pop @queue || last;
3701
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3703
3117 $w = 0 if $w < 0; 3704 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3705 $h = 0 if $h < 0;
3119 3706
3707 $w = int $w + 0.5;
3708 $h = int $h + 0.5;
3709
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w};
3712 $widget->{old_h} = $widget->{h};
3713
3120 $widget->{w} = $w; 3714 $widget->{w} = $w;
3121 $widget->{h} = $h; 3715 $widget->{h} = $h;
3716
3122 $widget->emit (size_allocate => $w, $h); 3717 $widget->emit (size_allocate => $w, $h);
3718 }
3123 } 3719 }
3124 } 3720 }
3125 3721
3126 while ($self->{post_alloc_hook}) { 3722 while ($self->{post_alloc_hook}) {
3127 $_->() 3723 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3724 for values %{delete $self->{post_alloc_hook}};
3129 } 3725 }
3726
3130 3727
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3728 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3730 glClear GL_COLOR_BUFFER_BIT;
3134 3731
… …
3136 glLoadIdentity; 3733 glLoadIdentity;
3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3139 glLoadIdentity; 3736 glLoadIdentity;
3140 3737
3738 {
3739 package CFClient::UI::Base;
3740
3741 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h});
3743 }
3744
3141 $self->_draw; 3745 $self->_draw;
3142} 3746}
3143 3747
3144############################################################################# 3748#############################################################################
3145 3749

Diff Legend

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