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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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
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}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 373}
313 374
314sub children { 375sub children {
315} 376}
316 377
… …
378 439
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 441 unless $FOCUS;
381} 442}
382 443
383sub mouse_motion { } 444sub mouse_motion { 0 }
384sub button_up { } 445sub button_up { 0 }
385sub key_down { } 446sub key_down { 0 }
386sub key_up { } 447sub key_up { 0 }
387 448
388sub button_down { 449sub button_down {
389 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
390 451
391 $self->focus_in; 452 $self->focus_in;
392}
393 453
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
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}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 530
400sub draw { 531sub draw {
401 my ($self) = @_; 532 my ($self) = @_;
402 533
403 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 545
405 glPushMatrix; 546 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw; 548 $self->_draw;
408 glPopMatrix; 549 glPopMatrix;
… …
420 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
421 glEnd; 562 glEnd;
422 glDisable GL_BLEND; 563 glDisable GL_BLEND;
423 } 564 }
424 565
425 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 567 glPushMatrix;
427 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 571 glVertex 0 , 0;
… …
441 my ($self) = @_; 582 my ($self) = @_;
442 583
443 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
444} 585}
445 586
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 587sub DESTROY {
504 my ($self) = @_; 588 my ($self) = @_;
505 589
506 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
507 #$self->deactivate; 591 #$self->deactivate;
… …
563 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
565} 649}
566 650
567sub size_request { 651sub size_request {
568 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
569} 655}
570 656
571sub draw { } 657sub draw { }
572 658
573############################################################################# 659#############################################################################
… …
602 $self->{children} = [ 688 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
605 ]; 691 ];
606 692
607 $self->check_size (1); 693 $self->realloc;
608 $self->update;
609} 694}
610 695
611sub children { 696sub children {
612 @{ $_[0]{children} } 697 @{ $_[0]{children} }
613} 698}
… …
618 delete $child->{parent}; 703 delete $child->{parent};
619 $child->hide; 704 $child->hide;
620 705
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 707
623 $self->check_size; 708 $self->realloc;
624 $self->update;
625} 709}
626 710
627sub clear { 711sub clear {
628 my ($self) = @_; 712 my ($self) = @_;
629 713
… …
633 for (@$children) { 717 for (@$children) {
634 delete $_->{parent}; 718 delete $_->{parent};
635 $_->hide; 719 $_->hide;
636 } 720 }
637 721
638 $self->check_size; 722 $self->realloc;
639 $self->update;
640} 723}
641 724
642sub find_widget { 725sub find_widget {
643 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
644 727
… …
731 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 815 $self->update;
733} 816}
734 817
735sub _render { 818sub _render {
819 my ($self) = @_;
820
736 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
737} 822}
738 823
739sub render_child { 824sub render_child {
740 my ($self) = @_; 825 my ($self) = @_;
741 826
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
745 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
746 $self->_render; 838 $self->_render;
747 }; 839 };
748} 840}
749 841
750sub _draw { 842sub _draw {
751 my ($self) = @_; 843 my ($self) = @_;
752 844
753 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
754 846
755 my $tex = $self->{texture} 847 my $tex = $self->{texture}
756 or return; 848 or return;
757 849
758 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
… …
781} 873}
782 874
783sub size_request { 875sub size_request {
784 my ($self) = @_; 876 my ($self) = @_;
785 877
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 879
788 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
789} 884}
790 885
791sub size_allocate { 886sub size_allocate {
792 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
793 888
889 my $child = $self->child;
890
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 893
797 $self->child->configure (0, 0, $w, $h); 894 $self->child->configure (0, 0, $w, $h);
798 $self->update; 895 $self->update;
799} 896}
800 897
… …
836} 933}
837 934
838sub _render { 935sub _render {
839 my ($self) = @_; 936 my ($self) = @_;
840 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 942
843 $self->SUPER::_render; 943 $self->SUPER::_render;
844} 944}
845 945
… …
853 my $class = shift; 953 my $class = shift;
854 954
855 my $self; 955 my $self;
856 956
857 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
858 vertical => 1, 958 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 960 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 961 $self->{vp}->set_offset (0, $_[1]);
862 }, 962 },
863 ; 963 ;
864 964
865 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
874 974
875 $self 975 $self
976}
977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 986}
877 987
878sub size_allocate { 988sub size_allocate {
879 my ($self, $w, $h) = @_; 989 my ($self, $w, $h) = @_;
880 990
… …
933 1043
934our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
935 1045
936use CFClient::OpenGL; 1046use CFClient::OpenGL;
937 1047
938my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1055
942sub new { 1056sub new {
943 my $class = shift; 1057 my ($class, %arg) = @_;
944 1058
945 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
946 1060
947 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1064 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1065 can_events => 1,
953 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
954 ); 1069 );
955 1070
956 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
957 align => 0, 1072 align => 0,
958 valign => 1, 1073 valign => 1,
959 text => $self->{title}, 1074 text => $title,
960 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
961 1077
962 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
963} 1086}
964 1087
965sub border { 1088sub border {
966 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
967} 1090}
968 1091
969sub size_request { 1092sub size_request {
970 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
971 1097
972 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
973 1099
974 ( 1100 (
975 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
978} 1104}
979 1105
980sub size_allocate { 1106sub size_allocate {
981 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
982 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
983 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
985 1119
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
990} 1121}
991 1122
992sub button_down { 1123sub button_down {
993 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
994 1125
… …
1010 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
1011 1142
1012 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
1014 1145
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size;
1019 }; 1151 };
1020 1152
1021 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1157 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1027 1159
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1161
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update;
1032 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
1033 } 1168 1
1034} 1169}
1035 1170
1036sub button_up { 1171sub button_up {
1037 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
1038 1173
1039 delete $self->{motion}; 1174 !!delete $self->{motion}
1040} 1175}
1041 1176
1042sub mouse_motion { 1177sub mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
1044 1179
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
1046} 1183}
1047 1184
1048sub _draw { 1185sub _draw {
1049 my ($self) = @_; 1186 my ($self) = @_;
1050 1187
1188 my $child = $self->{children}[0];
1189
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1192
1054 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1195
1057 my $border = $self->border; 1196 my $border = $self->border;
1058 1197
1059 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1203
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1067 1206
1068 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1212 }
1079 1213
1080 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1081 1215
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1085} 1222}
1086 1223
1087############################################################################# 1224#############################################################################
1088 1225
1089package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1101 col_expand => [], 1238 col_expand => [],
1102 @_, 1239 @_,
1103 ) 1240 )
1104} 1241}
1105 1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1245}
1246
1106sub add { 1247sub add {
1107 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1108 1249
1109 $child->set_parent ($self); 1250 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1111 1252
1112 $child->check_size; 1253 $self->realloc;
1113} 1254}
1114 1255
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1257sub clear {
1121 my ($self) = @_; 1258 my ($self) = @_;
1122 1259
1123 my @children = $self->children; 1260 my @children = $self->children;
1124 delete $self->{children}; 1261 delete $self->{children};
… …
1126 for (@children) { 1263 for (@children) {
1127 delete $_->{parent}; 1264 delete $_->{parent};
1128 $_->hide; 1265 $_->hide;
1129 } 1266 }
1130 1267
1131 $self->update; 1268 $self->realloc;
1132} 1269}
1133 1270
1134sub get_wh { 1271sub get_wh {
1135 my ($self) = @_; 1272 my ($self) = @_;
1136 1273
… …
1167sub size_allocate { 1304sub size_allocate {
1168 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1169 1306
1170 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1171 1308
1172 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1174 1311
1175 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1369 }
1233} 1370}
1234 1371
1235############################################################################# 1372#############################################################################
1236 1373
1237package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1375
1241our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1242 1377
1243sub size_request { 1378sub size_request {
1244 my ($self) = @_; 1379 my ($self) = @_;
1245 1380
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1247 1382 ? (
1248 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1385 )
1251 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1252} 1390}
1253 1391
1254sub size_allocate { 1392sub size_allocate {
1255 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1256 1394
1257 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1396 my $children = $self->{children};
1260 1397
1261 my @h = map $_->{req_w}, @$children; 1398 my @req;
1262 1399
1263 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1264 1401 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1416 }
1279 } 1417 }
1280 1418
1281 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1282 1420
1283 my $y = 0; 1421 my $pos = 0;
1284 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1425
1289 $y += $h; 1426 $pos += $alloc;
1290 } 1427 }
1291 1428
1292 1 1429 1
1293} 1430}
1294 1431
1295############################################################################# 1432#############################################################################
1296 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1297package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1298 1450
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1302 1452
1303sub size_request { 1453sub new {
1304 my ($self) = @_; 1454 my $class = shift;
1305 1455
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1307 1457 vertical => 1,
1308 ( 1458 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1459 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1460}
1352 1461
1353############################################################################# 1462#############################################################################
1354 1463
1355package CFClient::UI::Label; 1464package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1481 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1374 fontsize => 1, 1483 fontsize => 1,
1375 align => -1, 1484 align => -1,
1376 valign => -1, 1485 valign => -1,
1377 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1378 can_events => 0, 1488 can_events => 0,
1379 %arg 1489 %arg
1380 ); 1490 );
1381 1491
1382 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1418 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1419 1529
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1422 1532
1533 $self->realloc;
1423 $self->update; 1534 $self->update;
1424 $self->check_size;
1425} 1535}
1426 1536
1427sub set_markup { 1537sub set_markup {
1428 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1429 1539
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1544
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1437 1547
1548 $self->realloc;
1438 $self->update; 1549 $self->update;
1439 $self->check_size;
1440} 1550}
1441 1551
1442sub size_request { 1552sub size_request {
1443 my ($self) = @_; 1553 my ($self) = @_;
1444 1554
… …
1458 1568
1459 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1461 } 1571 }
1462 1572
1463 ( 1573 ($w, $h)
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1574}
1468 1575
1469sub size_allocate { 1576sub size_allocate {
1470 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1471 1578
1579 delete $self->{ox};
1580
1472 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473} 1583}
1474 1584
1475sub set_fontsize { 1585sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1477 1587
1478 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1589 delete $self->{texture};
1480 1590
1481 $self->update; 1591 $self->realloc;
1482 $self->check_size;
1483} 1592}
1484 1593
1485sub _draw { 1594sub _draw {
1486 my ($self) = @_; 1595 my ($self) = @_;
1487 1596
… …
1493 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1606
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1499 1609
1610 unless (exists $self->{ox}) {
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1503 1614
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1618 };
1510 1619
1511 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513 1622
… …
1567sub set_text { 1676sub set_text {
1568 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1569 1678
1570 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1680 $self->_set_text ($text);
1572 $self->update; 1681
1573 $self->check_size; 1682 $self->realloc;
1574} 1683}
1575 1684
1576sub get_text { 1685sub get_text {
1577 $_[0]{text} 1686 $_[0]{text}
1578} 1687}
… …
1608 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1719 $self->_emit ('escape');
1611 } elsif ($uni) { 1720 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1613 } 1724 }
1614 1725
1615 $self->_set_text ($text); 1726 $self->_set_text ($text);
1616 $self->update; 1727
1617 $self->check_size; 1728 $self->realloc;
1729
1730 1
1618} 1731}
1619 1732
1620sub focus_in { 1733sub focus_in {
1621 my ($self) = @_; 1734 my ($self) = @_;
1622 1735
… …
1637 utf8::encode $text; 1750 utf8::encode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1639 1752
1640 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1641 $self->update; 1754 $self->update;
1755
1756 1
1642} 1757}
1643 1758
1644sub mouse_motion { 1759sub mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1646# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1647} 1764}
1648 1765
1649sub _draw { 1766sub _draw {
1650 my ($self) = @_; 1767 my ($self) = @_;
1651 1768
… …
1728 } else { 1845 } else {
1729 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1730 } 1847 }
1731 1848
1732 } else { 1849 } else {
1733 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1734 } 1853 1
1735
1736} 1854}
1737 1855
1738############################################################################# 1856#############################################################################
1739 1857
1740package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1749 1867
1750sub new { 1868sub new {
1751 my $class = shift; 1869 my $class = shift;
1752 1870
1753 $class->SUPER::new ( 1871 $class->SUPER::new (
1754 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1755 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1757 can_hover => 1, 1876 can_hover => 1,
1758 align => 0, 1877 align => 0,
1759 valign => 0, 1878 valign => 0,
… …
1768 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1769 1888
1770 $self->emit ("activate") 1889 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1891 && $y >= 0 && $y < $self->{h};
1892
1893 1
1773} 1894}
1774 1895
1775sub _draw { 1896sub _draw {
1776 my ($self) = @_; 1897 my ($self) = @_;
1777 1898
… …
1806 1927
1807sub new { 1928sub new {
1808 my $class = shift; 1929 my $class = shift;
1809 1930
1810 $class->SUPER::new ( 1931 $class->SUPER::new (
1811 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1812 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 1938 state => 0,
… …
1820} 1942}
1821 1943
1822sub size_request { 1944sub size_request {
1823 my ($self) = @_; 1945 my ($self) = @_;
1824 1946
1825 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1826} 1948}
1827 1949
1828sub button_down { 1950sub button_down {
1829 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1830 1952
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1835 } 1961 1
1836} 1962}
1837 1963
1838sub _draw { 1964sub _draw {
1839 my ($self) = @_; 1965 my ($self) = @_;
1840 1966
1841 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1842 1968
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 1970
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 1974
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 1976
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 1978
… …
2115 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2247 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2122 vertical => 0, 2250 vertical => 0,
2123 can_hover => 1, 2251 can_hover => 1,
2124 inner_pad => 0.02, 2252 inner_pad => 0.02,
2125 @_ 2253 @_
2126 ); 2254 );
… …
2129 $self->update; 2257 $self->update;
2130 2258
2131 $self 2259 $self
2132} 2260}
2133 2261
2262sub changed { }
2263
2134sub set_range { 2264sub set_range {
2135 my ($self, $range) = @_; 2265 my ($self, $range) = @_;
2136 2266
2137 $self->{range} = $range; 2267 ($range, $self->{range}) = ($self->{range}, $range);
2138 2268
2139 $self->update; 2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2140} 2271}
2141 2272
2142sub set_value { 2273sub set_value {
2143 my ($self, $value) = @_; 2274 my ($self, $value) = @_;
2144 2275
… …
2163} 2294}
2164 2295
2165sub size_request { 2296sub size_request {
2166 my ($self) = @_; 2297 my ($self) = @_;
2167 2298
2168 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2300}
2173 2301
2174sub button_down { 2302sub button_down {
2175 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2176 2304
2177 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2178 2306
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2308
2181 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2182} 2310}
2183 2311
2184sub mouse_motion { 2312sub mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2186 2314
… …
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2319
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2321
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2195 } 2327 1
2196} 2328}
2197 2329
2198sub update { 2330sub update {
2199 my ($self) = @_; 2331 my ($self) = @_;
2200 2332
… …
2527 2659
2528sub new { 2660sub new {
2529 my $class = shift; 2661 my $class = shift;
2530 2662
2531 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2532 state => 0, 2664 state => 0,
2533 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2534 @_ 2666 @_
2535 ); 2667 );
2536 2668
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2669 $self
2543} 2670}
2544 2671
2545sub toggle_flopper { 2672sub toggle_flopper {
2546 my ($self) = @_; 2673 my ($self) = @_;
2547 2674
2548 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2676}
2560 2677
2561############################################################################# 2678#############################################################################
2562 2679
2563package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2576} 2693}
2577 2694
2578sub set_tooltip_from { 2695sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2580 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2581 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2710 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2712 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 2724
2599sub size_allocate { 2725sub size_allocate {
2600 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2601 2727
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2603} 2747}
2604 2748
2605sub _draw { 2749sub _draw {
2606 my ($self) = @_; 2750 my ($self) = @_;
2607 2751
… …
2624 glVertex $w, $h; 2768 glVertex $w, $h;
2625 glVertex $w, 0; 2769 glVertex $w, 0;
2626 glEnd; 2770 glEnd;
2627 2771
2628 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2629 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2630} 2775}
2631 2776
2632############################################################################# 2777#############################################################################
2633 2778
… …
2709 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2710} 2855}
2711 2856
2712############################################################################# 2857#############################################################################
2713 2858
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846
2847#############################################################################
2848
2849package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
2850 2860
2851our @ISA = CFClient::UI::FancyFrame::; 2861our @ISA = CFClient::UI::FancyFrame::;
2852 2862
2853use CFClient::OpenGL; 2863use CFClient::OpenGL;
… …
2891 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self; 2902 $GRAB = $self;
2893 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2894 2904
2895 $self->show; 2905 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897} 2907}
2898 2908
2899sub mouse_motion { 2909sub mouse_motion {
2900 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2901 2911
2902 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2905} 2917}
2906 2918
2907sub button_up { 2919sub button_up {
2908 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2909 2921
… …
2911 undef $GRAB; 2923 undef $GRAB;
2912 $self->hide; 2924 $self->hide;
2913 2925
2914 $self->_emit ("popdown"); 2926 $self->_emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2916 } 2932 1
2917} 2933}
2918 2934
2919############################################################################# 2935#############################################################################
2920 2936
2921package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
… …
3026 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
3027} 3043}
3028 3044
3029############################################################################# 3045#############################################################################
3030 3046
3031package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
3032 3048
3033our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
3034
3035use CFClient::OpenGL;
3036 3050
3037sub new { 3051sub new {
3038 my $class = shift; 3052 my $class = shift;
3039 3053
3040 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3041 @_, 3056 @_,
3042 ) 3057 );
3043}
3044 3058
3045sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
3046 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3047 3213
3048 $self->{w} = $w; 3214 $self->clear_command_list;
3049 $self->{h} = $h; 3215 $self->{recording} = 0;
3050} 3216 $self->{rec_btn}->set_text ("start recording");
3051 3217
3052sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
3053 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
3054 3236
3055 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
3056 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
3057} 3360}
3058 3361
3059sub size_request { 3362sub size_request {
3060 my ($self) = @_; 3363 my ($self) = @_;
3061 3364
3062 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
3063} 3380}
3064 3381
3065sub size_allocate { 3382sub size_allocate {
3066 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
3067 3384
3068 for my $child ($self->children) { 3385 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070 3387
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
3072 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3073 3390
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
3075 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3393
3080 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
3081 } 3395 }
3082} 3396}
3083 3397
… …
3094} 3408}
3095 3409
3096sub update { 3410sub update {
3097 my ($self) = @_; 3411 my ($self) = @_;
3098 3412
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
3101} 3414}
3102 3415
3103sub add { 3416sub add {
3104 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
3105 3418
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3419 $_->{is_toplevel} = 1
3114 3420 for @children;
3115 # integerise window positions
3116 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y};
3118 }
3119 3421
3120 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3121} 3423}
3122 3424
3123sub remove { 3425sub remove {
3124 my ($self, @children) = @_; 3426 my ($self, @children) = @_;
3125 3427
3126 $self->SUPER::remove (@children); 3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3127 3432
3128 while (@children) { 3433 while (@children) {
3129 my $w = pop @children; 3434 my $w = pop @children;
3130 push @children, $w->children; 3435 push @children, $w->children;
3131 $w->set_invisible; 3436 $w->set_invisible;
… …
3150 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3151 $_->() 3456 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3153 } 3458 }
3154 3459
3155 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3156 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
3157 3464
3158 for (;;) { 3465 outer:
3159 if ($self->{check_size}) { 3466 while () {
3160 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
3162 for values %{delete $self->{check_size}} 3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3163 } 3475 }
3164 3476
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
3166 3479
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
3168 ? @$widget{qw(user_w user_h)} 3481 and last;
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3175 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3177 3500
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3179 3502
3180 $widget->{parent}->check_size
3181 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3182 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3183 } 3513 }
3184 } 3514 }
3185 3515
3186 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3188 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3189 3524
3190 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3192 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3193 $widget->{w} = $w; 3535 $widget->{w} = $w;
3194 $widget->{h} = $h; 3536 $widget->{h} = $h;
3537
3195 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3196 } 3540 }
3197 } 3541 }
3198 3542
3199 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3200 $_->() 3544 $_->()
3201 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3202 } 3546 }
3547
3203 3548
3204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3207 3552
… …
3209 glLoadIdentity; 3554 glLoadIdentity;
3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3212 glLoadIdentity; 3557 glLoadIdentity;
3213 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
3214 $self->_draw; 3566 $self->_draw;
3215} 3567}
3216 3568
3217############################################################################# 3569#############################################################################
3218 3570

Diff Legend

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