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.273 by root, Sat Jun 3 02:32:35 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; 553 $self->_draw;
400 glPopMatrix; 554 glPopMatrix;
… …
412 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
413 glEnd; 567 glEnd;
414 glDisable GL_BLEND; 568 glDisable GL_BLEND;
415 } 569 }
416 570
417 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
418 glPushMatrix; 572 glPushMatrix;
419 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 576 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
426 glEnd; 580 glEnd;
427 glPopMatrix; 581 glPopMatrix;
428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429 } 583 }
430} 584}
431 585
432sub _draw { 586sub _draw {
433 my ($self) = @_; 587 my ($self) = @_;
434 588
435 warn "no draw defined for $self\n"; 589 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} 590}
494 591
495sub DESTROY { 592sub DESTROY {
496 my ($self) = @_; 593 my ($self) = @_;
497 594
… …
555 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
557} 654}
558 655
559sub size_request { 656sub size_request {
560 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
561} 660}
562 661
563sub draw { } 662sub draw { }
564 663
565############################################################################# 664#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
570 669
571sub new { 670sub new {
572 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
573 672
574 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
575 674
576 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
577 children => [], 676 children => [],
578 can_events => 0, 677 can_events => 0,
579 %arg, 678 %arg,
580 ); 679 );
680
581 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
582 683
583 $self 684 $self
584} 685}
585 686
586sub add { 687sub add {
… …
594 $self->{children} = [ 695 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
597 ]; 698 ];
598 699
599 $self->check_size (1); 700 $self->realloc;
600 $self->update;
601} 701}
602 702
603sub children { 703sub children {
604 @{ $_[0]{children} } 704 @{ $_[0]{children} }
605} 705}
… …
610 delete $child->{parent}; 710 delete $child->{parent};
611 $child->hide; 711 $child->hide;
612 712
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 714
615 $self->check_size; 715 $self->realloc;
616 $self->update;
617} 716}
618 717
619sub clear { 718sub clear {
620 my ($self) = @_; 719 my ($self) = @_;
621 720
… …
625 for (@$children) { 724 for (@$children) {
626 delete $_->{parent}; 725 delete $_->{parent};
627 $_->hide; 726 $_->hide;
628 } 727 }
629 728
630 $self->check_size; 729 $self->realloc;
631 $self->update;
632} 730}
633 731
634sub find_widget { 732sub find_widget {
635 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
636 734
637 $x -= $self->{x}; 735 $x -= $self->{x};
638 $y -= $self->{y}; 736 $y -= $self->{y};
639 737
640 my $res; 738 my $res;
641 739
642 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
644 and return $res; 742 and return $res;
645 } 743 }
646 744
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
723 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 822 $self->update;
725} 823}
726 824
727sub _render { 825sub _render {
826 my ($self) = @_;
827
728 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
729} 829}
730 830
731sub render_child { 831sub render_child {
732 my ($self) = @_; 832 my ($self) = @_;
733 833
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
737 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
738 $self->_render; 845 $self->_render;
739 }; 846 };
740} 847}
741 848
742sub _draw { 849sub _draw {
743 my ($self) = @_; 850 my ($self) = @_;
744 851
745 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
746 853
747 my $tex = $self->{texture} 854 my $tex = $self->{texture}
748 or return; 855 or return;
749 856
750 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
760 867
761package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
762 869
763our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
764 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
765sub size_request { 882sub size_request {
766 my ($self) = @_; 883 my ($self) = @_;
767 884
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 886
770 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
771} 891}
772 892
773sub size_allocate { 893sub size_allocate {
774 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
775 895
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 896 my $child = $self->child;
777# $w = $self->{w}; 897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
778 $self->child->configure (0, 0, $cw, $ch); 901 $self->child->configure (0, 0, $w, $h);
779 $self->update; 902 $self->update;
780} 903}
781 904
782sub set_offset { 905sub set_offset {
783 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
817} 940}
818 941
819sub _render { 942sub _render {
820 my ($self) = @_; 943 my ($self) = @_;
821 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 949
824 $self->SUPER::_render; 950 $self->SUPER::_render;
825} 951}
826 952
… …
829package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
830 956
831our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
832 958
833sub new { 959sub new {
834 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
835 963
836 my $self; 964 my $self;
837 965
838 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
839 vertical => 1, 967 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 969 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 970 $self->{vp}->set_offset (0, $_[1]);
843 }, 971 },
844 ; 972 ;
845 973
846 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 975 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 976 slider => $slider,
849 @_, 977 %arg,
850 ); 978 );
851 979
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
855 982
856 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1000}
858 1001
859sub size_allocate { 1002sub size_allocate {
860 my ($self, $w, $h) = @_; 1003 my ($self, $w, $h) = @_;
861 1004
… …
914 1057
915our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
916 1059
917use CFClient::OpenGL; 1060use CFClient::OpenGL;
918 1061
919my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 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); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1069
923sub new { 1070sub new {
924 my $class = shift; 1071 my ($class, %arg) = @_;
925 1072
926 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
927 1074
928 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1078 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1079 can_events => 1,
934 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
935 ); 1083 );
936 1084
937 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
938 align => 0, 1086 align => 0,
939 valign => 1, 1087 valign => 1,
940 text => $self->{title}, 1088 text => $title,
941 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
942 1091
943 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944} 1100}
945 1101
946sub border { 1102sub border {
947 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
948} 1104}
949 1105
950sub size_request { 1106sub size_request {
951 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
952 1111
953 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
954 1113
955 ( 1114 (
956 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
959} 1118}
960 1119
961sub size_allocate { 1120sub size_allocate {
962 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
963 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
964 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
966 1133
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); 1134 $self->child->configure ($border, $border, $w, $h);
971} 1135}
972 1136
973sub button_down { 1137sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
975 1139
… …
991 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
992 1156
993 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
995 1159
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size;
1000 }; 1165 };
1001 1166
1002 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1171 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
1008 1173
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1175
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update;
1013 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
1014 } 1182 1
1015} 1183}
1016 1184
1017sub button_up { 1185sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
1019 1187
1020 delete $self->{motion}; 1188 !!delete $self->{motion}
1021} 1189}
1022 1190
1023sub mouse_motion { 1191sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1025 1193
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
1027} 1197}
1028 1198
1029sub _draw { 1199sub _draw {
1030 my ($self) = @_; 1200 my ($self) = @_;
1031 1201
1202 my $child = $self->{children}[0];
1203
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1206
1035 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1209
1038 my $border = $self->border; 1210 my $border = $self->border;
1039 1211
1040 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1217
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
1048 1220
1049 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1224 $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); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1226 }
1060 1227
1061 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1062 1229
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1066} 1236}
1067 1237
1068############################################################################# 1238#############################################################################
1069 1239
1070package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
1078sub new { 1248sub new {
1079 my $class = shift; 1249 my $class = shift;
1080 1250
1081 $class->SUPER::new ( 1251 $class->SUPER::new (
1082 col_expand => [], 1252 col_expand => [],
1083 @_ 1253 @_,
1084 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1259}
1086 1260
1087sub add { 1261sub add {
1088 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1089 1263
1090 $child->set_parent ($self); 1264 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1092 1266
1093 $child->check_size; 1267 $self->realloc;
1094} 1268}
1095 1269
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1271sub clear {
1102 my ($self) = @_; 1272 my ($self) = @_;
1103 1273
1104 my @children = $self->children; 1274 my @children = $self->children;
1105 delete $self->{children}; 1275 delete $self->{children};
… …
1107 for (@children) { 1277 for (@children) {
1108 delete $_->{parent}; 1278 delete $_->{parent};
1109 $_->hide; 1279 $_->hide;
1110 } 1280 }
1111 1281
1112 $self->update; 1282 $self->realloc;
1113} 1283}
1114 1284
1115sub get_wh { 1285sub get_wh {
1116 my ($self) = @_; 1286 my ($self) = @_;
1117 1287
… …
1148sub size_allocate { 1318sub size_allocate {
1149 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1150 1320
1151 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
1152 1322
1153 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
1155 1325
1156 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1383 }
1214} 1384}
1215 1385
1216############################################################################# 1386#############################################################################
1217 1387
1218package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1389
1222our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1223 1391
1224sub size_request { 1392sub size_request {
1225 my ($self) = @_; 1393 my ($self) = @_;
1226 1394
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1228 1396 ? (
1229 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1399 )
1232 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1233} 1404}
1234 1405
1235sub size_allocate { 1406sub size_allocate {
1236 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1237 1408
1238 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1410 my $children = $self->{children};
1241 1411
1242 my @h = map $_->{req_w}, @$children; 1412 my @req;
1243 1413
1244 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1245 1415 @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 { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1429 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 } 1430 }
1260 } 1431 }
1261 1432
1262 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1263 1434
1264 my $y = 0; 1435 my $pos = 0;
1265 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1439
1270 $y += $h; 1440 $pos += $alloc;
1271 } 1441 }
1272 1442
1273 1 1443 1
1274} 1444}
1275 1445
1276############################################################################# 1446#############################################################################
1277 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1278package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1279 1464
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1283 1466
1284sub size_request { 1467sub new {
1285 my ($self) = @_; 1468 my $class = shift;
1286 1469
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1288 1471 vertical => 1,
1289 ( 1472 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1473 )
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} 1474}
1333 1475
1334############################################################################# 1476#############################################################################
1335 1477
1336package CFClient::UI::Label; 1478package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1495 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1355 fontsize => 1, 1497 fontsize => 1,
1356 align => -1, 1498 align => -1,
1357 valign => -1, 1499 valign => -1,
1358 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1359 can_events => 0, 1502 can_events => 0,
1360 %arg 1503 %arg
1361 ); 1504 );
1362 1505
1363 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
… …
1399 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1400 1543
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1403 1546
1547 $self->realloc;
1404 $self->update; 1548 $self->update;
1405 $self->check_size;
1406} 1549}
1407 1550
1408sub set_markup { 1551sub set_markup {
1409 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1410 1553
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1558
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1418 1561
1562 $self->realloc;
1419 $self->update; 1563 $self->update;
1420 $self->check_size;
1421} 1564}
1422 1565
1423sub size_request { 1566sub size_request {
1424 my ($self) = @_; 1567 my ($self) = @_;
1425 1568
… …
1439 1582
1440 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1442 } 1585 }
1443 1586
1444 ( 1587 ($w, $h)
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1588}
1449 1589
1450sub size_allocate { 1590sub size_allocate {
1451 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1452 1592
1593 delete $self->{ox};
1594
1453 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1597}
1455 1598
1456sub set_fontsize { 1599sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1458 1601
1459 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1603 delete $self->{texture};
1461 1604
1462 $self->update; 1605 $self->realloc;
1463 $self->check_size;
1464} 1606}
1465 1607
1466sub _draw { 1608sub _draw {
1467 my ($self) = @_; 1609 my ($self) = @_;
1468 1610
… …
1474 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1620
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1480 1623
1624 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1484 1628
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1632 };
1491 1633
1492 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1636
… …
1548sub set_text { 1690sub set_text {
1549 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1550 1692
1551 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1694 $self->_set_text ($text);
1553 $self->update; 1695
1554 $self->check_size; 1696 $self->realloc;
1555} 1697}
1556 1698
1557sub get_text { 1699sub get_text {
1558 $_[0]{text} 1700 $_[0]{text}
1559} 1701}
… …
1562 my ($self) = @_; 1704 my ($self) = @_;
1563 1705
1564 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1565 1707
1566 ($w + 1, $h) # add 1 for cursor 1708 ($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} 1709}
1574 1710
1575sub key_down { 1711sub key_down {
1576 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1577 1713
… …
1595 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1598 } elsif ($uni) { 1734 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1600 } 1738 }
1601 1739
1602 $self->_set_text ($text); 1740 $self->_set_text ($text);
1603 $self->update; 1741
1604 $self->check_size; 1742 $self->realloc;
1743
1744 1
1605} 1745}
1606 1746
1607sub focus_in { 1747sub focus_in {
1608 my ($self) = @_; 1748 my ($self) = @_;
1609 1749
… …
1624 utf8::encode $text; 1764 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1626 1766
1627 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1628 $self->update; 1768 $self->update;
1769
1770 1
1629} 1771}
1630 1772
1631sub mouse_motion { 1773sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1634} 1778}
1635 1779
1636sub _draw { 1780sub _draw {
1637 my ($self) = @_; 1781 my ($self) = @_;
1638 1782
… …
1715 } else { 1859 } else {
1716 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1717 } 1861 }
1718 1862
1719 } else { 1863 } else {
1720 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1721 } 1867 1
1722
1723} 1868}
1724 1869
1725############################################################################# 1870#############################################################################
1726 1871
1727package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1736 1881
1737sub new { 1882sub new {
1738 my $class = shift; 1883 my $class = shift;
1739 1884
1740 $class->SUPER::new ( 1885 $class->SUPER::new (
1741 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1742 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1744 can_hover => 1, 1890 can_hover => 1,
1745 align => 0, 1891 align => 0,
1746 valign => 0, 1892 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1756 1902
1757 $self->emit ("activate") 1903 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1760} 1908}
1761 1909
1762sub _draw { 1910sub _draw {
1763 my ($self) = @_; 1911 my ($self) = @_;
1764 1912
… …
1793 1941
1794sub new { 1942sub new {
1795 my $class = shift; 1943 my $class = shift;
1796 1944
1797 $class->SUPER::new ( 1945 $class->SUPER::new (
1798 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1799 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1952 state => 0,
… …
1807} 1956}
1808 1957
1809sub size_request { 1958sub size_request {
1810 my ($self) = @_; 1959 my ($self) = @_;
1811 1960
1812 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1813} 1962}
1814 1963
1815sub button_down { 1964sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1817 1966
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1822 } 1975 1
1823} 1976}
1824 1977
1825sub _draw { 1978sub _draw {
1826 my ($self) = @_; 1979 my ($self) = @_;
1827 1980
1828 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1829 1982
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 1984
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 1988
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 1990
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 1992
… …
2102 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2261 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2109 vertical => 0, 2264 vertical => 0,
2110 can_hover => 1, 2265 can_hover => 1,
2111 inner_pad => 0.02, 2266 inner_pad => 0.02,
2112 @_ 2267 @_
2113 ); 2268 );
… …
2116 $self->update; 2271 $self->update;
2117 2272
2118 $self 2273 $self
2119} 2274}
2120 2275
2276sub changed { }
2277
2121sub set_range { 2278sub set_range {
2122 my ($self, $range) = @_; 2279 my ($self, $range) = @_;
2123 2280
2124 $self->{range} = $range; 2281 ($range, $self->{range}) = ($self->{range}, $range);
2125 2282
2126 $self->update; 2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2127} 2285}
2128 2286
2129sub set_value { 2287sub set_value {
2130 my ($self, $value) = @_; 2288 my ($self, $value) = @_;
2131 2289
… …
2150} 2308}
2151 2309
2152sub size_request { 2310sub size_request {
2153 my ($self) = @_; 2311 my ($self) = @_;
2154 2312
2155 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2314}
2160 2315
2161sub button_down { 2316sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2163 2318
2164 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2165 2320
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2322
2168 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2169} 2324}
2170 2325
2171sub mouse_motion { 2326sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2173 2328
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2333
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2335
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2182 } 2341 1
2183} 2342}
2184 2343
2185sub update { 2344sub update {
2186 my ($self) = @_; 2345 my ($self) = @_;
2187 2346
… …
2514 2673
2515sub new { 2674sub new {
2516 my $class = shift; 2675 my $class = shift;
2517 2676
2518 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2519 state => 0, 2678 state => 0,
2520 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2521 @_ 2680 @_
2522 ); 2681 );
2523 2682
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2683 $self
2530} 2684}
2531 2685
2532sub toggle_flopper { 2686sub toggle_flopper {
2533 my ($self) = @_; 2687 my ($self) = @_;
2534 2688
2535 # TODO: use animation 2689 $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} 2690}
2547 2691
2548############################################################################# 2692#############################################################################
2549 2693
2550package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2563} 2707}
2564 2708
2565sub set_tooltip_from { 2709sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2567 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
2568 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2724 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2726 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2738
2586sub size_allocate { 2739sub size_allocate {
2587 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2588 2741
2589 $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 });
2590} 2761}
2591 2762
2592sub _draw { 2763sub _draw {
2593 my ($self) = @_; 2764 my ($self) = @_;
2594 2765
… …
2611 glVertex $w, $h; 2782 glVertex $w, $h;
2612 glVertex $w, 0; 2783 glVertex $w, 0;
2613 glEnd; 2784 glEnd;
2614 2785
2615 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2616 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2617} 2789}
2618 2790
2619############################################################################# 2791#############################################################################
2620 2792
… …
2626 2798
2627sub new { 2799sub new {
2628 my $class = shift; 2800 my $class = shift;
2629 2801
2630 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2631 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2632 @_, 2805 @_,
2633 ); 2806 );
2634 2807
2635 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2696} 2869}
2697 2870
2698############################################################################# 2871#############################################################################
2699 2872
2700package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2701 2874
2702our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2703 2876
2704sub _item_to_desc { 2877# 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 2878
2861############################################################################# 2879#############################################################################
2862 2880
2863package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2864 2882
… …
2905 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2924 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2908 2926
2909 $self->show; 2927 $self->show;
2910 $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);
2911} 2929}
2912 2930
2913sub mouse_motion { 2931sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2915 2933
2916 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2919} 2939}
2920 2940
2921sub button_up { 2941sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2923 2943
… …
2925 undef $GRAB; 2945 undef $GRAB;
2926 $self->hide; 2946 $self->hide;
2927 2947
2928 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
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 );
2930 } 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});
2931} 3063}
2932 3064
2933############################################################################# 3065#############################################################################
2934 3066
2935package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
… …
2995sub add { 3127sub add {
2996 my ($self, $text, %arg) = @_; 3128 my ($self, $text, %arg) = @_;
2997 3129
2998 $text =~ s/^\s+//; 3130 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
3000 3134
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3135 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 3136
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3138
… …
3038 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
3039} 3173}
3040 3174
3041############################################################################# 3175#############################################################################
3042 3176
3043package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
3044 3178
3045our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3180
3049sub new { 3181sub new {
3050 my $class = shift; 3182 my $class = shift;
3051 3183
3052 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3053 @_, 3426 @_,
3054 ) 3427 )
3055} 3428}
3056 3429
3057sub configure { 3430# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3431sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3066 3434
3067 $self->size_allocate ($self->{w}, $self->{h}) 3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 if $self->{w}; 3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
3069} 3489}
3070 3490
3071sub size_request { 3491sub size_request {
3072 my ($self) = @_; 3492 my ($self) = @_;
3073 3493
3074 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3075} 3509}
3076 3510
3077sub size_allocate { 3511sub size_allocate {
3078 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
3079 3513
3080 for my $child ($self->children) { 3514 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3516
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3085 3519
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3521 $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 3522
3092 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
3093 } 3524 }
3094} 3525}
3095 3526
… …
3106} 3537}
3107 3538
3108sub update { 3539sub update {
3109 my ($self) = @_; 3540 my ($self) = @_;
3110 3541
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
3113} 3543}
3114 3544
3115sub add { 3545sub add {
3116 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
3117 3547
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; 3548 $_->{is_toplevel} = 1
3126 3549 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3550
3132 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3133} 3552}
3134 3553
3135sub remove { 3554sub remove {
3136 my ($self, @children) = @_; 3555 my ($self, @children) = @_;
3137 3556
3138 $self->SUPER::remove (@children); 3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3139 3561
3140 while (@children) { 3562 while (@children) {
3141 my $w = pop @children; 3563 my $w = pop @children;
3142 push @children, $w->children; 3564 push @children, $w->children;
3143 $w->set_invisible; 3565 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
3163 $_->() 3585 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
3165 } 3587 }
3166 3588
3167 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
3168 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
3169 3593
3170 for (;;) { 3594 outer:
3171 if ($self->{check_size}) { 3595 while () {
3172 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3175 } 3604 }
3176 3605
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
3178 3608
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3610 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 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
3189 3629
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
3191 3631
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3194 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3195 } 3642 }
3196 } 3643 }
3197 3644
3198 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3653
3202 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
3204 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3205 $widget->{w} = $w; 3664 $widget->{w} = $w;
3206 $widget->{h} = $h; 3665 $widget->{h} = $h;
3666
3207 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
3208 } 3669 }
3209 } 3670 }
3210 3671
3211 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3212 $_->() 3673 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3214 } 3675 }
3676
3215 3677
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3219 3681
… …
3221 glLoadIdentity; 3683 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3686 glLoadIdentity;
3225 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3226 $self->_draw; 3695 $self->_draw;
3227} 3696}
3228 3697
3229############################################################################# 3698#############################################################################
3230 3699

Diff Legend

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