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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 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} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $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} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $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
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $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;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $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;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
315} 376}
316 377
317sub set_max_size { 378sub set_max_size {
318 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 383}
323 384
324sub set_tooltip { 385sub set_tooltip {
325 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
326 392
327 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
328 394
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
384 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
385 451
386 $self->focus_in; 452 $self->focus_in;
387} 453}
388 454
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
393sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
394 528
395sub draw { 529sub draw {
396 my ($self) = @_; 530 my ($self) = @_;
397 531
398 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
399 541
400 glPushMatrix; 542 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw; 544 $self->_draw;
403 glPopMatrix; 545 glPopMatrix;
415 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
416 glEnd; 558 glEnd;
417 glDisable GL_BLEND; 559 glDisable GL_BLEND;
418 } 560 }
419 561
420 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
421 glPushMatrix; 563 glPushMatrix;
422 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 567 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
429 glEnd; 571 glEnd;
430 glPopMatrix; 572 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 574 }
433} 575}
434 576
435sub _draw { 577sub _draw {
436 my ($self) = @_; 578 my ($self) = @_;
437 579
438 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 581}
497 582
498sub DESTROY { 583sub DESTROY {
499 my ($self) = @_; 584 my ($self) = @_;
500 585
558 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
560} 645}
561 646
562sub size_request { 647sub size_request {
563 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
564} 651}
565 652
566sub draw { } 653sub draw { }
567 654
568############################################################################# 655#############################################################################
597 $self->{children} = [ 684 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
600 ]; 687 ];
601 688
602 $self->check_size (1); 689 $self->realloc;
603 $self->update;
604} 690}
605 691
606sub children { 692sub children {
607 @{ $_[0]{children} } 693 @{ $_[0]{children} }
608} 694}
613 delete $child->{parent}; 699 delete $child->{parent};
614 $child->hide; 700 $child->hide;
615 701
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 703
618 $self->check_size; 704 $self->realloc;
619 $self->update;
620} 705}
621 706
622sub clear { 707sub clear {
623 my ($self) = @_; 708 my ($self) = @_;
624 709
628 for (@$children) { 713 for (@$children) {
629 delete $_->{parent}; 714 delete $_->{parent};
630 $_->hide; 715 $_->hide;
631 } 716 }
632 717
633 $self->check_size; 718 $self->realloc;
634 $self->update;
635} 719}
636 720
637sub find_widget { 721sub find_widget {
638 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
639 723
726 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 811 $self->update;
728} 812}
729 813
730sub _render { 814sub _render {
815 my ($self) = @_;
816
731 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
732} 818}
733 819
734sub render_child { 820sub render_child {
735 my ($self) = @_; 821 my ($self) = @_;
736 822
737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
740 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
741 $self->_render; 834 $self->_render;
742 }; 835 };
743} 836}
744 837
745sub _draw { 838sub _draw {
746 my ($self) = @_; 839 my ($self) = @_;
747 840
748 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
749 842
750 my $tex = $self->{texture} 843 my $tex = $self->{texture}
751 or return; 844 or return;
752 845
753 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
763 856
764package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
765 858
766our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
767 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
768sub size_request { 871sub size_request {
769 my ($self) = @_; 872 my ($self) = @_;
770 873
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 875
773 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
774} 880}
775 881
776sub size_allocate { 882sub size_allocate {
777 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
778 884
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 885 my $child = $self->child;
780# $w = $self->{w}; 886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
781 $self->child->configure (0, 0, $cw, $ch); 890 $self->child->configure (0, 0, $w, $h);
782 $self->update; 891 $self->update;
783} 892}
784 893
785sub set_offset { 894sub set_offset {
786 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
820} 929}
821 930
822sub _render { 931sub _render {
823 my ($self) = @_; 932 my ($self) = @_;
824 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 938
827 $self->SUPER::_render; 939 $self->SUPER::_render;
828} 940}
829 941
837 my $class = shift; 949 my $class = shift;
838 950
839 my $self; 951 my $self;
840 952
841 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
842 vertical => 1, 954 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 956 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 957 $self->{vp}->set_offset (0, $_[1]);
846 }, 958 },
847 ; 959 ;
848 960
849 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
855 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
858 970
859 $self 971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 982}
861 983
862sub size_allocate { 984sub size_allocate {
863 my ($self, $w, $h) = @_; 985 my ($self, $w, $h) = @_;
864 986
917 1039
918our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
919 1041
920use CFClient::OpenGL; 1042use CFClient::OpenGL;
921 1043
922my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1051
926sub new { 1052sub new {
927 my $class = shift; 1053 my $class = shift;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1054
931 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1058 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
937 @_ 1062 @_
938 ); 1063 );
939 1064
940 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
941 align => 0, 1066 align => 0,
994 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
995 1120
996 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
998 1123
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size;
1003 }; 1129 };
1004 1130
1005 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
1009 $self->{motion} = sub { 1135 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
1011 1137
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1139
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update;
1016 }; 1141 };
1017 } 1142 }
1018} 1143}
1019 1144
1020sub button_up { 1145sub button_up {
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1165
1041 my $border = $self->border; 1166 my $border = $self->border;
1042 1167
1043 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1173
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
1051 1176
1052 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1182 }
1063 1183
1064 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
1065 1185
1081sub new { 1201sub new {
1082 my $class = shift; 1202 my $class = shift;
1083 1203
1084 $class->SUPER::new ( 1204 $class->SUPER::new (
1085 col_expand => [], 1205 col_expand => [],
1086 @_ 1206 @_,
1087 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1212}
1089 1213
1090sub add { 1214sub add {
1091 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1092 1216
1093 $child->set_parent ($self); 1217 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1095 1219
1096 $child->check_size; 1220 $self->realloc;
1097} 1221}
1098 1222
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1224sub clear {
1105 my ($self) = @_; 1225 my ($self) = @_;
1106 1226
1107 my @children = $self->children; 1227 my @children = $self->children;
1108 delete $self->{children}; 1228 delete $self->{children};
1110 for (@children) { 1230 for (@children) {
1111 delete $_->{parent}; 1231 delete $_->{parent};
1112 $_->hide; 1232 $_->hide;
1113 } 1233 }
1114 1234
1115 $self->update; 1235 $self->realloc;
1116} 1236}
1117 1237
1118sub get_wh { 1238sub get_wh {
1119 my ($self) = @_; 1239 my ($self) = @_;
1120 1240
1151sub size_allocate { 1271sub size_allocate {
1152 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1153 1273
1154 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1155 1275
1156 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1158 1278
1159 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
1216 } 1336 }
1217} 1337}
1218 1338
1219############################################################################# 1339#############################################################################
1220 1340
1221package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1342
1225our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1226 1344
1227sub size_request { 1345sub size_request {
1228 my ($self) = @_; 1346 my ($self) = @_;
1229 1347
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1231 1349 ? (
1232 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1352 )
1235 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1236} 1357}
1237 1358
1238sub size_allocate { 1359sub size_allocate {
1239 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1240 1361
1241 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1363 my $children = $self->{children};
1244 1364
1245 my @h = map $_->{req_w}, @$children; 1365 my @req;
1246 1366
1247 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1248 1368 @req = ($space / (@$children || 1)) x @$children;
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 } 1383 }
1263 } 1384 }
1264 1385
1265 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1266 1387
1267 my $y = 0; 1388 my $pos = 0;
1268 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1392
1273 $y += $h; 1393 $pos += $alloc;
1274 } 1394 }
1275 1395
1276 1 1396 1
1277} 1397}
1278 1398
1279############################################################################# 1399#############################################################################
1280 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1281package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1282 1417
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1286 1419
1287sub size_request { 1420sub new {
1288 my ($self) = @_; 1421 my $class = shift;
1289 1422
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1291 1424 vertical => 1,
1292 ( 1425 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1426 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1427}
1336 1428
1337############################################################################# 1429#############################################################################
1338 1430
1339package CFClient::UI::Label; 1431package CFClient::UI::Label;
1356 ellipsise => 3, # end 1448 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1358 fontsize => 1, 1450 fontsize => 1,
1359 align => -1, 1451 align => -1,
1360 valign => -1, 1452 valign => -1,
1361 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1362 can_events => 0, 1455 can_events => 0,
1363 %arg 1456 %arg
1364 ); 1457 );
1365 1458
1366 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
1402 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1403 1496
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1406 1499
1500 $self->realloc;
1407 $self->update; 1501 $self->update;
1408 $self->check_size;
1409} 1502}
1410 1503
1411sub set_markup { 1504sub set_markup {
1412 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1413 1506
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1511
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1421 1514
1515 $self->realloc;
1422 $self->update; 1516 $self->update;
1423 $self->check_size;
1424} 1517}
1425 1518
1426sub size_request { 1519sub size_request {
1427 my ($self) = @_; 1520 my ($self) = @_;
1428 1521
1442 1535
1443 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1445 } 1538 }
1446 1539
1447 ( 1540 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1541}
1452 1542
1453sub size_allocate { 1543sub size_allocate {
1454 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1455 1545
1456 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1548}
1458 1549
1459sub set_fontsize { 1550sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1461 1552
1462 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1554 delete $self->{texture};
1464 1555
1465 $self->update; 1556 $self->realloc;
1466 $self->check_size;
1467} 1557}
1468 1558
1469sub _draw { 1559sub _draw {
1470 my ($self) = @_; 1560 my ($self) = @_;
1471 1561
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1571
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1483 1573
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1576 : ($self->{w} - $tex->{w}) * 0.5);
1487 1577
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1580 : ($self->{h} - $tex->{h}) * 0.5);
1491 1581
1492 $tex 1582 $tex
1493 }; 1583 };
1494 1584
1551sub set_text { 1641sub set_text {
1552 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1553 1643
1554 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1645 $self->_set_text ($text);
1556 $self->update; 1646
1557 $self->check_size; 1647 $self->realloc;
1558} 1648}
1559 1649
1560sub get_text { 1650sub get_text {
1561 $_[0]{text} 1651 $_[0]{text}
1562} 1652}
1595 } elsif ($uni) { 1685 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1597 } 1687 }
1598 1688
1599 $self->_set_text ($text); 1689 $self->_set_text ($text);
1600 $self->update; 1690
1601 $self->check_size; 1691 $self->realloc;
1602} 1692}
1603 1693
1604sub focus_in { 1694sub focus_in {
1605 my ($self) = @_; 1695 my ($self) = @_;
1606 1696
1733 1823
1734sub new { 1824sub new {
1735 my $class = shift; 1825 my $class = shift;
1736 1826
1737 $class->SUPER::new ( 1827 $class->SUPER::new (
1738 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1739 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1741 can_hover => 1, 1832 can_hover => 1,
1742 align => 0, 1833 align => 0,
1743 valign => 0, 1834 valign => 0,
1790 1881
1791sub new { 1882sub new {
1792 my $class = shift; 1883 my $class = shift;
1793 1884
1794 $class->SUPER::new ( 1885 $class->SUPER::new (
1795 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1796 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1890 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1891 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1892 state => 0,
1804} 1896}
1805 1897
1806sub size_request { 1898sub size_request {
1807 my ($self) = @_; 1899 my ($self) = @_;
1808 1900
1809 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1810} 1902}
1811 1903
1812sub button_down { 1904sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1814 1906
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1819 } 1911 }
1820} 1912}
1821 1913
1822sub _draw { 1914sub _draw {
1823 my ($self) = @_; 1915 my ($self) = @_;
1824 1916
1825 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1826 1918
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1920
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 1924
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1926
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1928
2099 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2195 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2196 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2197 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2106 vertical => 0, 2200 vertical => 0,
2107 can_hover => 1, 2201 can_hover => 1,
2108 inner_pad => 0.02, 2202 inner_pad => 0.02,
2109 @_ 2203 @_
2110 ); 2204 );
2113 $self->update; 2207 $self->update;
2114 2208
2115 $self 2209 $self
2116} 2210}
2117 2211
2212sub changed { }
2213
2118sub set_range { 2214sub set_range {
2119 my ($self, $range) = @_; 2215 my ($self, $range) = @_;
2120 2216
2121 $self->{range} = $range; 2217 ($range, $self->{range}) = ($self->{range}, $range);
2122 2218
2123 $self->update; 2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2124} 2221}
2125 2222
2126sub set_value { 2223sub set_value {
2127 my ($self, $value) = @_; 2224 my ($self, $value) = @_;
2128 2225
2147} 2244}
2148 2245
2149sub size_request { 2246sub size_request {
2150 my ($self) = @_; 2247 my ($self) = @_;
2151 2248
2152 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2250}
2157 2251
2158sub button_down { 2252sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2160 2254
2511 2605
2512sub new { 2606sub new {
2513 my $class = shift; 2607 my $class = shift;
2514 2608
2515 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2516 state => 0, 2610 state => 0,
2517 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2518 @_ 2612 @_
2519 ); 2613 );
2520 2614
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2615 $self
2527} 2616}
2528 2617
2529sub toggle_flopper { 2618sub toggle_flopper {
2530 my ($self) = @_; 2619 my ($self) = @_;
2531 2620
2532 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2622}
2544 2623
2545############################################################################# 2624#############################################################################
2546 2625
2547package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
2560} 2639}
2561 2640
2562sub set_tooltip_from { 2641sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2564 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2565 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2656 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2658 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2582 2670
2583sub size_allocate { 2671sub size_allocate {
2584 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2585 2673
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2587} 2693}
2588 2694
2589sub _draw { 2695sub _draw {
2590 my ($self) = @_; 2696 my ($self) = @_;
2591 2697
2608 glVertex $w, $h; 2714 glVertex $w, $h;
2609 glVertex $w, 0; 2715 glVertex $w, 0;
2610 glEnd; 2716 glEnd;
2611 2717
2612 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2613 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2614} 2721}
2615 2722
2616############################################################################# 2723#############################################################################
2617 2724
2623 2730
2624sub new { 2731sub new {
2625 my $class = shift; 2732 my $class = shift;
2626 2733
2627 my $self = $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2628 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2629 @_, 2737 @_,
2630 ); 2738 );
2631 2739
2632 if ($self->{anim} && $self->{animspeed}) { 2740 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2741 Scalar::Util::weaken (my $widget = $self);
2692 $self->SUPER::DESTROY; 2800 $self->SUPER::DESTROY;
2693} 2801}
2694 2802
2695############################################################################# 2803#############################################################################
2696 2804
2697package CFClient::UI::InventoryItem;
2698
2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857
2858#############################################################################
2859
2860package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
2861 2806
2862our @ISA = CFClient::UI::FancyFrame::; 2807our @ISA = CFClient::UI::FancyFrame::;
2863 2808
2864use CFClient::OpenGL; 2809use CFClient::OpenGL;
2902 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2848 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2905 2850
2906 $self->show; 2851 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 2853}
2909 2854
2910sub mouse_motion { 2855sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2912 2857
2992sub add { 2937sub add {
2993 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2994 2939
2995 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2997 2944
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 2946
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 2948
3035 $self->SUPER::reconfigure; 2982 $self->SUPER::reconfigure;
3036} 2983}
3037 2984
3038############################################################################# 2985#############################################################################
3039 2986
3040package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
3041 2988
3042our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 2990
3046sub new { 2991sub new {
3047 my $class = shift; 2992 my $class = shift;
3048 2993
3049 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3050 @_, 2996 @_,
3051 ) 2997 );
3052}
3053 2998
3054sub configure { 2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3055 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3056 3148
3057 $self->{w} = $w; 3149 $self->clear_command_list;
3058 $self->{h} = $h; 3150 $self->{recording} = 0;
3059} 3151 $self->{rec_btn}->set_text ("start recording");
3060 3152
3061sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3062 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3063 3171
3064 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
3065 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
3066} 3295}
3067 3296
3068sub size_request { 3297sub size_request {
3069 my ($self) = @_; 3298 my ($self) = @_;
3070 3299
3071 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
3072} 3315}
3073 3316
3074sub size_allocate { 3317sub size_allocate {
3075 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
3076 3319
3077 for my $child ($self->children) { 3320 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3322
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3323 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
3082 3325
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3326 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3327 $Y = _to_pixel $Y, $H, $self->{h};
3085
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3328
3089 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
3090 } 3330 }
3091} 3331}
3092 3332
3103} 3343}
3104 3344
3105sub update { 3345sub update {
3106 my ($self) = @_; 3346 my ($self) = @_;
3107 3347
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
3110} 3349}
3111 3350
3112sub add { 3351sub add {
3113 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
3114 3353
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3354 $_->{is_toplevel} = 1
3123 3355 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3356
3129 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3130} 3358}
3131 3359
3132sub remove { 3360sub remove {
3133 my ($self, @children) = @_; 3361 my ($self, @children) = @_;
3134 3362
3135 $self->SUPER::remove (@children); 3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3136 3367
3137 while (@children) { 3368 while (@children) {
3138 my $w = pop @children; 3369 my $w = pop @children;
3139 push @children, $w->children; 3370 push @children, $w->children;
3140 $w->set_invisible; 3371 $w->set_invisible;
3159 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
3160 $_->() 3391 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
3162 } 3393 }
3163 3394
3164 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
3165 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
3166 3399
3167 for (;;) { 3400 outer:
3168 if ($self->{check_size}) { 3401 while () {
3169 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
3171 for values %{delete $self->{check_size}} 3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
3172 } 3410 }
3173 3411
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
3175 3414
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3416 and last;
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183 3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
3184 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
3186 3435
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
3188 3437
3189 $widget->{parent}->check_size
3190 if $widget->{parent}; 3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
3191 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
3192 } 3448 }
3193 } 3449 }
3194 3450
3195 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 my ($widget, $w, $h) = @$_; 3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198 3459
3199 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
3201 3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3202 $widget->{w} = $w; 3470 $widget->{w} = $w;
3203 $widget->{h} = $h; 3471 $widget->{h} = $h;
3472
3204 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
3205 } 3475 }
3206 } 3476 }
3207 3477
3208 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
3209 $_->() 3479 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
3211 } 3481 }
3482
3212 3483
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
3216 3487
3218 glLoadIdentity; 3489 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3492 glLoadIdentity;
3222 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
3223 $self->_draw; 3501 $self->_draw;
3224} 3502}
3225 3503
3226############################################################################# 3504#############################################################################
3227 3505

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines