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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
26 55
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 62 }
32 63
33 $layout 64 $layout
34} 65}
35 66
36sub set_layout { 67sub set_layout {
37 my ($layout) = @_; 68 my ($layout) = @_;
69
38 $LAYOUT = $layout; 70 $LAYOUT = $layout;
39}
40
41sub check_tooltip {
42 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
49 $TOOLTIP->{owner} = $widget;
50
51 my $tip = $widget->{tooltip};
52
53 $tip = $tip->($widget) if CODE:: eq ref $tip;
54
55 $TOOLTIP->set_tooltip_from ($widget);
56 $TOOLTIP->show;
57 }
58
59 return;
60 }
61 }
62 }
63
64 $TOOLTIP->hide;
65 delete $TOOLTIP->{owner};
66} 71}
67 72
68# class methods for events 73# class methods for events
69sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
70 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
84 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
85 90
86 $GRAB = $widget; 91 $GRAB = $widget;
87 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
88 93
89 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
90 } 95 }
91 96
92 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
93 98
94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
109 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
110 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
111 $grab->update if $grab; 116 $grab->update if $grab;
112 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
113 118
114 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
115 } 120 }
116} 121}
117 122
118sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
119 my ($ev) = @_; 124 my ($ev) = @_;
… …
125 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
126 131
127 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
128 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
129 134
130 check_tooltip; 135 $TOOLTIP_WATCHER->start;
131 } 136 }
132 137
133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER; 139 if $HOVER;
135} 140}
… …
167sub rescale_widgets { 172sub rescale_widgets {
168 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
169 174
170 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174 179
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181 186
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184 189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
… …
207 h => undef, 212 h => undef,
208 can_events => 1, 213 can_events => 1,
209 @_ 214 @_
210 }, $class; 215 }, $class;
211 216
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 218
224 for (keys %$self) { 219 for (keys %$self) {
225 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
227 } 222 }
228 } 223 }
229 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
230 $self 237 $self
231} 238}
232 239
233sub destroy { 240sub destroy {
234 my ($self) = @_; 241 my ($self) = @_;
… …
265 272
266 return unless $self->{visible}; 273 return unless $self->{visible};
267 274
268 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
269 276
277 delete $self->{visible};
270 delete $self->{root}; 278 delete $self->{root};
271 delete $self->{visible};
272 279
273 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
275 282
276 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
277 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
278 285
279 $self->focus_out; 286 $self->emit ("focus_out");
280
281 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
282} 288}
283 289
284sub set_visibility { 290sub set_visibility {
285 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
308} 314}
309 315
310sub move_abs { 316sub move_abs {
311 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
312 318
313 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
314 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
315 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
316 322
317 $self->update; 323 $self->update;
318} 324}
319 325
… …
327} 333}
328 334
329sub size_request { 335sub size_request {
330 require Carp; 336 require Carp;
331 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
332} 342}
333 343
334sub configure { 344sub configure {
335 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
336 346
… …
350 $self->{x} = $x; 360 $self->{x} = $x;
351 $self->{y} = $y; 361 $self->{y} = $y;
352 $self->update; 362 $self->update;
353 } 363 }
354 364
355 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 366 return unless $self->{visible};
357 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
359 } 372 }
360}
361
362sub size_allocate {
363 # nothing to be done
364} 373}
365 374
366sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
367} 381}
368 382
369sub set_max_size { 383sub set_max_size {
370 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
371 385
372 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
374} 390}
375 391
376sub set_tooltip { 392sub set_tooltip {
377 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
378 394
… …
383 399
384 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
385 401
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
389 } 405 }
390} 406}
391 407
392# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
393sub coord2local { 409sub coord2local {
… …
401 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
402 418
403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404} 420}
405 421
406sub focus_in { 422sub invoke_focus_in {
407 my ($self) = @_; 423 my ($self) = @_;
408 424
409 return if $FOCUS == $self; 425 return if $FOCUS == $self;
410 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
411 427
412 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
413 429
414 $self->_emit (focus_in => $focus);
415
416 $focus->update if $focus; 430 $focus->update if $focus;
417 $FOCUS->update; 431 $FOCUS->update;
418}
419 432
433 0
434}
435
420sub focus_out { 436sub invoke_focus_out {
421 my ($self) = @_; 437 my ($self) = @_;
422 438
423 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
424 440
425 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
426 442
427 $self->_emit (focus_out => $focus);
428
429 $focus->update if $focus; #? 443 $focus->update if $focus; #?
430 444
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 446 unless $FOCUS;
433}
434 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
435sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
436sub button_up { } 458sub invoke_button_up { 1 }
437sub key_down { } 459sub invoke_key_down { 1 }
438sub key_up { } 460sub invoke_key_up { 1 }
439 461
440sub button_down { 462sub invoke_button_down {
441 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
442 464
443 $self->focus_in; 465 $self->grab_focus;
444}
445 466
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
451 484
452sub find_widget { 485sub find_widget {
453 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
454 487
455 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
463 496
464sub set_parent { 497sub set_parent {
465 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
466 499
467 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
470} 502}
471 503
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc { 504sub realloc {
496 my ($self) = @_; 505 my ($self) = @_;
497 506
498 if ($self->{visible}) { 507 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
500 509
501 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 511 $self->{root}->update;
503 } else { 512 } else {
504 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
505 } 515 }
506} 516}
507 517
508sub update { 518sub update {
509 my ($self) = @_; 519 my ($self) = @_;
… …
517 527
518 $self->realloc; 528 $self->realloc;
519 $self->update; 529 $self->update;
520} 530}
521 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
522sub draw { 536sub draw {
523 my ($self) = @_; 537 my ($self) = @_;
524 538
525 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 548
527 glPushMatrix; 549 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 551
532 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 554 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 556 glBegin GL_QUADS;
539 glVertex $x , $y; 557 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
543 glEnd; 561 glEnd;
544 glDisable GL_BLEND; 562 glDisable GL_BLEND;
545 } 563 }
546 564
547 if ($ENV{CFPLUS_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 566 glPushMatrix;
549 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 570 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
556 glEnd; 574 glEnd;
557 glPopMatrix; 575 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
560} 581}
561 582
562sub _draw { 583sub _draw {
563 my ($self) = @_; 584 my ($self) = @_;
564 585
… …
567 588
568sub DESTROY { 589sub DESTROY {
569 my ($self) = @_; 590 my ($self) = @_;
570 591
571 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
572 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 596}
574 597
575############################################################################# 598#############################################################################
576 599
577package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
602 625
603 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
605 628
606 glEnable GL_BLEND; 629 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 631 glColor_premultiply @$color;
609 632
610 glBegin GL_QUADS; 633 glBegin GL_QUADS;
611 glVertex 0 , 0; 634 glVertex 0 , 0;
612 glVertex 0 , $h; 635 glVertex 0 , $h;
613 glVertex $w, $h; 636 glVertex $w, $h;
… …
644our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
645 668
646sub new { 669sub new {
647 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
648 671
649 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
650 673
651 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
652 children => [], 675 children => [],
653 can_events => 0, 676 can_events => 0,
654 %arg, 677 %arg,
655 ); 678 );
679
656 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
657 682
658 $self 683 $self
659} 684}
660 685
661sub add { 686sub add {
… …
709 $x -= $self->{x}; 734 $x -= $self->{x};
710 $y -= $self->{y}; 735 $y -= $self->{y};
711 736
712 my $res; 737 my $res;
713 738
714 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
716 and return $res; 741 and return $res;
717 } 742 }
718 743
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
740} 765}
741 766
742sub add { 767sub add {
743 my ($self, $child) = @_; 768 my ($self, $child) = @_;
744 769
745 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
748} 772}
749 773
750sub remove { 774sub remove {
751 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
760 784
761sub size_request { 785sub size_request {
762 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
763} 787}
764 788
765sub size_allocate { 789sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 790 my ($self, $w, $h) = @_;
767 791
768 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
769} 795}
770 796
771############################################################################# 797#############################################################################
798
799# back-buffered drawing area
772 800
773package CFClient::UI::Window; 801package CFClient::UI::Window;
774 802
775our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
776 804
… …
787 815
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 817 $self->SUPER::update;
790} 818}
791 819
792sub size_allocate { 820sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
794 822
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 823 $self->update;
797 if $changed; 824
825 $self->SUPER::invoke_size_allocate ($w, $h)
798} 826}
799 827
800sub _render { 828sub _render {
829 my ($self) = @_;
830
801 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
802} 832}
803 833
804sub render_child { 834sub render_child {
805 my ($self) = @_; 835 my ($self) = @_;
806 836
807 $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 {
808 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
810 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
811 $self->_render; 848 $self->_render;
812 }; 849 };
813} 850}
814 851
815sub _draw { 852sub _draw {
816 my ($self) = @_; 853 my ($self) = @_;
817 854
818 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
819 856
820 my $tex = $self->{texture} 857 my $tex = $self->{texture}
821 or return; 858 or return;
822 859
823 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
826 863
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 865
829 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
830} 867}
… …
846} 883}
847 884
848sub size_request { 885sub size_request {
849 my ($self) = @_; 886 my ($self) = @_;
850 887
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 889
853 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
855 892
856 ($w, $h) 893 ($w, $h)
857} 894}
858 895
859sub size_allocate { 896sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
861 898
899 my $child = $self->child;
900
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 903
865 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
866 $self->update; 905 $self->update;
906
907 1
867} 908}
868 909
869sub set_offset { 910sub set_offset {
870 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
871 912
… …
904} 945}
905 946
906sub _render { 947sub _render {
907 my ($self) = @_; 948 my ($self) = @_;
908 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 954
911 $self->SUPER::_render; 955 $self->SUPER::_render;
912} 956}
913 957
… …
916package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
917 961
918our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
919 963
920sub new { 964sub new {
921 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
922 968
923 my $self; 969 my $self;
924 970
925 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
926 vertical => 1, 972 vertical => 1,
… …
931 ; 977 ;
932 978
933 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider, 981 slider => $slider,
936 @_, 982 %arg,
937 ); 983 );
938 984
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
942 987
943 $self 988 $self
944} 989}
945 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
946sub update { 1005sub update {
947 my ($self) = @_; 1006 my ($self) = @_;
948 1007
949 $self->SUPER::update; 1008 $self->SUPER::update;
950 1009
951 # todo: overwrite size_allocate of child 1010 $self->update_slider;
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1011}
955 1012
956sub size_allocate { 1013sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1014 my ($self, $w, $h) = @_;
958 1015
1016 $self->update_slider;
1017
959 $self->SUPER::size_allocate ($w, $h, $changed); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
960
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1019}
964
965#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll
967 1020
968############################################################################# 1021#############################################################################
969 1022
970package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
971 1024
… …
987 1040
988 if ($self->{bg}) { 1041 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
990 1043
991 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
994 1047
995 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
996 glVertex 0 , 0; 1049 glVertex 0 , 0;
997 glVertex 0 , $h; 1050 glVertex 0 , $h;
998 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1020my @border = 1073my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1076
1024sub new { 1077sub new {
1025 my $class = shift; 1078 my ($class, %arg) = @_;
1026 1079
1027 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1083 border => 0.6,
1031 is_toplevel => 1,
1032 can_events => 1, 1084 can_events => 1,
1033 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1034 ); 1088 );
1035 1089
1036 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1037 align => 0, 1091 align => 0,
1038 valign => 1, 1092 valign => 1,
1039 text => $self->{title}, 1093 text => $self->{title},
1040 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1041 1105
1042 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1043} 1115}
1044 1116
1045sub border { 1117sub border {
1046 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1047} 1119}
1048 1120
1049sub size_request { 1121sub size_request {
1050 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1051 1129
1052 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1053 1131
1054 ( 1132 (
1055 $w + $self->border * 2, 1133 $w + $self->border * 2,
1056 $h + $self->border * 2, 1134 $h + $self->border * 2,
1057 ) 1135 )
1058} 1136}
1059 1137
1060sub size_allocate { 1138sub invoke_size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1062 1140
1063 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1064 1146
1147 my $border = $self->border;
1148
1065 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1067 1151
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069 if $self->{title};
1070
1071 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1072}
1073 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1074sub button_down { 1160sub invoke_button_down {
1075 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1076 1162
1077 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1078 my $border = $self->border; 1164 my $border = $self->border;
1079 1165
… …
1095 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1096 1182
1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100 $self->realloc; 1187 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102 }; 1188 };
1103 1189
1104 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1105 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1109 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1110 1196
1111 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1112 1198
1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1114 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1115 } 1207 1
1116} 1208}
1117 1209
1118sub button_up { 1210sub invoke_button_up {
1119 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1120 1212
1121 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1122} 1214}
1123 1215
1124sub mouse_motion { 1216sub invoke_mouse_motion {
1125 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1126 1218
1127 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1128} 1222}
1129 1223
1130sub _draw { 1224sub _draw {
1131 my ($self) = @_; 1225 my ($self) = @_;
1132 1226
1227 my $child = $self->{children}[0];
1228
1133 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1135 1231
1136 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138 1234
1139 my $border = $self->border; 1235 my $border = $self->border;
… …
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1251 }
1156 1252
1157 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1158 1254
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1162} 1266}
1163 1267
1164############################################################################# 1268#############################################################################
1165 1269
1166package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1189 1293
1190 $child->set_parent ($self); 1294 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1192 1296
1193 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1194} 1304}
1195 1305
1196# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1307sub clear {
1198 my ($self) = @_; 1308 my ($self) = @_;
… …
1239 (sum @$ws), 1349 (sum @$ws),
1240 (sum @$hs), 1350 (sum @$hs),
1241 ) 1351 )
1242} 1352}
1243 1353
1244sub size_allocate { 1354sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1355 my ($self, $w, $h) = @_;
1246 1356
1247 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1248 1358
1249 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1360 my $req_h = (sum @$hs) || 1;
… …
1281 } 1391 }
1282 1392
1283 $y += $row_h; 1393 $y += $row_h;
1284 } 1394 }
1285 1395
1396 1
1286} 1397}
1287 1398
1288sub find_widget { 1399sub find_widget {
1289 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1290 1401
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1440 )
1330} 1441}
1331 1442
1332sub size_allocate { 1443sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1334 1445
1335 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1337 1448
1338 my @req; 1449 my @req;
1339 1450
1340 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1342 } else { 1453 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1345 1456
1346 if ($req > $space) { 1457 if ($req > $space) {
1347 # ah well, not enough space 1458 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1349 } else { 1460 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1462
1352 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1353 1464
1354 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1466 for 0 .. $#children;
1356 } 1467 }
1357 } 1468 }
1358 1469
1359 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1360 1471
1361 my $pos = 0; 1472 my $pos = 0;
1362 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1476
1366 $pos += $alloc; 1477 $pos += $alloc;
1367 } 1478 }
1368 1479
1369 1 1480 1
… …
1421 ellipsise => 3, # end 1532 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1423 fontsize => 1, 1534 fontsize => 1,
1424 align => -1, 1535 align => -1,
1425 valign => -1, 1536 valign => -1,
1426 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1427 can_events => 0, 1539 can_events => 0,
1428 %arg 1540 %arg
1429 ); 1541 );
1430 1542
1431 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1458 1570
1459 delete $self->{texture}; 1571 delete $self->{texture};
1460 $self->SUPER::update; 1572 $self->SUPER::update;
1461} 1573}
1462 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1463sub set_text { 1582sub set_text {
1464 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1465 1584
1466 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1468 1587
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1471 1590
1591 delete $self->{size_req};
1472 $self->realloc; 1592 $self->realloc;
1473 $self->update; 1593 $self->update;
1474} 1594}
1475 1595
1476sub set_markup { 1596sub set_markup {
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1603
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1486 1606
1607 delete $self->{size_req};
1487 $self->realloc; 1608 $self->realloc;
1488 $self->update; 1609 $self->update;
1489} 1610}
1490 1611
1491sub size_request { 1612sub size_request {
1492 my ($self) = @_; 1613 my ($self) = @_;
1493 1614
1615 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1621
1500 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1501 1623
1502 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1627
1506 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1507 1629
1508 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1510 } 1635 };
1511 1636
1512 ( 1637 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1638}
1517 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1518sub size_allocate { 1644sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1520 1648
1521 delete $self->{texture} 1649 delete $self->{texture}
1522 if $changed; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1523} 1653}
1524 1654
1525sub set_fontsize { 1655sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1527 1657
1528 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1529 delete $self->{texture}; 1659 delete $self->{texture};
1530 1660
1531 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1532} 1670}
1533 1671
1534sub _draw { 1672sub _draw {
1535 my ($self) = @_; 1673 my ($self) = @_;
1536 1674
… …
1542 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1684
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1548 1687
1688 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1552 1692
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1696 };
1559 1697
1560 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1562 1702
1563 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1710 }
1569 1711
1570 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1571} 1713}
1572 1714
… …
1589 can_hover => 1, 1731 can_hover => 1,
1590 can_focus => 1, 1732 can_focus => 1,
1591 valign => 0, 1733 valign => 0,
1592 can_events => 1, 1734 can_events => 1,
1593 #text => ... 1735 #text => ...
1736 #hidden => "*",
1594 @_ 1737 @_
1595 ) 1738 )
1596} 1739}
1597 1740
1598sub _set_text { 1741sub _set_text {
… …
1600 1743
1601 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1602 1745
1603 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1604 1747
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1749 $self->{text} = $text;
1609 1750
1610 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1612 1754
1613 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1614} 1759}
1615 1760
1616sub set_text { 1761sub set_text {
1617 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1618 1763
1619 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1765 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1766}
1624 1767
1625sub get_text { 1768sub get_text {
1626 $_[0]{text} 1769 $_[0]{text}
1627} 1770}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1633 1776
1634 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1635} 1778}
1636 1779
1637sub key_down { 1780sub invoke_key_down {
1638 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1639 1782
1640 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1802 $self->emit ('escape');
1660 } elsif ($uni) { 1803 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1662 } 1807 }
1663 1808
1664 $self->_set_text ($text); 1809 $self->_set_text ($text);
1665 1810
1666 $self->realloc; 1811 $self->realloc;
1667}
1668 1812
1813 1
1814}
1815
1669sub focus_in { 1816sub invoke_focus_in {
1670 my ($self) = @_; 1817 my ($self) = @_;
1671 1818
1672 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1673 1820
1674 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1675} 1822}
1676 1823
1677sub button_down { 1824sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1679 1826
1680 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1828
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1830
1684 # byte-index to char-index 1831 # byte-index to char-index
1685 my $text = $self->{text}; 1832 my $text = $self->{text};
1686 utf8::encode $text; 1833 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1688 1835
1689 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1690 $self->update; 1837 $self->update;
1838
1839 1
1691} 1840}
1692 1841
1693sub mouse_motion { 1842sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1696} 1847}
1697 1848
1698sub _draw { 1849sub _draw {
1699 my ($self) = @_; 1850 my ($self) = @_;
1700 1851
1701 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1702 1853
1703 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1706 } else { 1857 } else {
1707 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1708 } 1859 }
1709 1860
1710 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1864 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1741 1892
1742our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1743 1894
1744use CFClient::OpenGL; 1895use CFClient::OpenGL;
1745 1896
1746sub key_down { 1897sub invoke_key_down {
1747 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1748 1899
1749 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1750 1901
1751 if ($sym == 13) { 1902 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1754 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1757 $self->update; 1909 $self->update;
1758 1910
1759 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1929 } else {
1778 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1779 } 1931 }
1780 1932
1781 } else { 1933 } else {
1782 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1783 } 1937 1
1784
1785} 1938}
1786 1939
1787############################################################################# 1940#############################################################################
1788 1941
1789package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1798 1951
1799sub new { 1952sub new {
1800 my $class = shift; 1953 my $class = shift;
1801 1954
1802 $class->SUPER::new ( 1955 $class->SUPER::new (
1803 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1804 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1806 can_hover => 1, 1960 can_hover => 1,
1807 align => 0, 1961 align => 0,
1808 valign => 0, 1962 valign => 0,
1809 can_events => 1, 1963 can_events => 1,
1810 @_ 1964 @_
1811 ) 1965 )
1812} 1966}
1813 1967
1814sub activate { }
1815
1816sub button_up { 1968sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1818 1970
1819 $self->emit ("activate") 1971 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1822} 1976}
1823 1977
1824sub _draw { 1978sub _draw {
1825 my ($self) = @_; 1979 my ($self) = @_;
1826 1980
1827 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1982
1833 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1836 1986
… …
1841 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1842} 1992}
1843 1993
1844############################################################################# 1994#############################################################################
1845 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1846package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1847 2033
1848our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1849 2035
1850my @tex = 2036my @tex =
… …
1855 2041
1856sub new { 2042sub new {
1857 my $class = shift; 2043 my $class = shift;
1858 2044
1859 $class->SUPER::new ( 2045 $class->SUPER::new (
1860 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1861 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2052 state => 0,
… …
1869} 2056}
1870 2057
1871sub size_request { 2058sub size_request {
1872 my ($self) = @_; 2059 my ($self) = @_;
1873 2060
1874 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1875} 2062}
1876 2063
1877sub button_down { 2064sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1879 2066
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1884 } 2075 1
1885} 2076}
1886 2077
1887sub _draw { 2078sub _draw {
1888 my ($self) = @_; 2079 my ($self) = @_;
1889 2080
1890 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1891 2082
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2084
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2088
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2090
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2092
… …
1907package CFClient::UI::Image; 2100package CFClient::UI::Image;
1908 2101
1909our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1910 2103
1911use CFClient::OpenGL; 2104use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2105
1914our %loaded_images; 2106our %texture_cache;
1915 2107
1916sub new { 2108sub new {
1917 my $class = shift; 2109 my $class = shift;
1918 2110
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1920 2115
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1922 2118
1923 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1925 2121
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2123
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2125
1932 $self 2126 $self
1933} 2127}
1934 2128
1935sub size_request { 2129sub size_request {
1936 my ($self) = @_; 2130 my ($self) = @_;
1937 2131
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1939} 2133}
1940 2134
1941sub _draw { 2135sub _draw {
1942 my ($self) = @_; 2136 my ($self) = @_;
1943 2137
… …
2054 2248
2055 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2057 2251
2058 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2257
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2363 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2171 vertical => 0, 2366 vertical => 0,
2172 can_hover => 1, 2367 can_hover => 1,
2173 inner_pad => 0.02, 2368 inner_pad => 0.02,
2174 @_ 2369 @_
2175 ); 2370 );
… …
2178 $self->update; 2373 $self->update;
2179 2374
2180 $self 2375 $self
2181} 2376}
2182 2377
2183sub changed { }
2184
2185sub set_range { 2378sub set_range {
2186 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2187 2380
2188 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2189 2382
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2192} 2387}
2193 2388
2194sub set_value { 2389sub set_value {
2195 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2196 2391
… …
2207 if $unit; 2402 if $unit;
2208 2403
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2405
2211 if ($value != $old_value) { 2406 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2213 $self->update; 2408 $self->update;
2214 } 2409 }
2215} 2410}
2216 2411
2217sub size_request { 2412sub size_request {
2218 my ($self) = @_; 2413 my ($self) = @_;
2219 2414
2220 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2416}
2225 2417
2226sub button_down { 2418sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2228 2420
2229 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2422
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2424
2233 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2426}
2235 2427
2236sub mouse_motion { 2428sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2238 2430
2239 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2433
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2435
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2437
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2247 } 2443 1
2248} 2444}
2249 2445
2250sub update { 2446sub update {
2251 my ($self) = @_; 2447 my ($self) = @_;
2252 2448
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2255 2458
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2258 2461
… …
2264 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2266 2469
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2269 }); 2472 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2473
2277 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2278 2475
2279 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2280 2477
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2343 2540
2344############################################################################# 2541#############################################################################
2345 2542
2346package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2347 2544
2348our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2349 2546
2350use CFClient::OpenGL; 2547use CFClient::OpenGL;
2351 2548
… …
2353 my $class = shift; 2550 my $class = shift;
2354 2551
2355 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2356 fontsize => 1, 2553 fontsize => 1,
2357 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2358 #font => default_font 2556 #font => default_font
2359 @_, 2557 @_,
2360 2558
2361 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2362 par => [], 2560 par => [],
… …
2377 2575
2378 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2577 $self->reflow;
2380} 2578}
2381 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2382sub size_allocate { 2589sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2590 my ($self, $w, $h) = @_;
2384 2591
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2594
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2599
2393 $self->reflow; 2600 $self->reflow;
2394}
2395 2601
2396sub text_size { 2602 local $self->{children} = [$empty, $slider];
2397 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2398 2608
2399 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2400 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2404 2622 );
2623
2405 $layout->size 2624 $layout
2406} 2625}
2407 2626
2408sub reflow { 2627sub reflow {
2409 my ($self) = @_; 2628 my ($self) = @_;
2410 2629
… …
2419 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2420} 2639}
2421 2640
2422sub clear { 2641sub clear {
2423 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2424 2646
2425 $self->{par} = []; 2647 $self->{par} = [];
2426 $self->{height} = 0; 2648 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2650}
2429 2651
2430sub add_paragraph { 2652sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2432 2654
2433 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2434 my ($w, $h) = $self->text_size ($line); 2656
2435 $self->{height} += $h; 2657 $para = {
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2437 } 2664 };
2438 2665
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2440} 2678}
2441 2679
2442sub update { 2680sub update {
2443 my ($self) = @_; 2681 my ($self) = @_;
2444 2682
… …
2446 2684
2447 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2448 2686
2449 delete $self->{texture}; 2687 delete $self->{texture};
2450 2688
2451 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2691
2454 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2693 my $height = 0;
2456 2694
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2699
2467 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2468 } 2703 }
2469 2704
2470 $height += $_->[1]; 2705 $height += $para->{h};
2471 } 2706 }
2472 2707
2473 $self->{height} = $height; 2708 $self->{height} = $height;
2474 2709
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2711
2477 delete $self->{texture}; 2712 delete $self->{texture};
2478 } 2713 }
2479 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2720 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2483 2722
2484 my $top = int $self->{children}[1]{range}[0]; 2723 my $top = int $self->{children}[1]{range}[0];
2485 2724
2486 my $y0 = $top; 2725 my $y0 = $top;
2487 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2488 2727
2489 my $y = 0; 2728 my $y = 0;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494 2729
2495 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498 2733
2499 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2735 my $h = $para->{h};
2501 2736
2502 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] }); 2738
2504 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2505 $layout->set_markup ($par->[4]);
2506 2740
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2508 2742
2509 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2511 } 2761 }
2512 2762
2513 $y += $h; 2763 $y += $h;
2514 } 2764 }
2515 2765
2516 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2517 }; 2767 };
2518 }); 2768 });
2519} 2769}
2520 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2521sub _draw { 2780sub _draw {
2522 my ($self) = @_; 2781 my ($self) = @_;
2523 2782
2524 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2529 2788
2530 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2531
2532} 2790}
2533 2791
2534############################################################################# 2792#############################################################################
2535 2793
2536package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2615} 2873}
2616 2874
2617sub set_tooltip_from { 2875sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2876 my ($self, $widget) = @_;
2619 2877
2878 my $tooltip = $widget->{tooltip};
2879
2880 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2883 . "req $widget->{req_w} $widget->{req_h}\n"
2884 . "visible $widget->{visible}";
2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2889
2620 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2891 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2893 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2894 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2895 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2896 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2904
2635 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2636} 2906}
2637 2907
2638sub size_allocate { 2908sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2909 my ($self, $w, $h) = @_;
2640 2910
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2644} 2912}
2645 2913
2646sub visibility_change { 2914sub invoke_visibility_change {
2647 my ($self, $visible) = @_; 2915 my ($self, $visible) = @_;
2648 2916
2649 return unless $visible; 2917 return unless $visible;
2650 2918
2651 $self->{root}->on_post_alloc ("move_$self" => sub { 2919 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2653 or return; 2921 or return;
2654 2922
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656 2924
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH; 2926 if $x + $self->{w} > $self->{root}{w};
2659 2927
2660 $self->move_abs ($x, $y); 2928 $self->move_abs ($x, $y);
2661 }); 2929 });
2662} 2930}
2663 2931
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 3021
2754 if ($tex) { 3022 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 3023 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 3025 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2760 } 3028 }
2761} 3029}
2762 3030
2763sub DESTROY { 3031sub destroy {
2764 my ($self) = @_; 3032 my ($self) = @_;
2765 3033
2766 $self->{timer}->cancel 3034 $self->{timer}->cancel
2767 if $self->{timer}; 3035 if $self->{timer};
2768 3036
2769 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2770} 3038}
2771 3039
2772############################################################################# 3040#############################################################################
2773 3041
2774package CFClient::UI::Inventory; 3042package CFClient::UI::Buttonbar;
2775 3043
2776our @ISA = CFClient::UI::ScrolledWindow::; 3044our @ISA = CFClient::UI::HBox::;
2777 3045
2778sub new { 3046# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813 3047
2814############################################################################# 3048#############################################################################
2815 3049
2816package CFClient::UI::Menu; 3050package CFClient::UI::Menu;
2817 3051
… …
2829 ); 3063 );
2830 3064
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3066
2833 for my $item (@{ $self->{items} }) { 3067 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3068 my ($widget, $cb, $tooltip) = @$item;
2835 3069
2836 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2837 if (!ref $widget) { 3071 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3073 can_hover => 1,
2840 can_events => 1, 3074 can_events => 1,
2841 text => $widget; 3075 markup => $widget,
3076 tooltip => $tooltip
2842 } 3077 }
2843 3078
2844 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2845 3080
2846 $self->{vbox}->add ($widget); 3081 $self->{vbox}->add ($widget);
… …
2851 3086
2852# popup given the event (must be a mouse button down event currently) 3087# popup given the event (must be a mouse button down event currently)
2853sub popup { 3088sub popup {
2854 my ($self, $ev) = @_; 3089 my ($self, $ev) = @_;
2855 3090
2856 $self->_emit ("popdown"); 3091 $self->emit ("popdown");
2857 3092
2858 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3094 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2861 3096
2862 $self->show; 3097 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3099}
2865 3100
2866sub mouse_motion { 3101sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2868 3103
2869 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3107
3108 0
3109}
3110
2874sub button_up { 3111sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2876 3113
2877 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3115 undef $GRAB;
2879 $self->hide; 3116 $self->hide;
2880 3117
2881 $self->_emit ("popdown"); 3118 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
3120 } else {
3121 return 0
3122 }
3123
2883 } 3124 1
2884} 3125}
2885 3126
2886############################################################################# 3127#############################################################################
2887 3128
2888package CFClient::UI::Statusbox; 3129package CFClient::UI::Multiplexer;
2889 3130
2890our @ISA = CFClient::UI::VBox::; 3131our @ISA = CFClient::UI::Container::;
2891 3132
2892sub new { 3133sub new {
2893 my $class = shift; 3134 my $class = shift;
2894 3135
2895 $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
3137 @_,
3138 );
3139
3140 $self->{current} = $self->{children}[0]
3141 if @{ $self->{children} };
3142
3143 $self
3144}
3145
3146sub add {
3147 my ($self, @widgets) = @_;
3148
3149 $self->SUPER::add (@widgets);
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153}
3154
3155sub set_current_page {
3156 my ($self, $page_or_widget) = @_;
3157
3158 my $widget = ref $page_or_widget
3159 ? $page_or_widget
3160 : $self->{children}[$page_or_widget];
3161
3162 $self->{current} = $widget;
3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3164
3165 $self->emit (page_changed => $self->{current});
3166
3167 $self->realloc;
3168}
3169
3170sub visible_children {
3171 $_[0]{current}
3172}
3173
3174sub size_request {
3175 my ($self) = @_;
3176
3177 $self->{current}->size_request
3178}
3179
3180sub invoke_size_allocate {
3181 my ($self, $w, $h) = @_;
3182
3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3186}
3187
3188sub _draw {
3189 my ($self) = @_;
3190
3191 $self->{current}->draw;
3192}
3193
3194#############################################################################
3195
3196package CFClient::UI::Notebook;
3197
3198our @ISA = CFClient::UI::VBox::;
3199
3200sub new {
3201 my $class = shift;
3202
3203 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self
3207 @_,
3208 );
3209
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212
3213 $self
3214}
3215
3216sub add {
3217 my ($self, $title, $widget, $tooltip) = @_;
3218
3219 Scalar::Util::weaken $self;
3220
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget);
3228}
3229
3230sub set_current_page {
3231 my ($self, $page) = @_;
3232
3233 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current});
3235}
3236
3237#############################################################################
3238
3239package CFClient::UI::Combobox;
3240
3241use utf8;
3242
3243our @ISA = CFClient::UI::Button::;
3244
3245sub new {
3246 my $class = shift;
3247
3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3303 fontsize => 0.8,
2897 @_, 3304 @_,
2898 ) 3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
2899} 3312}
2900 3313
2901sub reorder { 3314sub reorder {
2902 my ($self) = @_; 3315 my ($self) = @_;
2903 my $NOW = time; 3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
2904 3322
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3323 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3325 }
2908 3326
… …
2911 my @items = sort { 3329 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3330 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3331 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3332 } values %{ $self->{item} };
2915 3333
3334 $self->{timer}->interval (1);
3335
2916 my $count = 10 + 1; 3336 my $count = 10 + 1;
2917 for my $item (@items) { 3337 for my $item (@items) {
2918 last unless --$count; 3338 last unless --$count;
2919 3339
2920 push @widgets, $item->{label} ||= do { 3340 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3341 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3342 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3343 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3344 : $item->{text};
2925 3345
… …
2933 tooltip => $item->{tooltip}, 3353 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3354 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3355 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3356 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3357 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3358 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3359 can_events => 1,
2940 can_hover => 1 3360 can_hover => 1
2941 }; 3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
2942 } 3374 }
2943 3375
2944 $self->clear; 3376 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3377 $self->SUPER::add (reverse @widgets);
2946} 3378}
… …
2951 $text =~ s/^\s+//; 3383 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3384 $text =~ s/\s+$//;
2953 3385
2954 return unless $text; 3386 return unless $text;
2955 3387
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3389
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3391
2960 if (my $item = $self->{item}{$group}) { 3392 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3393 if ($item->{text} eq $text) {
2962 $item->{count}++; 3394 $item->{count}++;
2963 } else { 3395 } else {
2964 $item->{count} = 1; 3396 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
2966 } 3398 }
2967 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3401 delete $item->{label};
2970 } else { 3402 } else {
2971 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3404 id => ++$self->{id},
… …
2991 3423
2992 $self->reorder; 3424 $self->reorder;
2993 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
2994} 3426}
2995 3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
2996############################################################################# 3436#############################################################################
2997 3437
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
2998package CFClient::UI::Root; 3602package CFClient::UI::Root;
2999 3603
3000our @ISA = CFClient::UI::Container::; 3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
3001 3607
3002use CFClient::OpenGL; 3608use CFClient::OpenGL;
3003 3609
3004sub new { 3610sub new {
3005 my $class = shift; 3611 my $class = shift;
… …
3012 Scalar::Util::weaken ($self->{root} = $self); 3618 Scalar::Util::weaken ($self->{root} = $self);
3013 3619
3014 $self 3620 $self
3015} 3621}
3016 3622
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3623sub size_request {
3034 my ($self) = @_; 3624 my ($self) = @_;
3035 3625
3036 ($self->{w}, $self->{h}) 3626 ($self->{w}, $self->{h})
3037} 3627}
… …
3048 $coord = $max - $size if $coord > $max - $size; 3638 $coord = $max - $size if $coord > $max - $size;
3049 3639
3050 int $coord + 0.5 3640 int $coord + 0.5
3051} 3641}
3052 3642
3053sub size_allocate { 3643sub invoke_size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3644 my ($self, $w, $h) = @_;
3055 3645
3056 for my $child ($self->children) { 3646 for my $child ($self->children) {
3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058 3648
3059 $X = $child->{force_x} if exists $child->{force_x}; 3649 $X = $child->{force_x} if exists $child->{force_x};
… …
3062 $X = _to_pixel $X, $W, $self->{w}; 3652 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h}; 3653 $Y = _to_pixel $Y, $H, $self->{h};
3064 3654
3065 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3066 } 3656 }
3657
3658 1
3067} 3659}
3068 3660
3069sub coord2local { 3661sub coord2local {
3070 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3071 3663
… …
3127 $_->() 3719 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3720 for values %{delete $self->{refresh_hook}};
3129 } 3721 }
3130 3722
3131 if ($self->{realloc}) { 3723 if ($self->{realloc}) {
3724 my %queue;
3132 my @queue; 3725 my @queue;
3726 my $widget;
3133 3727
3728 outer:
3134 while () { 3729 while () {
3135 if ($self->{realloc}) { 3730 if (my $realloc = delete $self->{realloc}) {
3136 #TODO use array-of-depth approach 3731 for $widget (values %$realloc) {
3732 $widget->{visible} or next; # do not resize invisible widgets
3137 3733
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3734 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{realloc}}; 3735
3736 push @{ $queue[$widget->{visible}] }, $widget;
3737 }
3140 } 3738 }
3141 3739
3740 while () {
3741 @queue or last outer;
3742
3743 $widget = pop @{ $queue[-1] || [] }
3744 and last;
3745
3746 pop @queue;
3747 }
3748
3749 delete $queue{$widget+0};
3750
3751 my ($w, $h) = $widget->size_request;
3752
3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3758
3759 $w = $widget->{force_w} if exists $widget->{force_w};
3760 $h = $widget->{force_h} if exists $widget->{force_h};
3761
3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3763 || delete $widget->{force_realloc}) {
3764 $widget->{req_w} = $w;
3765 $widget->{req_h} = $h;
3766
3767 $self->{size_alloc}{$widget+0} = $widget;
3768
3769 if (my $parent = $widget->{parent}) {
3770 $self->{realloc}{$parent+0} = $parent
3771 unless $queue{$parent+0};
3772
3773 $parent->{force_size_alloc} = 1;
3774 $self->{size_alloc}{$parent+0} = $parent;
3775 }
3776 }
3777
3778 delete $self->{realloc}{$widget+0};
3779 }
3780 }
3781
3782 while (my $size_alloc = delete $self->{size_alloc}) {
3783 my @queue = sort { $b->{visible} <=> $a->{visible} }
3784 values %$size_alloc;
3785
3786 while () {
3142 my $widget = pop @queue || last; 3787 my $widget = pop @queue || last;
3143 3788
3144 $widget->{visible} or last; # do not resize invisible widgets 3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3790
3175 $w = 0 if $w < 0; 3791 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3792 $h = 0 if $h < 0;
3177 3793
3178 $w = int $w + 0.5; 3794 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3795 $h = int $h + 0.5;
3180 3796
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w};
3799 $widget->{old_h} = $widget->{h};
3182 3800
3183 $widget->{w} = $w; 3801 $widget->{w} = $w;
3184 $widget->{h} = $h; 3802 $widget->{h} = $h;
3185 3803
3186 $widget->emit (size_allocate => $w, $h, $changed); 3804 $widget->emit (size_allocate => $w, $h);
3805 }
3187 } 3806 }
3188 } 3807 }
3189 3808
3190 while ($self->{post_alloc_hook}) { 3809 while ($self->{post_alloc_hook}) {
3191 $_->() 3810 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 3811 for values %{delete $self->{post_alloc_hook}};
3193 } 3812 }
3813
3194 3814
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3815 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 3817 glClear GL_COLOR_BUFFER_BIT;
3198 3818
… …
3200 glLoadIdentity; 3820 glLoadIdentity;
3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202 glMatrixMode GL_MODELVIEW; 3822 glMatrixMode GL_MODELVIEW;
3203 glLoadIdentity; 3823 glLoadIdentity;
3204 3824
3825 {
3826 package CFClient::UI::Base;
3827
3828 ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h});
3830 }
3831
3205 $self->_draw; 3832 $self->_draw;
3206} 3833}
3207 3834
3208############################################################################# 3835#############################################################################
3209 3836

Diff Legend

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