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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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;
209 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^connect_(.*)$/) { 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} 237}
227 238
… …
232 %$self = (); 243 %$self = ();
233} 244}
234 245
235sub show { 246sub show {
236 my ($self) = @_; 247 my ($self) = @_;
248
237 return if $self->{parent}; 249 return if $self->{parent};
238 250
239 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
240} 252}
241 253
242sub show_centered { 254sub set_visible {
243 my ($self) = @_; 255 my ($self) = @_;
256
244 return if $self->{parent}; 257 return if $self->{visible};
245 258
246 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
247 261
248 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 263
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
251 }, 265
252 ); 266 $_->set_visible for $self->children;
253} 267}
254 268
255sub set_invisible { 269sub set_invisible {
256 my ($self) = @_; 270 my ($self) = @_;
257 271
258 # broken show/hide model 272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
259 275
260 delete $self->{root}; 276 delete $self->{root};
261 delete $self->{visible}; 277 delete $self->{visible};
262 278
263 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
265 281
266 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
268 284
269 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
270} 305}
271 306
272sub hide { 307sub hide {
273 my ($self) = @_; 308 my ($self) = @_;
274 309
… …
276 311
277 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
278 if $self->{parent}; 313 if $self->{parent};
279} 314}
280 315
281sub move { 316sub move_abs {
282 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
283 318
284 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
287 322
288 $self->update; 323 $self->update;
289} 324}
290 325
291sub set_size { 326sub set_size {
292 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
293 328
294 $self->{user_w} = $w; 329 $self->{force_w} = $w;
295 $self->{user_h} = $h; 330 $self->{force_h} = $h;
296 331
297 $self->check_size; 332 $self->realloc;
298} 333}
299 334
300sub size_request { 335sub size_request {
301 require Carp; 336 require Carp;
302 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
304 339
305sub configure { 340sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
307 342
308 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
311 348
312 # use alignment to adjust x, y 349 # use alignment to adjust x, y
313 350
314 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 353 }
319 354
320 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 356 $self->{x} = $x;
322 $self->{y} = $y; 357 $self->{y} = $y;
323 $self->update; 358 $self->update;
324 } 359 }
325 360
326 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 368 }
329} 369}
330 370
331sub size_allocate { 371sub size_allocate {
332 # nothing to be done 372 # nothing to be done
333} 373}
334 374
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
343} 381}
344 382
345sub set_max_size { 383sub set_max_size {
346 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
347 385
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
350} 390}
351 391
352sub set_tooltip { 392sub set_tooltip {
353 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
354 394
… …
406 446
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS; 448 unless $FOCUS;
409} 449}
410 450
411sub mouse_motion { } 451sub mouse_motion { 0 }
412sub button_up { } 452sub button_up { 0 }
413sub key_down { } 453sub key_down { 0 }
414sub key_up { } 454sub key_up { 0 }
415 455
416sub button_down { 456sub button_down {
417 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
418 458
419 $self->focus_in; 459 $self->focus_in;
420}
421 460
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427 537
428sub draw { 538sub draw {
429 my ($self) = @_; 539 my ($self) = @_;
430 540
431 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432 552
433 glPushMatrix; 553 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 555
438 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 558 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 560 glBegin GL_QUADS;
445 glVertex $x , $y; 561 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
449 glEnd; 565 glEnd;
450 glDisable GL_BLEND; 566 glDisable GL_BLEND;
451 } 567 }
452 568
453 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 570 glPushMatrix;
455 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 574 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
462 glEnd; 578 glEnd;
463 glPopMatrix; 579 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
466} 585}
467 586
468sub _draw { 587sub _draw {
469 my ($self) = @_; 588 my ($self) = @_;
470 589
471 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
472}
473
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532} 591}
533 592
534sub DESTROY { 593sub DESTROY {
535 my ($self) = @_; 594 my ($self) = @_;
536 595
… …
568 627
569 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
571 630
572 glEnable GL_BLEND; 631 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 633 glColor_premultiply @$color;
575 634
576 glBegin GL_QUADS; 635 glBegin GL_QUADS;
577 glVertex 0 , 0; 636 glVertex 0 , 0;
578 glVertex 0 , $h; 637 glVertex 0 , $h;
579 glVertex $w, $h; 638 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
596} 655}
597 656
598sub size_request { 657sub size_request {
599 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
600} 661}
601 662
602sub draw { } 663sub draw { }
603 664
604############################################################################# 665#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
609 670
610sub new { 671sub new {
611 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
612 673
613 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
614 675
615 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
616 children => [], 677 children => [],
617 can_events => 0, 678 can_events => 0,
618 %arg, 679 %arg,
619 ); 680 );
681
620 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
621 684
622 $self 685 $self
623} 686}
624 687
625sub add { 688sub add {
… …
633 $self->{children} = [ 696 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
636 ]; 699 ];
637 700
638 $self->check_size (1); 701 $self->realloc;
639 $self->update;
640} 702}
641 703
642sub children { 704sub children {
643 @{ $_[0]{children} } 705 @{ $_[0]{children} }
644} 706}
… …
649 delete $child->{parent}; 711 delete $child->{parent};
650 $child->hide; 712 $child->hide;
651 713
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 715
654 $self->check_size (1); 716 $self->realloc;
655 $self->update;
656} 717}
657 718
658sub clear { 719sub clear {
659 my ($self) = @_; 720 my ($self) = @_;
660 721
… …
664 for (@$children) { 725 for (@$children) {
665 delete $_->{parent}; 726 delete $_->{parent};
666 $_->hide; 727 $_->hide;
667 } 728 }
668 729
669 $self->check_size; 730 $self->realloc;
670 $self->update;
671} 731}
672 732
673sub find_widget { 733sub find_widget {
674 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
675 735
676 $x -= $self->{x}; 736 $x -= $self->{x};
677 $y -= $self->{y}; 737 $y -= $self->{y};
678 738
679 my $res; 739 my $res;
680 740
681 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
683 and return $res; 743 and return $res;
684 } 744 }
685 745
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
736} 796}
737 797
738############################################################################# 798#############################################################################
739 799
800# back-buffered drawing area
801
740package CFClient::UI::Window; 802package CFClient::UI::Window;
741 803
742our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
743 805
744use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 825 $self->update;
764} 826}
765 827
766sub _render { 828sub _render {
829 my ($self) = @_;
830
767 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
768} 832}
769 833
770sub render_child { 834sub render_child {
771 my ($self) = @_; 835 my ($self) = @_;
772 836
773 $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 {
774 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
776 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
777 $self->_render; 848 $self->_render;
778 }; 849 };
779} 850}
780 851
781sub _draw { 852sub _draw {
782 my ($self) = @_; 853 my ($self) = @_;
783 854
784 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
785 856
786 my $tex = $self->{texture} 857 my $tex = $self->{texture}
787 or return; 858 or return;
788 859
789 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
792 863
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 865
795 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
796} 867}
… …
812} 883}
813 884
814sub size_request { 885sub size_request {
815 my ($self) = @_; 886 my ($self) = @_;
816 887
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 889
819 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
820} 894}
821 895
822sub size_allocate { 896sub size_allocate {
823 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
824 898
899 my $child = $self->child;
900
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 903
828 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
829 $self->update; 905 $self->update;
830} 906}
831 907
… …
867} 943}
868 944
869sub _render { 945sub _render {
870 my ($self) = @_; 946 my ($self) = @_;
871 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 952
874 $self->SUPER::_render; 953 $self->SUPER::_render;
875} 954}
876 955
… …
879package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
880 959
881our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
882 961
883sub new { 962sub new {
884 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
885 966
886 my $self; 967 my $self;
887 968
888 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
889 vertical => 1, 970 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 972 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
893 }, 974 },
894 ; 975 ;
895 976
896 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 979 slider => $slider,
899 @_, 980 %arg,
900 ); 981 );
901 982
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
905 985
906 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
907} 993}
908 994
909sub update { 995sub update {
910 my ($self) = @_; 996 my ($self) = @_;
911 997
… …
950 1036
951 if ($self->{bg}) { 1037 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
953 1039
954 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
957 1043
958 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
959 glVertex 0 , 0; 1045 glVertex 0 , 0;
960 glVertex 0 , $h; 1046 glVertex 0 , $h;
961 glVertex $w, $h; 1047 glVertex $w, $h;
… …
974 1060
975our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
976 1062
977use CFClient::OpenGL; 1063use CFClient::OpenGL;
978 1064
979my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1072
983sub new { 1073sub new {
984 my $class = shift; 1074 my ($class, %arg) = @_;
985 1075
986 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
987 1077
988 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1081 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1082 can_events => 1,
994 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
995 ); 1086 );
996 1087
997 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
998 align => 0, 1089 align => 0,
999 valign => 1, 1090 valign => 1,
1000 text => $self->{title}, 1091 text => $title,
1001 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1002 1094
1003 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004} 1103}
1005 1104
1006sub border { 1105sub border {
1007 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1008} 1107}
1009 1108
1010sub size_request { 1109sub size_request {
1011 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1012 1114
1013 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1014 1116
1015 ( 1117 (
1016 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1019} 1121}
1020 1122
1021sub size_allocate { 1123sub size_allocate {
1022 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1023 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1024 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1026 1136
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1031} 1138}
1032 1139
1033sub button_down { 1140sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1035 1142
… …
1051 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1052 1159
1053 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1055 1162
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059 $self->check_size; 1167 $self->realloc;
1060 }; 1168 };
1061 1169
1062 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1066 $self->{motion} = sub { 1174 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1068 1176
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1178
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1073 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1074 } 1187 1
1075} 1188}
1076 1189
1077sub button_up { 1190sub button_up {
1078 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1079 1192
1080 delete $self->{motion}; 1193 !!delete $self->{motion}
1081} 1194}
1082 1195
1083sub mouse_motion { 1196sub mouse_motion {
1084 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1085 1198
1086 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1087} 1202}
1088 1203
1089sub _draw { 1204sub _draw {
1090 my ($self) = @_; 1205 my ($self) = @_;
1091 1206
1207 my $child = $self->{children}[0];
1208
1092 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1093 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1094 1211
1095 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097 1214
1098 my $border = $self->border; 1215 my $border = $self->border;
1099 1216
1100 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105 1222
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1108 1225
1109 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1110 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1111 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1112
1113 glColor @{ $self->{bg} };
1114
1115 $bg->{s} = $rep_x;
1116 $bg->{t} = $rep_y;
1117 $bg->{wrap_mode} = 1;
1118 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 } 1231 }
1120 1232
1121 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1122 1234
1123 $self->{title}->draw if $self->{title};
1124
1125 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1126} 1241}
1127 1242
1128############################################################################# 1243#############################################################################
1129 1244
1130package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1152 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1153 1268
1154 $child->set_parent ($self); 1269 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1156 1271
1157 $self->check_size (1); 1272 $self->realloc;
1158} 1273}
1159 1274
1160# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1161sub clear { 1276sub clear {
1162 my ($self) = @_; 1277 my ($self) = @_;
… …
1167 for (@children) { 1282 for (@children) {
1168 delete $_->{parent}; 1283 delete $_->{parent};
1169 $_->hide; 1284 $_->hide;
1170 } 1285 }
1171 1286
1172 $self->check_size (1); 1287 $self->realloc;
1173 $self->update;
1174} 1288}
1175 1289
1176sub get_wh { 1290sub get_wh {
1177 my ($self) = @_; 1291 my ($self) = @_;
1178 1292
… …
1274 } 1388 }
1275} 1389}
1276 1390
1277############################################################################# 1391#############################################################################
1278 1392
1279package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1280
1281# TODO: wrap into common Box base class
1282 1394
1283our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1284 1396
1285sub size_request { 1397sub size_request {
1286 my ($self) = @_; 1398 my ($self) = @_;
1287 1399
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1289 1401 ? (
1290 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1291 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292 (List::Util::max map $_->[1], @alloc), 1404 )
1293 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1294} 1409}
1295 1410
1296sub size_allocate { 1411sub size_allocate {
1297 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1298 1413
1299 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1300
1301 my $children = $self->{children}; 1415 my $children = $self->{children};
1302 1416
1303 my @h = map $_->{req_w}, @$children; 1417 my @req;
1304 1418
1305 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1306 1420 @req = ($space / (@$children || 1)) x @$children;
1307 if ($req_h > $h) {
1308 # ah well, not enough space
1309 $_ *= $h / $req_h for @h;
1310 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1311 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312 $exp ||= 1;
1313 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1314 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1315 my $child = $children->[$_];
1316
1317 my $alloc_h = $h[$_];
1318 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319 $h[$_] = $alloc_h;
1320 } 1435 }
1321 } 1436 }
1322 1437
1323 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1324 1439
1325 my $y = 0; 1440 my $pos = 0;
1326 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1329 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330 1444
1331 $y += $h; 1445 $pos += $alloc;
1332 } 1446 }
1333 1447
1334 1 1448 1
1335} 1449}
1336 1450
1337############################################################################# 1451#############################################################################
1338 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1339package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1340 1469
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1344 1471
1345sub size_request { 1472sub new {
1346 my ($self) = @_; 1473 my $class = shift;
1347 1474
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1349 1476 vertical => 1,
1350 ( 1477 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1478 )
1354}
1355
1356sub size_allocate {
1357 my ($self, $w, $h) = @_;
1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361 my $children = $self->{children};
1362
1363 my @h = map $_->{req_h}, @$children;
1364
1365 my $req_h = List::Util::sum @h;
1366
1367 if ($req_h > $h) {
1368 # ah well, not enough space
1369 $_ *= $h / $req_h for @h;
1370 } else {
1371 my $exp = List::Util::sum map $_->{expand}, @$children;
1372 $exp ||= 1;
1373
1374 for (0 .. $#$children) {
1375 my $child = $children->[$_];
1376
1377 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378 }
1379 }
1380
1381 CFClient::UI::harmonize \@h;
1382
1383 my $y = 0;
1384 for (0 .. $#$children) {
1385 my $child = $children->[$_];
1386 my $h = $h[$_];
1387 $child->configure (0, $y, $w, $h);
1388
1389 $y += $h;
1390 }
1391
1392 1
1393} 1479}
1394 1480
1395############################################################################# 1481#############################################################################
1396 1482
1397package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1414 ellipsise => 3, # end 1500 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1416 fontsize => 1, 1502 fontsize => 1,
1417 align => -1, 1503 align => -1,
1418 valign => -1, 1504 valign => -1,
1419 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1420 can_events => 0, 1507 can_events => 0,
1421 %arg 1508 %arg
1422 ); 1509 );
1423 1510
1424 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1461 1548
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1464 1551
1552 $self->realloc;
1465 $self->update; 1553 $self->update;
1466 $self->check_size;
1467} 1554}
1468 1555
1469sub set_markup { 1556sub set_markup {
1470 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1471 1558
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1563
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1479 1566
1567 $self->realloc;
1480 $self->update; 1568 $self->update;
1481 $self->check_size;
1482} 1569}
1483 1570
1484sub size_request { 1571sub size_request {
1485 my ($self) = @_; 1572 my ($self) = @_;
1486 1573
… …
1500 1587
1501 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1503 } 1590 }
1504 1591
1505 ( 1592 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1593}
1510 1594
1511sub size_allocate { 1595sub size_allocate {
1512 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1513 1597
1598 delete $self->{ox};
1599
1514 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1602}
1516 1603
1517sub set_fontsize { 1604sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1519 1606
1520 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1608 delete $self->{texture};
1522 1609
1523 $self->update; 1610 $self->realloc;
1524 $self->check_size;
1525} 1611}
1526 1612
1527sub _draw { 1613sub _draw {
1528 my ($self) = @_; 1614 my ($self) = @_;
1529 1615
… …
1535 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1625
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1541 1628
1629 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1545 1633
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1637 };
1552 1638
1553 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1641
1642 glColor_premultiply @{$self->{fg}}
1556 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1557 glColor @{$self->{fg}}; 1644
1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else {
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 }
1562 1646
1563 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1564} 1648}
1565 1649
1566############################################################################# 1650#############################################################################
… …
1593 1677
1594 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1595 1679
1596 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1597 1681
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1683 $self->{text} = $text;
1602 1684
1603 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1605 1687
1606 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1607} 1690}
1608 1691
1609sub set_text { 1692sub set_text {
1610 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1611 1694
1612 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1696 $self->_set_text ($text);
1614 $self->update; 1697
1615 $self->check_size; 1698 $self->realloc;
1616} 1699}
1617 1700
1618sub get_text { 1701sub get_text {
1619 $_[0]{text} 1702 $_[0]{text}
1620} 1703}
… …
1650 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1653 } elsif ($uni) { 1736 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1655 } 1740 }
1656 1741
1657 $self->_set_text ($text); 1742 $self->_set_text ($text);
1658 $self->update; 1743
1659 $self->check_size; 1744 $self->realloc;
1745
1746 1
1660} 1747}
1661 1748
1662sub focus_in { 1749sub focus_in {
1663 my ($self) = @_; 1750 my ($self) = @_;
1664 1751
… …
1679 utf8::encode $text; 1766 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1681 1768
1682 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1683 $self->update; 1770 $self->update;
1771
1772 1
1684} 1773}
1685 1774
1686sub mouse_motion { 1775sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1688# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1689} 1780}
1690 1781
1691sub _draw { 1782sub _draw {
1692 my ($self) = @_; 1783 my ($self) = @_;
1693 1784
1694 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1695 1786
1696 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1699 } else { 1790 } else {
1700 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1701 } 1792 }
1702 1793
1703 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1797 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1770 } else { 1861 } else {
1771 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1772 } 1863 }
1773 1864
1774 } else { 1865 } else {
1775 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1776 } 1869 1
1777
1778} 1870}
1779 1871
1780############################################################################# 1872#############################################################################
1781 1873
1782package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1791 1883
1792sub new { 1884sub new {
1793 my $class = shift; 1885 my $class = shift;
1794 1886
1795 $class->SUPER::new ( 1887 $class->SUPER::new (
1796 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1797 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1799 can_hover => 1, 1892 can_hover => 1,
1800 align => 0, 1893 align => 0,
1801 valign => 0, 1894 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1811 1904
1812 $self->emit ("activate") 1905 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1815} 1910}
1816 1911
1817sub _draw { 1912sub _draw {
1818 my ($self) = @_; 1913 my ($self) = @_;
1819 1914
1820 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822 if ($GRAB == $self) {
1823 $self->{fg} = $self->{active_fg};
1824 }
1825 1916
1826 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1829 1920
… …
1848 1939
1849sub new { 1940sub new {
1850 my $class = shift; 1941 my $class = shift;
1851 1942
1852 $class->SUPER::new ( 1943 $class->SUPER::new (
1853 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1854 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1950 state => 0,
… …
1862} 1954}
1863 1955
1864sub size_request { 1956sub size_request {
1865 my ($self) = @_; 1957 my ($self) = @_;
1866 1958
1867 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1868} 1960}
1869 1961
1870sub button_down { 1962sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1872 1964
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1877 } 1973 1
1878} 1974}
1879 1975
1880sub _draw { 1976sub _draw {
1881 my ($self) = @_; 1977 my ($self) = @_;
1882 1978
1883 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1884 1980
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1982
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 1986
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1988
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1990
… …
2047 2145
2048 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2050 2148
2051 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2052 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2053 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2154
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2164 vertical => 0, 2263 vertical => 0,
2165 can_hover => 1, 2264 can_hover => 1,
2166 inner_pad => 0.02, 2265 inner_pad => 0.02,
2167 @_ 2266 @_
2168 ); 2267 );
… …
2171 $self->update; 2270 $self->update;
2172 2271
2173 $self 2272 $self
2174} 2273}
2175 2274
2275sub changed { }
2276
2176sub set_range { 2277sub set_range {
2177 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2178 2279
2179 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2180 2281
… …
2206} 2307}
2207 2308
2208sub size_request { 2309sub size_request {
2209 my ($self) = @_; 2310 my ($self) = @_;
2210 2311
2211 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2313}
2216 2314
2217sub button_down { 2315sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2219 2317
2220 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2221 2319
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2321
2224 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2225} 2323}
2226 2324
2227sub mouse_motion { 2325sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2229 2327
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2332
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2334
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2238 } 2340 1
2239} 2341}
2240 2342
2241sub update { 2343sub update {
2242 my ($self) = @_; 2344 my ($self) = @_;
2243 2345
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2245 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2246 2355
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2249 2358
… …
2255 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2257 2366
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2260 }); 2369 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2370
2268 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2269 2372
2270 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2271 2374
… …
2465 2568
2466 delete $self->{texture}; 2569 delete $self->{texture};
2467 } 2570 }
2468 2571
2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2470 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2471 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2472 2575
2473 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2474 2577
2475 my $y0 = $top; 2578 my $y0 = $top;
… …
2510sub _draw { 2613sub _draw {
2511 my ($self) = @_; 2614 my ($self) = @_;
2512 2615
2513 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2517 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2518 2621
2519 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2520 2623
2521} 2624}
… …
2570 2673
2571sub new { 2674sub new {
2572 my $class = shift; 2675 my $class = shift;
2573 2676
2574 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2575 state => 0, 2678 state => 0,
2576 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2577 @_ 2680 @_
2578 ); 2681 );
2579 2682
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2683 $self
2586} 2684}
2587 2685
2588sub toggle_flopper { 2686sub toggle_flopper {
2589 my ($self) = @_; 2687 my ($self) = @_;
2590 2688
2591 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2592 if ($self->{state} = !$self->{state}) {
2593 $CFClient::UI::ROOT->add ($self->{other});
2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2595 $self->_emit ("open");
2596 } else {
2597 $CFClient::UI::ROOT->remove ($self->{other});
2598 $self->_emit ("close");
2599 }
2600
2601 $self->_emit (changed => $self->{state});
2602} 2690}
2603 2691
2604############################################################################# 2692#############################################################################
2605 2693
2606package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2619} 2707}
2620 2708
2621sub set_tooltip_from { 2709sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2623 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2624 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2724 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2726 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 2738
2642sub size_allocate { 2739sub size_allocate {
2643 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2644 2741
2645 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2646} 2761}
2647 2762
2648sub _draw { 2763sub _draw {
2649 my ($self) = @_; 2764 my ($self) = @_;
2650 2765
… …
2667 glVertex $w, $h; 2782 glVertex $w, $h;
2668 glVertex $w, 0; 2783 glVertex $w, 0;
2669 glEnd; 2784 glEnd;
2670 2785
2671 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2672 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2673} 2789}
2674 2790
2675############################################################################# 2791#############################################################################
2676 2792
… …
2735 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2736 2852
2737 if ($tex) { 2853 if ($tex) {
2738 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2739 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2740 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2741 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2742 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2743 } 2859 }
2744} 2860}
2745 2861
… …
2752 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2753} 2869}
2754 2870
2755############################################################################# 2871#############################################################################
2756 2872
2757package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2758 2874
2759our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2760 2876
2761sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2762 my $class = shift;
2763
2764 my $self = $class->SUPER::new (
2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766 @_,
2767 );
2768
2769 $self
2770}
2771
2772sub set_items {
2773 my ($self, $items) = @_;
2774
2775 $self->{scrolled}->clear;
2776 return unless $items;
2777
2778 my @items = sort {
2779 ($a->{type} <=> $b->{type})
2780 or ($a->{name} cmp $b->{name})
2781 } @$items;
2782
2783 $self->{real_items} = \@items;
2784
2785 my $row = 0;
2786 for my $item (@items) {
2787 CFClient::Item::update_widgets $item;
2788
2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793 $row++;
2794 }
2795}
2796
2797sub size_request {
2798 my ($self) = @_;
2799 ($self->{req_w}, $self->{req_h});
2800}
2801 2878
2802############################################################################# 2879#############################################################################
2803 2880
2804package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2805 2882
… …
2846 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2847 $GRAB = $self; 2924 $GRAB = $self;
2848 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2849 2926
2850 $self->show; 2927 $self->show;
2851 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852} 2929}
2853 2930
2854sub mouse_motion { 2931sub mouse_motion {
2855 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2856 2933
2857 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2858 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2860} 2939}
2861 2940
2862sub button_up { 2941sub button_up {
2863 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2864 2943
… …
2866 undef $GRAB; 2945 undef $GRAB;
2867 $self->hide; 2946 $self->hide;
2868 2947
2869 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2870 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2871 } 2954 1
2872} 2955}
2873 2956
2874############################################################################# 2957#############################################################################
2875 2958
2876package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2877 2960
2878our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2879 2962
2880sub new { 2963sub new {
2881 my $class = shift; 2964 my $class = shift;
2882 2965
2883 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2884 fontsize => 0.8, 3075 fontsize => 0.8,
2885 @_, 3076 @_,
2886 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2887} 3087}
2888 3088
2889sub reorder { 3089sub reorder {
2890 my ($self) = @_; 3090 my ($self) = @_;
2891 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2892 3092
2893 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2894 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2895 } 3095 }
2896 3096
… …
2898 3098
2899 my @items = sort { 3099 my @items = sort {
2900 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2901 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2902 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2903 3105
2904 my $count = 10 + 1; 3106 my $count = 10 + 1;
2905 for my $item (@items) { 3107 for my $item (@items) {
2906 last unless --$count; 3108 last unless --$count;
2907 3109
… …
2922 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2923 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2924 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2925 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2926 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2927 can_events => 1, 3130 can_events => 1,
2928 can_hover => 1 3131 can_hover => 1
2929 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2930 } 3143 }
2931 3144
2932 $self->clear; 3145 $self->clear;
2933 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2934} 3147}
… …
2939 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2940 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2941 3154
2942 return unless $text; 3155 return unless $text;
2943 3156
2944 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2945 3158
2946 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2947 3160
2948 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2949 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2979 3192
2980 $self->reorder; 3193 $self->reorder;
2981 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2982} 3195}
2983 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2984############################################################################# 3205#############################################################################
2985 3206
2986package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2987 3208
2988our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990use CFClient::OpenGL;
2991 3210
2992sub new { 3211sub new {
2993 my $class = shift; 3212 my $class = shift;
2994 3213
2995 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
3456 @_,
3457 )
3458}
3459
3460# XXX: Do sorting? Argl...
3461sub add_spell {
3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3464
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
2996 visible => 1, 3514 visible => 1,
2997 @_, 3515 @_,
2998 ) 3516 );
2999}
3000 3517
3001sub configure { 3518 Scalar::Util::weaken ($self->{root} = $self);
3002 my ($self, $x, $y, $w, $h) = @_;
3003 3519
3004 $self->{w} = $w; 3520 $self
3005 $self->{h} = $h;
3006}
3007
3008sub check_size {
3009 my ($self) = @_;
3010
3011 $self->size_allocate ($self->{w}, $self->{h})
3012 if $self->{w};
3013} 3521}
3014 3522
3015sub size_request { 3523sub size_request {
3016 my ($self) = @_; 3524 my ($self) = @_;
3017 3525
3018 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
3019} 3541}
3020 3542
3021sub size_allocate { 3543sub size_allocate {
3022 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3023 3545
3024 for my $child ($self->children) { 3546 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3548
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3029 3551
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3554
3036 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3037 } 3556 }
3038} 3557}
3039 3558
… …
3050} 3569}
3051 3570
3052sub update { 3571sub update {
3053 my ($self) = @_; 3572 my ($self) = @_;
3054 3573
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3057} 3575}
3058 3576
3059sub add { 3577sub add {
3060 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3061 3579
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
3068 for my $child (@children) {
3069 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3070 3581 for @children;
3071 # integerise window positions
3072 $child->{x} = int $child->{x};
3073 $child->{y} = int $child->{y};
3074 }
3075 3582
3076 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3077} 3584}
3078 3585
3079sub remove { 3586sub remove {
3080 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3081 3588
3082 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3083 3593
3084 while (@children) { 3594 while (@children) {
3085 my $w = pop @children; 3595 my $w = pop @children;
3086 push @children, $w->children; 3596 push @children, $w->children;
3087 $w->set_invisible; 3597 $w->set_invisible;
… …
3106 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3107 $_->() 3617 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3109 } 3619 }
3110 3620
3111 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3112 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3113 3625
3114 for (;;) { 3626 outer:
3115 if ($self->{check_size}) { 3627 while () {
3116 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3118 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3119 } 3636 }
3120 3637
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3122 3640
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3124 ? @$widget{qw(user_w user_h)} 3642 and last;
3125 : $widget->size_request;
3126
3127 if (delete $widget->{force_alloc}
3128 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3131 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3133 3664
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3135 3666
3136 $widget->{parent}->check_size
3137 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3138 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3139 } 3677 }
3140 } 3678 }
3141 3679
3142 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3144 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145 3688
3146 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3148 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3149 $widget->{w} = $w; 3699 $widget->{w} = $w;
3150 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3151 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3152 } 3704 }
3153 } 3705 }
3154 3706
3155 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3156 $_->() 3708 $_->()
3157 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3158 } 3710 }
3711
3159 3712
3160 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3163 3716
… …
3165 glLoadIdentity; 3718 glLoadIdentity;
3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3168 glLoadIdentity; 3721 glLoadIdentity;
3169 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3170 $self->_draw; 3730 $self->_draw;
3171} 3731}
3172 3732
3173############################################################################# 3733#############################################################################
3174 3734

Diff Legend

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