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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
… …
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
223 } 234 }
224 235
225 $self 236 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 237}
237 238
238sub destroy { 239sub destroy {
239 my ($self) = @_; 240 my ($self) = @_;
240 241
… …
242 %$self = (); 243 %$self = ();
243} 244}
244 245
245sub show { 246sub show {
246 my ($self) = @_; 247 my ($self) = @_;
248
247 return if $self->{parent}; 249 return if $self->{parent};
248 250
249 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
250} 252}
251 253
252sub show_centered { 254sub set_visible {
253 my ($self) = @_; 255 my ($self) = @_;
256
254 return if $self->{parent}; 257 return if $self->{visible};
255 258
256 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
257 261
258 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 263
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
261 }, 265
262 ); 266 $_->set_visible for $self->children;
263} 267}
264 268
265sub set_invisible { 269sub set_invisible {
266 my ($self) = @_; 270 my ($self) = @_;
267 271
268 return unless $self->{visible}; 272 return unless $self->{visible};
269 273
270 # broken show/hide model 274 $_->set_invisible for $self->children;
271 275
272 delete $self->{root}; 276 delete $self->{root};
273 delete $self->{visible}; 277 delete $self->{visible};
274 278
275 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
277 281
278 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
280 284
281 $self->focus_out; 285 $self->focus_out;
282 286
283 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
… …
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
318 339
319sub configure { 340sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
321 342
322 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
325 348
326 # use alignment to adjust x, y 349 # use alignment to adjust x, y
327 350
328 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 353 }
333 354
334 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 356 $self->{x} = $x;
336 $self->{y} = $y; 357 $self->{y} = $y;
337 $self->update; 358 $self->update;
338 } 359 }
339 360
340 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
342 } 368 }
343} 369}
344 370
345sub size_allocate { 371sub size_allocate {
346 # nothing to be done 372 # nothing to be done
347} 373}
348 374
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
356sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
357} 381}
358 382
359sub set_max_size { 383sub set_max_size {
360 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
361 385
… …
420 444
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422 unless $FOCUS; 446 unless $FOCUS;
423} 447}
424 448
425sub mouse_motion { } 449sub mouse_motion { 0 }
426sub button_up { } 450sub button_up { 0 }
427sub key_down { } 451sub key_down { 0 }
428sub key_up { } 452sub key_up { 0 }
429 453
430sub button_down { 454sub button_down {
431 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
432 456
433 $self->focus_in; 457 $self->focus_in;
434}
435 458
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
440sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
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
441 535
442sub draw { 536sub draw {
443 my ($self) = @_; 537 my ($self) = @_;
444 538
445 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 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
446 550
447 glPushMatrix; 551 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 553
452 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 556 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 558 glBegin GL_QUADS;
459 glVertex $x , $y; 559 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
463 glEnd; 563 glEnd;
464 glDisable GL_BLEND; 564 glDisable GL_BLEND;
465 } 565 }
466 566
467 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 568 glPushMatrix;
469 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 572 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
476 glEnd; 576 glEnd;
477 glPopMatrix; 577 glPopMatrix;
478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
479 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
480} 583}
481 584
482sub _draw { 585sub _draw {
483 my ($self) = @_; 586 my ($self) = @_;
484 587
485 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
486}
487
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555} 589}
556 590
557sub DESTROY { 591sub DESTROY {
558 my ($self) = @_; 592 my ($self) = @_;
559 593
… …
591 625
592 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
594 628
595 glEnable GL_BLEND; 629 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 631 glColor_premultiply @$color;
598 632
599 glBegin GL_QUADS; 633 glBegin GL_QUADS;
600 glVertex 0 , 0; 634 glVertex 0 , 0;
601 glVertex 0 , $h; 635 glVertex 0 , $h;
602 glVertex $w, $h; 636 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
619} 653}
620 654
621sub size_request { 655sub size_request {
622 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
623} 659}
624 660
625sub draw { } 661sub draw { }
626 662
627############################################################################# 663#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
632 668
633sub new { 669sub new {
634 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
635 671
636 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
637 673
638 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
639 children => [], 675 children => [],
640 can_events => 0, 676 can_events => 0,
641 %arg, 677 %arg,
642 ); 678 );
679
643 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
644 682
645 $self 683 $self
646} 684}
647 685
648sub add { 686sub add {
… …
656 $self->{children} = [ 694 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
659 ]; 697 ];
660 698
661 $self->check_size (1); 699 $self->realloc;
662 $self->update;
663} 700}
664 701
665sub children { 702sub children {
666 @{ $_[0]{children} } 703 @{ $_[0]{children} }
667} 704}
… …
672 delete $child->{parent}; 709 delete $child->{parent};
673 $child->hide; 710 $child->hide;
674 711
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 713
677 $self->check_size (1); 714 $self->realloc;
678 $self->update;
679} 715}
680 716
681sub clear { 717sub clear {
682 my ($self) = @_; 718 my ($self) = @_;
683 719
… …
687 for (@$children) { 723 for (@$children) {
688 delete $_->{parent}; 724 delete $_->{parent};
689 $_->hide; 725 $_->hide;
690 } 726 }
691 727
692 $self->check_size; 728 $self->realloc;
693 $self->update;
694} 729}
695 730
696sub find_widget { 731sub find_widget {
697 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
698 733
699 $x -= $self->{x}; 734 $x -= $self->{x};
700 $y -= $self->{y}; 735 $y -= $self->{y};
701 736
702 my $res; 737 my $res;
703 738
704 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
706 and return $res; 741 and return $res;
707 } 742 }
708 743
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
758 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
759} 794}
760 795
761############################################################################# 796#############################################################################
762 797
798# back-buffered drawing area
799
763package CFClient::UI::Window; 800package CFClient::UI::Window;
764 801
765our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
766 803
767use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
785 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 823 $self->update;
787} 824}
788 825
789sub _render { 826sub _render {
827 my ($self) = @_;
828
790 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
791} 830}
792 831
793sub render_child { 832sub render_child {
794 my ($self) = @_; 833 my ($self) = @_;
795 834
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
799 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
800 $self->_render; 846 $self->_render;
801 }; 847 };
802} 848}
803 849
804sub _draw { 850sub _draw {
805 my ($self) = @_; 851 my ($self) = @_;
806 852
807 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
808 854
809 my $tex = $self->{texture} 855 my $tex = $self->{texture}
810 or return; 856 or return;
811 857
812 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
815 861
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 863
818 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
819} 865}
… …
835} 881}
836 882
837sub size_request { 883sub size_request {
838 my ($self) = @_; 884 my ($self) = @_;
839 885
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 887
842 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
843} 892}
844 893
845sub size_allocate { 894sub size_allocate {
846 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
847 896
897 my $child = $self->child;
898
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 901
851 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
852 $self->update; 903 $self->update;
853} 904}
854 905
… …
890} 941}
891 942
892sub _render { 943sub _render {
893 my ($self) = @_; 944 my ($self) = @_;
894 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 950
897 $self->SUPER::_render; 951 $self->SUPER::_render;
898} 952}
899 953
… …
902package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
903 957
904our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
905 959
906sub new { 960sub new {
907 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
908 964
909 my $self; 965 my $self;
910 966
911 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
912 vertical => 1, 968 vertical => 1,
… …
917 ; 973 ;
918 974
919 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 977 slider => $slider,
922 @_, 978 %arg,
923 ); 979 );
924 980
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
928 983
929 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
930} 991}
931 992
932sub update { 993sub update {
933 my ($self) = @_; 994 my ($self) = @_;
934 995
… …
973 1034
974 if ($self->{bg}) { 1035 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
976 1037
977 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
980 1041
981 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
982 glVertex 0 , 0; 1043 glVertex 0 , 0;
983 glVertex 0 , $h; 1044 glVertex 0 , $h;
984 glVertex $w, $h; 1045 glVertex $w, $h;
… …
997 1058
998our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
999 1060
1000use CFClient::OpenGL; 1061use CFClient::OpenGL;
1001 1062
1002my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1070
1006sub new { 1071sub new {
1007 my $class = shift; 1072 my ($class, %arg) = @_;
1008 1073
1009 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
1010 1075
1011 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1079 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1080 can_events => 1,
1017 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1018 ); 1084 );
1019 1085
1020 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1087 align => 0,
1022 valign => 1, 1088 valign => 1,
1023 text => $self->{title}, 1089 text => $title,
1024 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
1025 1092
1026 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1101}
1028 1102
1029sub border { 1103sub border {
1030 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
1031} 1105}
1032 1106
1033sub size_request { 1107sub size_request {
1034 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
1035 1112
1036 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
1037 1114
1038 ( 1115 (
1039 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
1042} 1119}
1043 1120
1044sub size_allocate { 1121sub size_allocate {
1045 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1046 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
1047 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
1049 1134
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
1054} 1136}
1055 1137
1056sub button_down { 1138sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
1058 1140
… …
1074 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1075 1157
1076 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1078 1160
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1163
1084 $self->check_size; 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc;
1085 }; 1166 };
1086 1167
1087 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1172 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1093 1174
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1176
1096 $self->{user_x} = $bx + $x - $ox; 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1178 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1101 } 1185 1
1102} 1186}
1103 1187
1104sub button_up { 1188sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1106 1190
1107 delete $self->{motion}; 1191 !!delete $self->{motion}
1108} 1192}
1109 1193
1110sub mouse_motion { 1194sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1112 1196
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1114} 1200}
1115 1201
1116sub _draw { 1202sub _draw {
1117 my ($self) = @_; 1203 my ($self) = @_;
1118 1204
1205 my $child = $self->{children}[0];
1206
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1209
1122 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1212
1125 my $border = $self->border; 1213 my $border = $self->border;
1126 1214
1127 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1220
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1135 1223
1136 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1229 }
1147 1230
1148 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1149 1232
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1153} 1239}
1154 1240
1155############################################################################# 1241#############################################################################
1156 1242
1157package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1180 1266
1181 $child->set_parent ($self); 1267 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1183 1269
1184 $self->check_size (1); 1270 $self->realloc;
1185} 1271}
1186 1272
1187# TODO: move to container class maybe? send children a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1274sub clear {
1189 my ($self) = @_; 1275 my ($self) = @_;
… …
1194 for (@children) { 1280 for (@children) {
1195 delete $_->{parent}; 1281 delete $_->{parent};
1196 $_->hide; 1282 $_->hide;
1197 } 1283 }
1198 1284
1199 $self->check_size (1); 1285 $self->realloc;
1200 $self->update;
1201} 1286}
1202 1287
1203sub get_wh { 1288sub get_wh {
1204 my ($self) = @_; 1289 my ($self) = @_;
1205 1290
… …
1301 } 1386 }
1302} 1387}
1303 1388
1304############################################################################# 1389#############################################################################
1305 1390
1306package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1392
1310our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1311 1394
1312sub size_request { 1395sub size_request {
1313 my ($self) = @_; 1396 my ($self) = @_;
1314 1397
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1316 1399 ? (
1317 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1402 )
1320 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1321} 1407}
1322 1408
1323sub size_allocate { 1409sub size_allocate {
1324 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1325 1411
1326 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1413 my $children = $self->{children};
1329 1414
1330 my @h = map $_->{req_w}, @$children; 1415 my @req;
1331 1416
1332 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1333 1418 @req = ($space / (@$children || 1)) x @$children;
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 } 1433 }
1348 } 1434 }
1349 1435
1350 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1351 1437
1352 my $y = 0; 1438 my $pos = 0;
1353 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1442
1358 $y += $h; 1443 $pos += $alloc;
1359 } 1444 }
1360 1445
1361 1 1446 1
1362} 1447}
1363 1448
1364############################################################################# 1449#############################################################################
1365 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1366package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1367 1467
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1371 1469
1372sub size_request { 1470sub new {
1373 my ($self) = @_; 1471 my $class = shift;
1374 1472
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1376 1474 vertical => 1,
1377 ( 1475 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1476 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1477}
1421 1478
1422############################################################################# 1479#############################################################################
1423 1480
1424package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1498 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1443 fontsize => 1, 1500 fontsize => 1,
1444 align => -1, 1501 align => -1,
1445 valign => -1, 1502 valign => -1,
1446 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1447 can_events => 0, 1505 can_events => 0,
1448 %arg 1506 %arg
1449 ); 1507 );
1450 1508
1451 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1487 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1488 1546
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1491 1549
1550 $self->realloc;
1492 $self->update; 1551 $self->update;
1493 $self->check_size;
1494} 1552}
1495 1553
1496sub set_markup { 1554sub set_markup {
1497 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1498 1556
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1561
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1506 1564
1565 $self->realloc;
1507 $self->update; 1566 $self->update;
1508 $self->check_size;
1509} 1567}
1510 1568
1511sub size_request { 1569sub size_request {
1512 my ($self) = @_; 1570 my ($self) = @_;
1513 1571
… …
1527 1585
1528 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1530 } 1588 }
1531 1589
1532 ( 1590 ($w, $h)
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1591}
1537 1592
1538sub size_allocate { 1593sub size_allocate {
1539 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1540 1595
1596 delete $self->{ox};
1597
1541 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1600}
1543 1601
1544sub set_fontsize { 1602sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1546 1604
1547 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1606 delete $self->{texture};
1549 1607
1550 $self->update; 1608 $self->realloc;
1551 $self->check_size;
1552} 1609}
1553 1610
1554sub _draw { 1611sub _draw {
1555 my ($self) = @_; 1612 my ($self) = @_;
1556 1613
… …
1562 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1623
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1568 1626
1627 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1572 1631
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1635 };
1579 1636
1580 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582 1639
1640 glColor_premultiply @{$self->{fg}}
1583 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1584 glColor @{$self->{fg}}; 1642
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 }
1589 1644
1590 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1591} 1646}
1592 1647
1593############################################################################# 1648#############################################################################
… …
1620 1675
1621 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1622 1677
1623 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1624 1679
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1681 $self->{text} = $text;
1629 1682
1630 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1632 1685
1633 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1634} 1688}
1635 1689
1636sub set_text { 1690sub set_text {
1637 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1638 1692
1639 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1694 $self->_set_text ($text);
1641 $self->update; 1695
1642 $self->check_size; 1696 $self->realloc;
1643} 1697}
1644 1698
1645sub get_text { 1699sub get_text {
1646 $_[0]{text} 1700 $_[0]{text}
1647} 1701}
… …
1677 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1680 } elsif ($uni) { 1734 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1682 } 1738 }
1683 1739
1684 $self->_set_text ($text); 1740 $self->_set_text ($text);
1685 $self->update; 1741
1686 $self->check_size; 1742 $self->realloc;
1743
1744 1
1687} 1745}
1688 1746
1689sub focus_in { 1747sub focus_in {
1690 my ($self) = @_; 1748 my ($self) = @_;
1691 1749
… …
1706 utf8::encode $text; 1764 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1708 1766
1709 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1710 $self->update; 1768 $self->update;
1769
1770 1
1711} 1771}
1712 1772
1713sub mouse_motion { 1773sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1716} 1778}
1717 1779
1718sub _draw { 1780sub _draw {
1719 my ($self) = @_; 1781 my ($self) = @_;
1720 1782
1721 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1722 1784
1723 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1726 } else { 1788 } else {
1727 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1728 } 1790 }
1729 1791
1730 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1795 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1797 } else { 1859 } else {
1798 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1799 } 1861 }
1800 1862
1801 } else { 1863 } else {
1802 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1803 } 1867 1
1804
1805} 1868}
1806 1869
1807############################################################################# 1870#############################################################################
1808 1871
1809package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1818 1881
1819sub new { 1882sub new {
1820 my $class = shift; 1883 my $class = shift;
1821 1884
1822 $class->SUPER::new ( 1885 $class->SUPER::new (
1823 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1824 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1826 can_hover => 1, 1890 can_hover => 1,
1827 align => 0, 1891 align => 0,
1828 valign => 0, 1892 valign => 0,
… …
1837 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1838 1902
1839 $self->emit ("activate") 1903 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1842} 1908}
1843 1909
1844sub _draw { 1910sub _draw {
1845 my ($self) = @_; 1911 my ($self) = @_;
1846 1912
1847 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1914
1853 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1856 1918
… …
1875 1937
1876sub new { 1938sub new {
1877 my $class = shift; 1939 my $class = shift;
1878 1940
1879 $class->SUPER::new ( 1941 $class->SUPER::new (
1880 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1881 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1948 state => 0,
… …
1889} 1952}
1890 1953
1891sub size_request { 1954sub size_request {
1892 my ($self) = @_; 1955 my ($self) = @_;
1893 1956
1894 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1895} 1958}
1896 1959
1897sub button_down { 1960sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1899 1962
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1904 } 1971 1
1905} 1972}
1906 1973
1907sub _draw { 1974sub _draw {
1908 my ($self) = @_; 1975 my ($self) = @_;
1909 1976
1910 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1911 1978
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 1980
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 1984
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 1986
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 1988
… …
2074 2143
2075 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2077 2146
2078 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2080 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2152
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2258 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2191 vertical => 0, 2261 vertical => 0,
2192 can_hover => 1, 2262 can_hover => 1,
2193 inner_pad => 0.02, 2263 inner_pad => 0.02,
2194 @_ 2264 @_
2195 ); 2265 );
… …
2198 $self->update; 2268 $self->update;
2199 2269
2200 $self 2270 $self
2201} 2271}
2202 2272
2273sub changed { }
2274
2203sub set_range { 2275sub set_range {
2204 my ($self, $range) = @_; 2276 my ($self, $range) = @_;
2205 2277
2206 ($range, $self->{range}) = ($self->{range}, $range); 2278 ($range, $self->{range}) = ($self->{range}, $range);
2207 2279
… …
2233} 2305}
2234 2306
2235sub size_request { 2307sub size_request {
2236 my ($self) = @_; 2308 my ($self) = @_;
2237 2309
2238 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2311}
2243 2312
2244sub button_down { 2313sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2246 2315
2247 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2248 2317
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2319
2251 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2252} 2321}
2253 2322
2254sub mouse_motion { 2323sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2256 2325
… …
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2330
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2332
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2265 } 2338 1
2266} 2339}
2267 2340
2268sub update { 2341sub update {
2269 my ($self) = @_; 2342 my ($self) = @_;
2270 2343
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2273 2353
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2276 2356
… …
2282 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2284 2364
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2287 }); 2367 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2368
2295 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2296 2370
2297 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2298 2372
… …
2492 2566
2493 delete $self->{texture}; 2567 delete $self->{texture};
2494 } 2568 }
2495 2569
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2499 2573
2500 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2501 2575
2502 my $y0 = $top; 2576 my $y0 = $top;
… …
2537sub _draw { 2611sub _draw {
2538 my ($self) = @_; 2612 my ($self) = @_;
2539 2613
2540 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2544 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2545 2619
2546 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2547 2621
2548} 2622}
… …
2631} 2705}
2632 2706
2633sub set_tooltip_from { 2707sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2635 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2636 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2722 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2724 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2653 2736
2654sub size_allocate { 2737sub size_allocate {
2655 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2656 2739
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2658} 2759}
2659 2760
2660sub _draw { 2761sub _draw {
2661 my ($self) = @_; 2762 my ($self) = @_;
2662 2763
… …
2679 glVertex $w, $h; 2780 glVertex $w, $h;
2680 glVertex $w, 0; 2781 glVertex $w, 0;
2681 glEnd; 2782 glEnd;
2682 2783
2683 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2684 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2685} 2787}
2686 2788
2687############################################################################# 2789#############################################################################
2688 2790
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2850
2749 if ($tex) { 2851 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2755 } 2857 }
2756} 2858}
2757 2859
… …
2764 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2765} 2867}
2766 2868
2767############################################################################# 2869#############################################################################
2768 2870
2769package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2770 2872
2771our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2772 2874
2773sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2876
2814############################################################################# 2877#############################################################################
2815 2878
2816package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2817 2880
… …
2858 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2922 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2861 2924
2862 $self->show; 2925 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2927}
2865 2928
2866sub mouse_motion { 2929sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2868 2931
2869 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2872} 2937}
2873 2938
2874sub button_up { 2939sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2876 2941
… …
2878 undef $GRAB; 2943 undef $GRAB;
2879 $self->hide; 2944 $self->hide;
2880 2945
2881 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2883 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2884} 3061}
2885 3062
2886############################################################################# 3063#############################################################################
2887 3064
2888package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2993 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2994} 3171}
2995 3172
2996############################################################################# 3173#############################################################################
2997 3174
2998package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2999 3176
3000our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3178
3004sub new { 3179sub new {
3005 my $class = shift; 3180 my $class = shift;
3006 3181
3007 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3008 visible => 1, 3480 visible => 1,
3009 @_, 3481 @_,
3010 ) 3482 );
3011}
3012 3483
3013sub configure { 3484 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3485
3016 $self->{w} = $w; 3486 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3487}
3026 3488
3027sub size_request { 3489sub size_request {
3028 my ($self) = @_; 3490 my ($self) = @_;
3029 3491
3030 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3031} 3507}
3032 3508
3033sub size_allocate { 3509sub size_allocate {
3034 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
3035 3511
3036 for my $child ($self->children) { 3512 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3514
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
3041 3517
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3520
3051 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
3052 } 3522 }
3053} 3523}
3054 3524
… …
3065} 3535}
3066 3536
3067sub update { 3537sub update {
3068 my ($self) = @_; 3538 my ($self) = @_;
3069 3539
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3072} 3541}
3073 3542
3074sub add { 3543sub add {
3075 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3076 3545
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3546 $_->{is_toplevel} = 1
3085 3547 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3548
3091 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3092} 3550}
3093 3551
3094sub remove { 3552sub remove {
3095 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3096 3554
3097 $self->SUPER::remove (@children); 3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3098 3559
3099 while (@children) { 3560 while (@children) {
3100 my $w = pop @children; 3561 my $w = pop @children;
3101 push @children, $w->children; 3562 push @children, $w->children;
3102 $w->set_invisible; 3563 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3122 $_->() 3583 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3124 } 3585 }
3125 3586
3126 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3588 my %queue;
3127 my @queue; 3589 my @queue;
3590 my $widget;
3128 3591
3129 for (;;) { 3592 outer:
3130 if ($self->{check_size}) { 3593 while () {
3131 #TODO use array-of-depth approach 3594 if (my $realloc = delete $self->{realloc}) {
3595 for $widget (values %$realloc) {
3596 $widget->{visible} or next; # do not resize invisible widgets
3132 3597
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3598 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3135 } 3602 }
3136 3603
3604 while () {
3605 @queue or last outer;
3606
3137 my $widget = pop @queue || last; 3607 $widget = pop @{ $queue[-1] || [] }
3138 3608 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3151 3627
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3153 3629
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3156 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3157 } 3640 }
3158 } 3641 }
3159 3642
3160 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3651
3164 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3166 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3167 $widget->{w} = $w; 3662 $widget->{w} = $w;
3168 $widget->{h} = $h; 3663 $widget->{h} = $h;
3664
3169 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3170 } 3667 }
3171 } 3668 }
3172 3669
3173 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3174 $_->() 3671 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3176 } 3673 }
3674
3177 3675
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3181 3679
… …
3183 glLoadIdentity; 3681 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3684 glLoadIdentity;
3187 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3188 $self->_draw; 3693 $self->_draw;
3189} 3694}
3190 3695
3191############################################################################# 3696#############################################################################
3192 3697

Diff Legend

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