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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
238 $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;
239} 305}
240 306
241sub hide { 307sub hide {
242 my ($self) = @_; 308 my ($self) = @_;
243 309
… …
245 311
246 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
247 if $self->{parent}; 313 if $self->{parent};
248} 314}
249 315
250sub move { 316sub move_abs {
251 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
252 318
253 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
254 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
255 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
256 322
257 $self->update; 323 $self->update;
258} 324}
259 325
260sub set_size { 326sub set_size {
261 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
262 328
263 $self->{user_w} = $w; 329 $self->{force_w} = $w;
264 $self->{user_h} = $h; 330 $self->{force_h} = $h;
265 331
266 $self->check_size; 332 $self->realloc;
267} 333}
268 334
269sub size_request { 335sub size_request {
270 require Carp; 336 require Carp;
271 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
273 339
274sub configure { 340sub configure {
275 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
276 342
277 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
278 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
279 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
280 348
281 # use alignment to adjust x, y 349 # use alignment to adjust x, y
282 350
283 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
284 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
285
286 ($w, $h) = ($w2, $h2);
287 } 353 }
288 354
289 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
290 $self->{x} = $x; 356 $self->{x} = $x;
291 $self->{y} = $y; 357 $self->{y} = $y;
292 $self->update; 358 $self->update;
293 } 359 }
294 360
295 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296 $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;
297 } 368 }
298} 369}
299 370
300sub size_allocate { 371sub size_allocate {
301 # nothing to be done 372 # nothing to be done
302} 373}
303 374
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
312} 381}
313 382
314sub set_max_size { 383sub set_max_size {
315 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
316 385
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 388}
320 389
321sub set_tooltip { 390sub set_tooltip {
322 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
323 397
324 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
325 399
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
370 444
371 $::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
372 unless $FOCUS; 446 unless $FOCUS;
373} 447}
374 448
375sub mouse_motion { } 449sub mouse_motion { 0 }
376sub button_up { } 450sub button_up { 0 }
377sub key_down { } 451sub key_down { 0 }
378sub key_up { } 452sub key_up { 0 }
379 453
380sub button_down { 454sub button_down {
381 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
382 456
383 $self->focus_in; 457 $self->focus_in;
384}
385 458
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
390sub 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
391 535
392sub draw { 536sub draw {
393 my ($self) = @_; 537 my ($self) = @_;
394 538
395 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);
396 550
397 glPushMatrix; 551 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw;
400 glPopMatrix;
401 553
402 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
403 my ($x, $y) = @$self{qw(x y)};
404
405 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
406 glEnable GL_BLEND; 556 glEnable GL_BLEND;
407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
408 glBegin GL_QUADS; 558 glBegin GL_QUADS;
409 glVertex $x , $y;
410 glVertex $x + $self->{w}, $y;
411 glVertex $x + $self->{w}, $y + $self->{h};
412 glVertex $x , $y + $self->{h};
413 glEnd;
414 glDisable GL_BLEND;
415 }
416
417 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix;
419 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 559 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
424 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
425 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
426 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
427 glPopMatrix; 577 glPopMatrix;
428 #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;
429 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
430} 583}
431 584
432sub _draw { 585sub _draw {
433 my ($self) = @_; 586 my ($self) = @_;
434 587
435 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
436}
437
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493} 589}
494 590
495sub DESTROY { 591sub DESTROY {
496 my ($self) = @_; 592 my ($self) = @_;
497 593
… …
529 625
530 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
532 628
533 glEnable GL_BLEND; 629 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 631 glColor_premultiply @$color;
536 632
537 glBegin GL_QUADS; 633 glBegin GL_QUADS;
538 glVertex 0 , 0; 634 glVertex 0 , 0;
539 glVertex 0 , $h; 635 glVertex 0 , $h;
540 glVertex $w, $h; 636 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
557} 653}
558 654
559sub size_request { 655sub size_request {
560 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
561} 659}
562 660
563sub draw { } 661sub draw { }
564 662
565############################################################################# 663#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
570 668
571sub new { 669sub new {
572 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
573 671
574 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
575 673
576 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
577 children => [], 675 children => [],
578 can_events => 0, 676 can_events => 0,
579 %arg, 677 %arg,
580 ); 678 );
679
581 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
582 682
583 $self 683 $self
584} 684}
585 685
586sub add { 686sub add {
… …
594 $self->{children} = [ 694 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
597 ]; 697 ];
598 698
599 $self->check_size (1); 699 $self->realloc;
600 $self->update;
601} 700}
602 701
603sub children { 702sub children {
604 @{ $_[0]{children} } 703 @{ $_[0]{children} }
605} 704}
… …
610 delete $child->{parent}; 709 delete $child->{parent};
611 $child->hide; 710 $child->hide;
612 711
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 713
615 $self->check_size; 714 $self->realloc;
616 $self->update;
617} 715}
618 716
619sub clear { 717sub clear {
620 my ($self) = @_; 718 my ($self) = @_;
621 719
… …
625 for (@$children) { 723 for (@$children) {
626 delete $_->{parent}; 724 delete $_->{parent};
627 $_->hide; 725 $_->hide;
628 } 726 }
629 727
630 $self->check_size; 728 $self->realloc;
631 $self->update;
632} 729}
633 730
634sub find_widget { 731sub find_widget {
635 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
636 733
637 $x -= $self->{x}; 734 $x -= $self->{x};
638 $y -= $self->{y}; 735 $y -= $self->{y};
639 736
640 my $res; 737 my $res;
641 738
642 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
644 and return $res; 741 and return $res;
645 } 742 }
646 743
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
697} 794}
698 795
699############################################################################# 796#############################################################################
700 797
798# back-buffered drawing area
799
701package CFClient::UI::Window; 800package CFClient::UI::Window;
702 801
703our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
704 803
705use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 823 $self->update;
725} 824}
726 825
727sub _render { 826sub _render {
827 my ($self) = @_;
828
728 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
729} 830}
730 831
731sub render_child { 832sub render_child {
732 my ($self) = @_; 833 my ($self) = @_;
733 834
734 $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 {
735 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
737 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
738 $self->_render; 846 $self->_render;
739 }; 847 };
740} 848}
741 849
742sub _draw { 850sub _draw {
743 my ($self) = @_; 851 my ($self) = @_;
744 852
745 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
746 854
747 my $tex = $self->{texture} 855 my $tex = $self->{texture}
748 or return; 856 or return;
749 857
750 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
752 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
753 863
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
755 865
866 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
757} 868}
758 869
759############################################################################# 870#############################################################################
760 871
761package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
762 873
763our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
764 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
765sub size_request { 886sub size_request {
766 my ($self) = @_; 887 my ($self) = @_;
767 888
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 890
770 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
771} 895}
772 896
773sub size_allocate { 897sub size_allocate {
774 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
775 899
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
777# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
778 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
779 $self->update; 906 $self->update;
780} 907}
781 908
782sub set_offset { 909sub set_offset {
783 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
817} 944}
818 945
819sub _render { 946sub _render {
820 my ($self) = @_; 947 my ($self) = @_;
821 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 953
824 $self->SUPER::_render; 954 $self->SUPER::_render;
825} 955}
826 956
… …
829package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
830 960
831our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
832 962
833sub new { 963sub new {
834 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
835 967
836 my $self; 968 my $self;
837 969
838 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
839 vertical => 1, 971 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 973 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
843 }, 975 },
844 ; 976 ;
845 977
846 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 980 slider => $slider,
849 @_, 981 %arg,
850 ); 982 );
851 983
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
855 986
856 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1004}
858 1005
859sub size_allocate { 1006sub size_allocate {
860 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
861 1008
… …
890 1037
891 if ($self->{bg}) { 1038 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
893 1040
894 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
897 1044
898 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
899 glVertex 0 , 0; 1046 glVertex 0 , 0;
900 glVertex 0 , $h; 1047 glVertex 0 , $h;
901 glVertex $w, $h; 1048 glVertex $w, $h;
… …
914 1061
915our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
916 1063
917use CFClient::OpenGL; 1064use CFClient::OpenGL;
918 1065
919my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1073
923sub new { 1074sub new {
924 my $class = shift; 1075 my ($class, %arg) = @_;
925 1076
926 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
927 1078
928 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1082 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1083 can_events => 1,
934 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
935 ); 1087 );
936 1088
937 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
938 align => 0, 1090 align => 0,
939 valign => 1, 1091 valign => 1,
940 text => $self->{title}, 1092 text => $title,
941 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
942 1095
943 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944} 1104}
945 1105
946sub border { 1106sub border {
947 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
948} 1108}
949 1109
950sub size_request { 1110sub size_request {
951 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
952 1115
953 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
954 1117
955 ( 1118 (
956 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
959} 1122}
960 1123
961sub size_allocate { 1124sub size_allocate {
962 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
963 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
964 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
966 1137
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968 if $self->{title};
969
970 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
971} 1139}
972 1140
973sub button_down { 1141sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
975 1143
… …
991 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
992 1160
993 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
995 1163
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1168 $self->realloc;
1000 }; 1169 };
1001 1170
1002 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1175 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1008 1177
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1179
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1014 } 1188 1
1015} 1189}
1016 1190
1017sub button_up { 1191sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1019 1193
1020 delete $self->{motion}; 1194 !!delete $self->{motion}
1021} 1195}
1022 1196
1023sub mouse_motion { 1197sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1025 1199
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1027} 1203}
1028 1204
1029sub _draw { 1205sub _draw {
1030 my ($self) = @_; 1206 my ($self) = @_;
1031 1207
1208 my $child = $self->{children}[0];
1209
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1212
1035 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1215
1038 my $border = $self->border; 1216 my $border = $self->border;
1039 1217
1040 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1223
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1048 1226
1049 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1052
1053 glColor @{ $self->{bg} };
1054
1055 $bg->{s} = $rep_x;
1056 $bg->{t} = $rep_y;
1057 $bg->{wrap_mode} = 1;
1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1232 }
1060 1233
1061 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1062 1235
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1066} 1242}
1067 1243
1068############################################################################# 1244#############################################################################
1069 1245
1070package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1078sub new { 1254sub new {
1079 my $class = shift; 1255 my $class = shift;
1080 1256
1081 $class->SUPER::new ( 1257 $class->SUPER::new (
1082 col_expand => [], 1258 col_expand => [],
1083 @_ 1259 @_,
1084 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1265}
1086 1266
1087sub add { 1267sub add {
1088 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1089 1269
1090 $child->set_parent ($self); 1270 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1092 1272
1093 $child->check_size; 1273 $self->realloc;
1094} 1274}
1095 1275
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1277sub clear {
1102 my ($self) = @_; 1278 my ($self) = @_;
1103 1279
1104 my @children = $self->children; 1280 my @children = $self->children;
1105 delete $self->{children}; 1281 delete $self->{children};
… …
1107 for (@children) { 1283 for (@children) {
1108 delete $_->{parent}; 1284 delete $_->{parent};
1109 $_->hide; 1285 $_->hide;
1110 } 1286 }
1111 1287
1112 $self->update; 1288 $self->realloc;
1113} 1289}
1114 1290
1115sub get_wh { 1291sub get_wh {
1116 my ($self) = @_; 1292 my ($self) = @_;
1117 1293
… …
1148sub size_allocate { 1324sub size_allocate {
1149 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1150 1326
1151 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1152 1328
1153 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1155 1331
1156 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1389 }
1214} 1390}
1215 1391
1216############################################################################# 1392#############################################################################
1217 1393
1218package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1395
1222our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1223 1397
1224sub size_request { 1398sub size_request {
1225 my ($self) = @_; 1399 my ($self) = @_;
1226 1400
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1228 1402 ? (
1229 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1405 )
1232 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1233} 1410}
1234 1411
1235sub size_allocate { 1412sub size_allocate {
1236 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1237 1414
1238 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1416 my $children = $self->{children};
1241 1417
1242 my @h = map $_->{req_w}, @$children; 1418 my @req;
1243 1419
1244 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1245 1421 @req = ($space / (@$children || 1)) x @$children;
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 } 1436 }
1260 } 1437 }
1261 1438
1262 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1263 1440
1264 my $y = 0; 1441 my $pos = 0;
1265 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1445
1270 $y += $h; 1446 $pos += $alloc;
1271 } 1447 }
1272 1448
1273 1 1449 1
1274} 1450}
1275 1451
1276############################################################################# 1452#############################################################################
1277 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1278package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1279 1470
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1283 1472
1284sub size_request { 1473sub new {
1285 my ($self) = @_; 1474 my $class = shift;
1286 1475
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1288 1477 vertical => 1,
1289 ( 1478 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1479 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1480}
1333 1481
1334############################################################################# 1482#############################################################################
1335 1483
1336package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1501 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1355 fontsize => 1, 1503 fontsize => 1,
1356 align => -1, 1504 align => -1,
1357 valign => -1, 1505 valign => -1,
1358 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1359 can_events => 0, 1508 can_events => 0,
1360 %arg 1509 %arg
1361 ); 1510 );
1362 1511
1363 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1399 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1400 1549
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1403 1552
1553 $self->realloc;
1404 $self->update; 1554 $self->update;
1405 $self->check_size;
1406} 1555}
1407 1556
1408sub set_markup { 1557sub set_markup {
1409 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1410 1559
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1564
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1418 1567
1568 $self->realloc;
1419 $self->update; 1569 $self->update;
1420 $self->check_size;
1421} 1570}
1422 1571
1423sub size_request { 1572sub size_request {
1424 my ($self) = @_; 1573 my ($self) = @_;
1425 1574
… …
1439 1588
1440 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1442 } 1591 }
1443 1592
1444 ( 1593 ($w, $h)
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1594}
1449 1595
1450sub size_allocate { 1596sub size_allocate {
1451 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1452 1598
1599 delete $self->{ox};
1600
1453 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1603}
1455 1604
1456sub set_fontsize { 1605sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1458 1607
1459 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1609 delete $self->{texture};
1461 1610
1462 $self->update; 1611 $self->realloc;
1463 $self->check_size;
1464} 1612}
1465 1613
1466sub _draw { 1614sub _draw {
1467 my ($self) = @_; 1615 my ($self) = @_;
1468 1616
… …
1474 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1626
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1480 1629
1630 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1484 1634
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1638 };
1491 1639
1492 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1642
… …
1532 1680
1533 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1534 1682
1535 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1536 1684
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1686 $self->{text} = $text;
1541 1687
1542 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1544 1690
1545 $self->_emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1546} 1693}
1547 1694
1548sub set_text { 1695sub set_text {
1549 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1550 1697
1551 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1699 $self->_set_text ($text);
1553 $self->update; 1700
1554 $self->check_size; 1701 $self->realloc;
1555} 1702}
1556 1703
1557sub get_text { 1704sub get_text {
1558 $_[0]{text} 1705 $_[0]{text}
1559} 1706}
… …
1562 my ($self) = @_; 1709 my ($self) = @_;
1563 1710
1564 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1565 1712
1566 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1714}
1574 1715
1575sub key_down { 1716sub key_down {
1576 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1577 1718
… …
1595 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1738 $self->_emit ('escape');
1598 } elsif ($uni) { 1739 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1600 } 1743 }
1601 1744
1602 $self->_set_text ($text); 1745 $self->_set_text ($text);
1603 $self->update; 1746
1604 $self->check_size; 1747 $self->realloc;
1748
1749 1
1605} 1750}
1606 1751
1607sub focus_in { 1752sub focus_in {
1608 my ($self) = @_; 1753 my ($self) = @_;
1609 1754
… …
1624 utf8::encode $text; 1769 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1626 1771
1627 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1628 $self->update; 1773 $self->update;
1774
1775 1
1629} 1776}
1630 1777
1631sub mouse_motion { 1778sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1634} 1783}
1635 1784
1636sub _draw { 1785sub _draw {
1637 my ($self) = @_; 1786 my ($self) = @_;
1638 1787
1639 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1640 1789
1641 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1644 } else { 1793 } else {
1645 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1646 } 1795 }
1647 1796
1648 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1800 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1715 } else { 1864 } else {
1716 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1717 } 1866 }
1718 1867
1719 } else { 1868 } else {
1720 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1721 } 1872 1
1722
1723} 1873}
1724 1874
1725############################################################################# 1875#############################################################################
1726 1876
1727package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1736 1886
1737sub new { 1887sub new {
1738 my $class = shift; 1888 my $class = shift;
1739 1889
1740 $class->SUPER::new ( 1890 $class->SUPER::new (
1741 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1742 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1744 can_hover => 1, 1895 can_hover => 1,
1745 align => 0, 1896 align => 0,
1746 valign => 0, 1897 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1756 1907
1757 $self->emit ("activate") 1908 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1910 && $y >= 0 && $y < $self->{h};
1911
1912 1
1760} 1913}
1761 1914
1762sub _draw { 1915sub _draw {
1763 my ($self) = @_; 1916 my ($self) = @_;
1764 1917
… …
1793 1946
1794sub new { 1947sub new {
1795 my $class = shift; 1948 my $class = shift;
1796 1949
1797 $class->SUPER::new ( 1950 $class->SUPER::new (
1798 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1799 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1957 state => 0,
… …
1807} 1961}
1808 1962
1809sub size_request { 1963sub size_request {
1810 my ($self) = @_; 1964 my ($self) = @_;
1811 1965
1812 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1813} 1967}
1814 1968
1815sub button_down { 1969sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1817 1971
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1822 } 1980 1
1823} 1981}
1824 1982
1825sub _draw { 1983sub _draw {
1826 my ($self) = @_; 1984 my ($self) = @_;
1827 1985
1828 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1829 1987
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 1989
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 1993
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 1995
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 1997
… …
1992 2152
1993 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1995 2155
1996 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2161
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2109 vertical => 0, 2270 vertical => 0,
2110 can_hover => 1, 2271 can_hover => 1,
2111 inner_pad => 0.02, 2272 inner_pad => 0.02,
2112 @_ 2273 @_
2113 ); 2274 );
… …
2116 $self->update; 2277 $self->update;
2117 2278
2118 $self 2279 $self
2119} 2280}
2120 2281
2282sub changed { }
2283
2121sub set_range { 2284sub set_range {
2122 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2123 2286
2124 $self->{range} = $range; 2287 ($range, $self->{range}) = ($self->{range}, $range);
2125 2288
2126 $self->update; 2289 $self->update
2290 if "@$range" ne "@{$self->{range}}";
2127} 2291}
2128 2292
2129sub set_value { 2293sub set_value {
2130 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2131 2295
… …
2150} 2314}
2151 2315
2152sub size_request { 2316sub size_request {
2153 my ($self) = @_; 2317 my ($self) = @_;
2154 2318
2155 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2320}
2160 2321
2161sub button_down { 2322sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2163 2324
2164 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2165 2326
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2328
2168 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2169} 2330}
2170 2331
2171sub mouse_motion { 2332sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2173 2334
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2339
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2341
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2182 } 2347 1
2183} 2348}
2184 2349
2185sub update { 2350sub update {
2186 my ($self) = @_; 2351 my ($self) = @_;
2187 2352
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2190 2362
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2193 2365
… …
2199 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2201 2373
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2204 }); 2376 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2377
2212 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2213 2379
2214 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2215 2381
… …
2514 2680
2515sub new { 2681sub new {
2516 my $class = shift; 2682 my $class = shift;
2517 2683
2518 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2519 state => 0, 2685 state => 0,
2520 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2521 @_ 2687 @_
2522 ); 2688 );
2523 2689
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2690 $self
2530} 2691}
2531 2692
2532sub toggle_flopper { 2693sub toggle_flopper {
2533 my ($self) = @_; 2694 my ($self) = @_;
2534 2695
2535 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2697}
2547 2698
2548############################################################################# 2699#############################################################################
2549 2700
2550package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2563} 2714}
2564 2715
2565sub set_tooltip_from { 2716sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2567 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2568 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2731 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2733 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2745
2586sub size_allocate { 2746sub size_allocate {
2587 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2588 2748
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2590} 2768}
2591 2769
2592sub _draw { 2770sub _draw {
2593 my ($self) = @_; 2771 my ($self) = @_;
2594 2772
… …
2611 glVertex $w, $h; 2789 glVertex $w, $h;
2612 glVertex $w, 0; 2790 glVertex $w, 0;
2613 glEnd; 2791 glEnd;
2614 2792
2615 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2616 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2617} 2796}
2618 2797
2619############################################################################# 2798#############################################################################
2620 2799
… …
2626 2805
2627sub new { 2806sub new {
2628 my $class = shift; 2807 my $class = shift;
2629 2808
2630 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2631 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2632 @_, 2812 @_,
2633 ); 2813 );
2634 2814
2635 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2696} 2876}
2697 2877
2698############################################################################# 2878#############################################################################
2699 2879
2700package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2701 2881
2702our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2703 2883
2704sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859}
2860 2885
2861############################################################################# 2886#############################################################################
2862 2887
2863package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2864 2889
… …
2905 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2931 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2908 2933
2909 $self->show; 2934 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2936}
2912 2937
2913sub mouse_motion { 2938sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2915 2940
2916 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2919} 2946}
2920 2947
2921sub button_up { 2948sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2923 2950
… …
2925 undef $GRAB; 2952 undef $GRAB;
2926 $self->hide; 2953 $self->hide;
2927 2954
2928 $self->_emit ("popdown"); 2955 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2930 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2931} 3070}
2932 3071
2933############################################################################# 3072#############################################################################
2934 3073
2935package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2995sub add { 3134sub add {
2996 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2997 3136
2998 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
3000 3141
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 3143
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3145
… …
3038 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
3039} 3180}
3040 3181
3041############################################################################# 3182#############################################################################
3042 3183
3043package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
3044 3185
3045our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3187
3049sub new { 3188sub new {
3050 my $class = shift; 3189 my $class = shift;
3051 3190
3052 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3053 @_, 3433 @_,
3054 ) 3434 )
3055} 3435}
3056 3436
3057sub configure { 3437# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3066 3441
3067 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 if $self->{w}; 3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
3489 visible => 1,
3490 @_,
3491 );
3492
3493 Scalar::Util::weaken ($self->{root} = $self);
3494
3495 $self
3069} 3496}
3070 3497
3071sub size_request { 3498sub size_request {
3072 my ($self) = @_; 3499 my ($self) = @_;
3073 3500
3074 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
3075} 3516}
3076 3517
3077sub size_allocate { 3518sub size_allocate {
3078 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3079 3520
3080 for my $child ($self->children) { 3521 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3523
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3085 3526
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3088
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3529
3092 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3093 } 3531 }
3094} 3532}
3095 3533
… …
3106} 3544}
3107 3545
3108sub update { 3546sub update {
3109 my ($self) = @_; 3547 my ($self) = @_;
3110 3548
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3113} 3550}
3114 3551
3115sub add { 3552sub add {
3116 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3117 3554
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3126 3556 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3557
3132 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3133} 3559}
3134 3560
3135sub remove { 3561sub remove {
3136 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3137 3563
3138 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3139 3568
3140 while (@children) { 3569 while (@children) {
3141 my $w = pop @children; 3570 my $w = pop @children;
3142 push @children, $w->children; 3571 push @children, $w->children;
3143 $w->set_invisible; 3572 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3163 $_->() 3592 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3165 } 3594 }
3166 3595
3167 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3168 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3169 3600
3170 for (;;) { 3601 outer:
3171 if ($self->{check_size}) { 3602 while () {
3172 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3605 $widget->{visible} or next; # do not resize invisible widgets
3606
3607 $queue{$widget+0}++ and next; # duplicates are common
3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3175 } 3611 }
3176 3612
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3178 3615
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3617 and last;
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3189 3636
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3191 3638
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3194 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3195 } 3649 }
3196 } 3650 }
3197 3651
3198 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3660
3202 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3204 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3205 $widget->{w} = $w; 3671 $widget->{w} = $w;
3206 $widget->{h} = $h; 3672 $widget->{h} = $h;
3673
3207 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3208 } 3676 }
3209 } 3677 }
3210 3678
3211 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3212 $_->() 3680 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3214 } 3682 }
3683
3215 3684
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3219 3688
… …
3221 glLoadIdentity; 3690 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3693 glLoadIdentity;
3225 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3226 $self->_draw; 3702 $self->_draw;
3227} 3703}
3228 3704
3229############################################################################# 3705#############################################################################
3230 3706

Diff Legend

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