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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
97 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
99 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
192 reconfigure_widgets; 210 reconfigure_widgets;
193} 211}
194 212
195############################################################################# 213#############################################################################
196 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
197package CFClient::UI::Base; 223package CFPlus::UI::Base;
198 224
199use strict; 225use strict;
200 226
201use CFClient::OpenGL; 227use CFPlus::OpenGL;
202 228
203sub new { 229sub new {
204 my $class = shift; 230 my $class = shift;
205 231
206 my $self = bless { 232 my $self = bless {
… …
211 h => undef, 237 h => undef,
212 can_events => 1, 238 can_events => 1,
213 @_ 239 @_
214 }, $class; 240 }, $class;
215 241
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 243
218 for (keys %$self) { 244 for (keys %$self) {
219 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
221 } 247 }
222 } 248 }
223 249
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 255
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 258
233 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
238 264
239sub destroy { 265sub destroy {
240 my ($self) = @_; 266 my ($self) = @_;
241 267
242 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
243 %$self = (); 270 %$self = ();
244} 271}
245 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
246sub show { 277sub show {
247 my ($self) = @_; 278 my ($self) = @_;
248 279
249 return if $self->{parent}; 280 return if $self->{parent};
250 281
251 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
252} 283}
253 284
254sub set_visible { 285sub set_visible {
255 my ($self) = @_; 286 my ($self) = @_;
256 287
… …
271 302
272 return unless $self->{visible}; 303 return unless $self->{visible};
273 304
274 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
275 306
307 delete $self->{visible};
276 delete $self->{root}; 308 delete $self->{root};
277 delete $self->{visible};
278 309
279 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
281 312
282 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
284 315
285 $self->focus_out; 316 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
289 319
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
314} 344}
315 345
316sub move_abs { 346sub move_abs {
317 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
318 348
319 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
322 352
323 $self->update; 353 $self->update;
324} 354}
325 355
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
366 400
367 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
368 } 402 }
369} 403}
370 404
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 405sub children {
376 # nop 406 # nop
377} 407}
378 408
379sub visible_children { 409sub visible_children {
… …
381} 411}
382 412
383sub set_max_size { 413sub set_max_size {
384 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
385 415
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
388} 420}
389 421
390sub set_tooltip { 422sub set_tooltip {
391 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
392 424
… …
395 427
396 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
397 429
398 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
399 431
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 435 }
404} 436}
405 437
406# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
407sub coord2local { 439sub coord2local {
408 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
409 441
442 Carp::confess unless $self->{parent};#d#
443
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 445}
412 446
413# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
414sub coord2global { 448sub coord2global {
415 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
416 450
451 Carp::confess unless $self->{parent};#d#
452
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 454}
419 455
420sub focus_in { 456sub invoke_focus_in {
421 my ($self) = @_; 457 my ($self) = @_;
422 458
423 return if $FOCUS == $self; 459 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
425 461
426 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
427 463
428 $self->_emit (focus_in => $focus); 464 $self->update;
429 465
430 $focus->update if $focus; 466 0
431 $FOCUS->update;
432} 467}
433 468
434sub focus_out { 469sub invoke_focus_out {
435 my ($self) = @_; 470 my ($self) = @_;
436 471
437 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
438 473
439 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
440 475
441 $self->_emit (focus_out => $focus); 476 $self->update;
442 477
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447}
448 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
449sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 492sub invoke_button_up { 0 }
451sub key_down { 0 } 493sub invoke_key_down { 0 }
452sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
453 496
454sub button_down { 497sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
456 499
457 $self->focus_in; 500 $self->grab_focus;
458 501
459 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
460} 550}
461 551
462sub find_widget { 552sub find_widget {
463 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
464 554
… …
472} 562}
473 563
474sub set_parent { 564sub set_parent {
475 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
476 566
477 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
506 573
… …
539 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
540 607
541 # update screen rectangle 608 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 611
547 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 615
… …
573 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
576 glEnd; 641 glEnd;
577 glPopMatrix; 642 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 } 644 }
580 645
581 $self->_draw; 646 $self->_draw;
582 glPopMatrix; 647 glPopMatrix;
583} 648}
… …
586 my ($self) = @_; 651 my ($self) = @_;
587 652
588 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
589} 654}
590 655
656my $cntx;#d#
591sub DESTROY { 657sub DESTROY {
592 my ($self) = @_; 658 my ($self) = @_;
593 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
594 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
595 #$self->deactivate;
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
768 my ($self, $child) = @_; 846 my ($self, $child) = @_;
769 847
770 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
773} 850}
774 851
775sub remove { 852sub remove {
776 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
777 854
778 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
779 856
780 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
781 unless @{$self->{children}}; 858 unless @{$self->{children}};
782} 859}
783 860
784sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
785 862
786sub size_request { 863sub size_request {
787 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
788} 865}
789 866
790sub size_allocate { 867sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
792 869
793 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
794} 873}
795 874
796############################################################################# 875#############################################################################
797 876
798# back-buffered drawing area 877# back-buffered drawing area
799 878
800package CFClient::UI::Window; 879package CFPlus::UI::Window;
801 880
802our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
803 882
804use CFClient::OpenGL; 883use CFPlus::OpenGL;
805 884
806sub new { 885sub new {
807 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
808 887
809 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
814 893
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 895 $self->SUPER::update;
817} 896}
818 897
819sub size_allocate { 898sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
821 900
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
824} 904}
825 905
826sub _render { 906sub _render {
827 my ($self) = @_; 907 my ($self) = @_;
828 908
… …
830} 910}
831 911
832sub render_child { 912sub render_child {
833 my ($self) = @_; 913 my ($self) = @_;
834 914
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
838 918
839 { 919 {
840 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
841 921
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
844 } 926 }
845
846 $self->_render;
847 }; 927 };
848} 928}
849 929
850sub _draw { 930sub _draw {
851 my ($self) = @_; 931 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 932
855 my $tex = $self->{texture} 933 my $tex = $self->{texture}
856 or return; 934 or return;
857 935
858 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
868} 943}
869 944
870############################################################################# 945#############################################################################
871 946
872package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
873 948
949use List::Util qw(min max);
950
874our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
875 952
876sub new { 953sub new {
877 my $class = shift; 954 my $class = shift;
878 955
879 $class->SUPER::new ( 956 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 969 $h = 10 if $self->{scroll_y};
893 970
894 ($w, $h) 971 ($w, $h)
895} 972}
896 973
897sub size_allocate { 974sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 975 my ($self, $w, $h) = @_;
899 976
900 my $child = $self->child; 977 my $child = $self->child;
901 978
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 981
905 $self->child->configure (0, 0, $w, $h); 982 $self->child->configure (0, 0, $w, $h);
906 $self->update; 983 $self->update;
984
985 1
907} 986}
908 987
909sub set_offset { 988sub set_offset {
910 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
911 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
912 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
913 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
914 997
998 $self->emit (changed => $x, $y);
915 $self->update; 999 $self->update;
1000 }
916} 1001}
917 1002
918# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local { 1004sub coord2local {
920 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1024 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1026 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1028 }
944} 1029}
945 1030
946sub _render { 1031sub _render {
947 my ($self) = @_; 1032 my ($self) = @_;
948 1033
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1036
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1038
954 $self->SUPER::_render; 1039 $self->SUPER::_render;
955} 1040}
956 1041
957############################################################################# 1042#############################################################################
958 1043
959package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
960 1045
961our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
962 1047
963sub new { 1048sub new {
964 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
965 1050
966 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
967 1052
968 my $self; 1053 my $self;
969 1054
970 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1065 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1067 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1070 },
976 ; 1071 ;
977 1072
978 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
980 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
981 %arg, 1081 %arg,
982 ); 1082 );
983 1083
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
985 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
986 1101
987 $self 1102 $self
988} 1103}
1104
1105#TODO# update range on size_allocate depending on child
989 1106
990sub add { 1107sub add {
991 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
992 1109
993 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
994} 1111}
995 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
996sub update { 1137sub update {
997 my ($self) = @_; 1138 my ($self) = @_;
998 1139
1140 $self->update_slider;
999 $self->SUPER::update; 1141 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1142}
1005 1143
1144sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_;
1146
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev);
1150
1151 1
1152}
1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
1156
1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1006sub size_allocate { 1197sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1008 1199
1200 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1202}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1203
1018############################################################################# 1204#############################################################################
1019 1205
1020package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1021 1207
1022our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1023 1209
1024use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1025 1211
1026sub new { 1212sub new {
1027 my $class = shift; 1213 my $class = shift;
1028 1214
1029 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1056} 1242}
1057 1243
1058############################################################################# 1244#############################################################################
1059 1245
1060package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1061 1247
1062our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1063 1249
1064use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1251
1074sub new { 1252sub new {
1075 my ($class, %arg) = @_; 1253 my ($class, %arg) = @_;
1076 1254
1077 my $title = delete $arg{title}; 1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1351
1352my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1354 mipmap => 1, wrap => 1;
1355
1356my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1364sub new {
1365 my ($class, %arg) = @_;
1078 1366
1079 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1369 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1370 border => 0.6,
1083 can_events => 1, 1371 can_events => 1,
1084 min_w => 16, 1372 min_w => 64,
1085 min_h => 16, 1373 min_h => 32,
1086 %arg, 1374 %arg,
1087 ); 1375 );
1088 1376
1089 $self->{title} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1378 align => 0,
1091 valign => 1, 1379 valign => 1,
1092 text => $title, 1380 text => $self->{title},
1093 fontsize => $self->{border} 1381 fontsize => $self->{border},
1094 if defined $title; 1382 if exists $self->{title};
1383
1384 if ($self->{has_close_button}) {
1385 $self->{close_button} =
1386 new CFPlus::UI::ImageButton
1387 path => 'x1_close.png',
1388 on_activate => sub { $self->emit ("delete") };
1389
1390 $self->CFPlus::UI::Container::add ($self->{close_button});
1391 }
1095 1392
1096 $self 1393 $self
1097} 1394}
1098 1395
1099sub add { 1396sub add {
1100 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1101 1398
1102 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1402}
1105 1403
1106sub border { 1404sub border {
1107 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1108} 1406}
1109 1407
1110sub size_request { 1408sub size_request {
1111 my ($self) = @_; 1409 my ($self) = @_;
1112 1410
1113 $self->{title}->size_request 1411 $self->{title_widget}->size_request
1114 if $self->{title}; 1412 if $self->{title_widget};
1413
1414 $self->{close_button}->size_request
1415 if $self->{close_button};
1115 1416
1116 my ($w, $h) = $self->SUPER::size_request; 1417 my ($w, $h) = $self->SUPER::size_request;
1117 1418
1118 ( 1419 (
1119 $w + $self->border * 2, 1420 $w + $self->border * 2,
1120 $h + $self->border * 2, 1421 $h + $self->border * 2,
1121 ) 1422 )
1122} 1423}
1123 1424
1124sub size_allocate { 1425sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1426 my ($self, $w, $h) = @_;
1126 1427
1127 if ($self->{title}) { 1428 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1429 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1430 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1431 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1432 }
1132 1433
1133 my $border = $self->border; 1434 my $border = $self->border;
1134 1435
1135 $h -= List::Util::max 0, $border * 2; 1436 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1437 $w -= List::Util::max 0, $border * 2;
1438
1439 $self->child->configure ($border, $border, $w, $h);
1440
1441 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1442 if $self->{close_button};
1443
1444 1
1445}
1446
1447sub invoke_delete {
1448 my ($self) = @_;
1449
1450 $self->hide;
1137 1451
1138 $self->child->configure ($border, $border, $w, $h); 1452 1
1139} 1453}
1140 1454
1141sub button_down { 1455sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1456 my ($self, $ev, $x, $y) = @_;
1143 1457
1144 my ($w, $h) = @$self{qw(w h)}; 1458 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1459 my $border = $self->border;
1146 1460
… …
1177 1491
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1492 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1493
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1494 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1495 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1496 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1497 };
1184 } else { 1498 } else {
1185 return 0; 1499 return 0;
1186 } 1500 }
1187 1501
1188 1 1502 1
1189} 1503}
1190 1504
1191sub button_up { 1505sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1193 1507
1194 !!delete $self->{motion} 1508 ! ! delete $self->{motion}
1195} 1509}
1196 1510
1197sub mouse_motion { 1511sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1512 my ($self, $ev, $x, $y) = @_;
1199 1513
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1515
1202 !!$self->{motion} 1516 ! ! $self->{motion}
1517}
1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1203} 1525}
1204 1526
1205sub _draw { 1527sub _draw {
1206 my ($self) = @_; 1528 my ($self) = @_;
1207 1529
… …
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215 1537
1216 my $border = $self->border; 1538 my $border = $self->border;
1217 1539
1218 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1219 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1223 1559
1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1226 1562
1227 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1233 1569
1234 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1235 1571
1236 $child->draw; 1572 $child->draw;
1237 1573
1238 if ($self->{title}) { 1574 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1575 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1576 $self->{title_widget}->_draw;
1577
1578 glTranslate 0, - ($border - $self->{h});
1241 } 1579 }
1580
1581 $self->{close_button}->draw
1582 if $self->{close_button};
1242} 1583}
1243 1584
1244############################################################################# 1585#############################################################################
1245 1586
1246package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1247 1588
1248our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1249 1590
1250use List::Util qw(max sum); 1591use List::Util qw(max sum);
1251 1592
1252use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1253 1594
1254sub new { 1595sub new {
1255 my $class = shift; 1596 my $class = shift;
1256 1597
1257 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1258 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1259 @_, 1602 @_,
1260 ) 1603 )
1261} 1604}
1262 1605
1263sub children { 1606sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1608}
1266 1609
1610# TODO: store row/col info in child widget and use standard add/del
1267sub add { 1611sub add {
1268 my ($self, $x, $y, $child) = @_; 1612 my $self = shift;
1269 1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1620
1621 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1270 $child->set_parent ($self); 1624 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1626 }
1272 1627
1628 $self->{force_realloc} = 1;
1629 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1630 $self->realloc;
1631}
1632
1633sub remove {
1634 my ($self, $child) = @_;
1635
1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1274} 1641}
1275 1642
1276# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1644sub clear {
1278 my ($self) = @_; 1645 my ($self) = @_;
… …
1319 (sum @$ws), 1686 (sum @$ws),
1320 (sum @$hs), 1687 (sum @$hs),
1321 ) 1688 )
1322} 1689}
1323 1690
1324sub size_allocate { 1691sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1692 my ($self, $w, $h) = @_;
1326 1693
1327 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1328 1695
1329 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1331 1698
1332 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1336 1703
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1705
1341 CFClient::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1342 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1343 1715
1344 my $y; 1716 my $y;
1345 1717
1346 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1361 } 1733 }
1362 1734
1363 $y += $row_h; 1735 $y += $row_h;
1364 } 1736 }
1365 1737
1738 1
1366} 1739}
1367 1740
1368sub find_widget { 1741sub find_widget {
1369 my ($self, $x, $y) = @_; 1742 my ($self, $x, $y) = @_;
1370 1743
… …
1389 } 1762 }
1390} 1763}
1391 1764
1392############################################################################# 1765#############################################################################
1393 1766
1394package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1395 1768
1769use List::Util qw(min max);
1770
1396our @ISA = CFClient::UI::Container::; 1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1845}
1846
1847#############################################################################
1848
1849package CFPlus::UI::Box;
1850
1851our @ISA = CFPlus::UI::Container::;
1397 1852
1398sub size_request { 1853sub size_request {
1399 my ($self) = @_; 1854 my ($self) = @_;
1400 1855
1401 $self->{vertical} 1856 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1863 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1864 )
1410} 1865}
1411 1866
1412sub size_allocate { 1867sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1868 my ($self, $w, $h) = @_;
1414 1869
1415 my $space = $self->{vertical} ? $h : $w; 1870 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1871 my @children = $self->visible_children;
1417 1872
1418 my @req; 1873 my @req;
1419 1874
1420 if ($self->{homogeneous}) { 1875 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1876 @req = ($space / (@children || 1)) x @children;
1422 } else { 1877 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1878 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1879 my $req = List::Util::sum @req;
1425 1880
1426 if ($req > $space) { 1881 if ($req > $space) {
1427 # ah well, not enough space 1882 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1883 $_ *= $space / $req for @req;
1429 } else { 1884 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1885 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1886
1432 $space = ($space - $req) / $expand; # remaining space to give away 1887 $space = ($space - $req) / $expand; # remaining space to give away
1433 1888
1434 $req[$_] += $space * $children->[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1890 for 0 .. $#children;
1436 } 1891 }
1437 } 1892 }
1438 1893
1439 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1440 1895
1441 my $pos = 0; 1896 my $pos = 0;
1442 for (0 .. $#$children) { 1897 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1900
1446 $pos += $alloc; 1901 $pos += $alloc;
1447 } 1902 }
1448 1903
1449 1 1904 1
1450} 1905}
1451 1906
1452############################################################################# 1907#############################################################################
1453 1908
1454package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1455 1910
1456our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1457 1912
1458sub new { 1913sub new {
1459 my $class = shift; 1914 my $class = shift;
1460 1915
1461 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1464 ) 1919 )
1465} 1920}
1466 1921
1467############################################################################# 1922#############################################################################
1468 1923
1469package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1470 1925
1471our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1472 1927
1473sub new { 1928sub new {
1474 my $class = shift; 1929 my $class = shift;
1475 1930
1476 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1479 ) 1934 )
1480} 1935}
1481 1936
1482############################################################################# 1937#############################################################################
1483 1938
1484package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1485 1940
1486our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1487 1942
1488use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1489 1944
1490sub new { 1945sub new {
1491 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1492 1947
1493 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1951 #active_bg => none
1497 #font => default_font 1952 #font => default_font
1498 #text => initial text 1953 #text => initial text
1499 #markup => initial narkup 1954 #markup => initial narkup
1500 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1501 ellipsise => 3, # end 1957 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1959 fontsize => 1,
1504 align => -1, 1960 align => -1,
1505 valign => -1, 1961 valign => -1,
1506 padding_x => 2, 1962 padding_x => 2,
1507 padding_y => 2, 1963 padding_y => 2,
1508 can_events => 0, 1964 can_events => 0,
1509 %arg 1965 %arg
1510 ); 1966 );
1511 1967
1512 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1971 $self->{template} = $layout;
1516 } 1972 }
1517 1973
1518 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1522 } 1978 }
1523 1979
1524 $self 1980 $self
1525} 1981}
1526 1982
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1983sub update {
1538 my ($self) = @_; 1984 my ($self) = @_;
1539 1985
1540 delete $self->{texture}; 1986 delete $self->{texture};
1541 $self->SUPER::update; 1987 $self->SUPER::update;
1542} 1988}
1543 1989
1990sub realloc {
1991 my ($self) = @_;
1992
1993 delete $self->{ox};
1994 $self->SUPER::realloc;
1995}
1996
1544sub set_text { 1997sub set_text {
1545 my ($self, $text) = @_; 1998 my ($self, $text) = @_;
1546 1999
1547 return if $self->{text} eq "T$text"; 2000 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 2001 $self->{text} = "T$text";
1549 2002
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 2003 $self->{layout}->set_text ($text);
1552 2004
2005 delete $self->{size_req};
1553 $self->realloc; 2006 $self->realloc;
1554 $self->update; 2007 $self->update;
1555} 2008}
1556 2009
1557sub set_markup { 2010sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 2013 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 2014 $self->{text} = "M$markup";
1562 2015
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2016 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 2017
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 2018 $self->{layout}->set_markup ($markup);
1567 2019
2020 delete $self->{size_req};
1568 $self->realloc; 2021 $self->realloc;
1569 $self->update; 2022 $self->update;
1570} 2023}
1571 2024
1572sub size_request { 2025sub size_request {
1573 my ($self) = @_; 2026 my ($self) = @_;
1574 2027
2028 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2029 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 2030 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2031 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2032 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2033 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 2034
1581 my ($w, $h) = $self->{layout}->size; 2035 my ($w, $h) = $self->{layout}->size;
1582 2036
1583 if (exists $self->{template}) { 2037 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 2038 $self->{template}->set_font ($self->{font}) if $self->{font};
2039 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2040 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 2041
1587 my ($w2, $h2) = $self->{template}->size; 2042 my ($w2, $h2) = $self->{template}->size;
1588 2043
1589 $w = List::Util::max $w, $w2; 2044 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 2045 $h = List::Util::max $h, $h2;
2046 }
2047
2048 [$w, $h]
1591 } 2049 };
1592 2050
1593 ($w, $h) 2051 @{ $self->{size_req} }
1594} 2052}
1595 2053
2054sub baseline_shift {
2055 $_[0]{layout}->descent
2056}
2057
1596sub size_allocate { 2058sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 2059 my ($self, $w, $h) = @_;
1598 2060
1599 delete $self->{ox}; 2061 delete $self->{ox};
1600 2062
1601 delete $self->{texture} 2063 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2064 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2065
2066 1
1603} 2067}
1604 2068
1605sub set_fontsize { 2069sub set_fontsize {
1606 my ($self, $fontsize) = @_; 2070 my ($self, $fontsize) = @_;
1607 2071
1608 $self->{fontsize} = $fontsize; 2072 $self->{fontsize} = $fontsize;
2073 delete $self->{size_req};
1609 delete $self->{texture}; 2074 delete $self->{texture};
1610 2075
1611 $self->realloc; 2076 $self->realloc;
1612} 2077}
1613 2078
2079sub reconfigure {
2080 my ($self) = @_;
2081
2082 delete $self->{size_req};
2083 delete $self->{texture};
2084
2085 $self->SUPER::reconfigure;
2086}
2087
1614sub _draw { 2088sub _draw {
1615 my ($self) = @_; 2089 my ($self) = @_;
1616 2090
1617 $self->SUPER::_draw; # draw background, if applicable 2091 $self->SUPER::_draw; # draw background, if applicable
1618 2092
1619 my $tex = $self->{texture} ||= do { 2093 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 2094 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2095 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 2096 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2097 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2098 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2099 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 2100
1627 new_from_layout CFClient::Texture $self->{layout} 2101 [$self->{layout}->size]
1628 }; 2102 };
1629 2103
1630 unless (exists $self->{ox}) { 2104 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2105 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2106 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 2107 : ($self->{w} - $size->[0]) * 0.5);
1634 2108
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 2111 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 2112 };
1639 2113
1640 glEnable GL_TEXTURE_2D; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 2116
1643 if ($tex->{format} == GL_ALPHA) { 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1644 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646 } else {
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648 }
1649
1650 glDisable GL_TEXTURE_2D;
1651} 2118}
1652 2119
1653############################################################################# 2120#############################################################################
1654 2121
1655package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1656 2123
1657our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1658 2125
1659use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1660 2127
1661sub new { 2128sub new {
1662 my $class = shift; 2129 my $class = shift;
1663 2130
1664 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1668 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1669 can_hover => 1, 2136 can_hover => 1,
1670 can_focus => 1, 2137 can_focus => 1,
1671 valign => 0, 2138 valign => 0,
1672 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1673 #text => ... 2141 #text => ...
2142 #hidden => "*",
1674 @_ 2143 @_
1675 ) 2144 )
1676} 2145}
1677 2146
1678sub _set_text { 2147sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 2154 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 2155 $self->{text} = $text;
1687 2156
1688 $text =~ s/./*/g if $self->{hidden}; 2157 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 2158 $self->{layout}->set_text ("$text ");
2159 delete $self->{size_req};
1690 2160
1691 $self->_emit (changed => $self->{text}); 2161 $self->emit (changed => $self->{text});
2162
2163 $self->realloc;
1692 $self->update; 2164 $self->update;
1693} 2165}
1694 2166
1695sub set_text { 2167sub set_text {
1696 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
1697 2169
1698 $self->{cursor} = length $text; 2170 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 2171 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 2172}
1703 2173
1704sub get_text { 2174sub get_text {
1705 $_[0]{text} 2175 $_[0]{text}
1706} 2176}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 2181 my ($w, $h) = $self->SUPER::size_request;
1712 2182
1713 ($w + 1, $h) # add 1 for cursor 2183 ($w + 1, $h) # add 1 for cursor
1714} 2184}
1715 2185
1716sub key_down { 2186sub invoke_key_down {
1717 my ($self, $ev) = @_; 2187 my ($self, $ev) = @_;
1718 2188
1719 my $mod = $ev->{mod}; 2189 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1722 2192
1723 my $text = $self->get_text; 2193 my $text = $self->get_text;
2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1724 2196
1725 if ($uni == 8) { 2197 if ($uni == 8) {
1726 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1728 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1729 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1730 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1731 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1732 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1733 } elsif ($sym == CFClient::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1734 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 2221 $self->emit ('escape');
1739 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 2226 } else {
1742 return 0; 2227 return 0;
1743 } 2228 }
1744 2229
1745 $self->_set_text ($text); 2230 $self->_set_text ($text);
1746 2231
1747 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1748 2234
1749 1 2235 1
1750} 2236}
1751 2237
1752sub focus_in { 2238sub invoke_focus_in {
1753 my ($self) = @_; 2239 my ($self) = @_;
1754 2240
1755 $self->{last_activity} = $::NOW; 2241 $self->{last_activity} = $::NOW;
1756 2242
1757 $self->SUPER::focus_in; 2243 $self->SUPER::invoke_focus_in
1758} 2244}
1759 2245
1760sub button_down { 2246sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 2247 my ($self, $ev, $x, $y) = @_;
1762 2248
1763 $self->SUPER::button_down ($ev, $x, $y); 2249 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 2250
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 2251 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 2252
1767 # byte-index to char-index 2253 # byte-index to char-index
1768 my $text = $self->{text}; 2254 my $text = $self->{text};
1769 utf8::encode $text; 2255 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 2256 $self->{cursor} = length $text;
1771 2257
1772 $self->_set_text ($self->{text}); 2258 $self->_set_text ($self->{text});
1773 $self->update; 2259 $self->update;
1774 2260
1775 1 2261 1
1776} 2262}
1777 2263
1778sub mouse_motion { 2264sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2266# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 2267
1782 0 2268 1
1783} 2269}
1784 2270
1785sub _draw { 2271sub _draw {
1786 my ($self) = @_; 2272 my ($self) = @_;
1787 2273
… …
1814 utf8::encode $text; 2300 utf8::encode $text;
1815 2301
1816 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1817 } 2303 }
1818 2304
1819 glColor @{$self->{fg}};
1820 glBegin GL_LINES; 2305 glBegin GL_LINES;
1821 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1822 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1823 glEnd; 2308 glEnd;
1824 } 2309 }
1825} 2310}
1826 2311
2312#############################################################################
2313
1827package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1828 2315
1829our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1830 2317
1831use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1832 2319
1833sub key_down { 2320sub invoke_key_down {
1834 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1835 2322
1836 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1837 2324
1838 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1839 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
2328
1841 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 2331 $self->emit (activate => $txt);
1844 $self->update; 2332 $self->update;
1845 2333
1846 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1849 } 2337 }
1850 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1851 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1853 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1854 } 2342 }
1855 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1856 } 2344 }
1857 2345
1858 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1859 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1860 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861 2349
1862 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1863 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1864 } else { 2352 } else {
1865 $self->set_text ($self->{history_saveback}); 2353 $self->set_text ($self->{history_saveback});
1866 } 2354 }
1867 2355
1868 } else { 2356 } else {
1869 return $self->SUPER::key_down ($ev) 2357 return $self->SUPER::invoke_key_down ($ev)
1870 } 2358 }
1871 2359
1872 1 2360 1
1873} 2361}
1874 2362
1875############################################################################# 2363#############################################################################
1876 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
1877package CFClient::UI::Button; 2404package CFPlus::UI::Button;
1878 2405
1879our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
1880 2407
1881use CFClient::OpenGL; 2408use CFPlus::OpenGL;
1882 2409
1883my @tex = 2410my @tex =
1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1885 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
1886 2413
1887sub new { 2414sub new {
1888 my $class = shift; 2415 my $class = shift;
1889 2416
1890 $class->SUPER::new ( 2417 $class->SUPER::new (
1891 padding_x => 4, 2418 padding_x => 4,
1892 padding_y => 4, 2419 padding_y => 4,
1893 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
1894 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
1895 can_hover => 1, 2422 can_hover => 1,
1896 align => 0, 2423 align => 0,
1897 valign => 0, 2424 valign => 0,
1898 can_events => 1, 2425 can_events => 1,
1899 @_ 2426 @_
1900 ) 2427 )
1901} 2428}
1902 2429
1903sub activate { }
1904
1905sub button_up { 2430sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
1907 2432
1908 $self->emit ("activate") 2433 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2434 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2435 && $y >= 0 && $y < $self->{h};
… …
1913} 2438}
1914 2439
1915sub _draw { 2440sub _draw {
1916 my ($self) = @_; 2441 my ($self) = @_;
1917 2442
1918 local $self->{fg} = $self->{fg}; 2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 2444
1924 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
1927 2448
2449 my $tex = $tex[$GRAB == $self];
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 2451
1930 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
1931 2453
1932 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
1933} 2455}
1934 2456
1935############################################################################# 2457#############################################################################
1936 2458
1937package CFClient::UI::CheckBox; 2459package CFPlus::UI::CheckBox;
1938 2460
1939our @ISA = CFClient::UI::DrawBG::; 2461our @ISA = CFPlus::UI::DrawBG::;
1940 2462
1941my @tex = 2463my @tex =
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944 2466
1945use CFClient::OpenGL; 2467use CFPlus::OpenGL;
1946 2468
1947sub new { 2469sub new {
1948 my $class = shift; 2470 my $class = shift;
1949 2471
1950 $class->SUPER::new ( 2472 $class->SUPER::new (
… …
1964 my ($self) = @_; 2486 my ($self) = @_;
1965 2487
1966 (6) x 2 2488 (6) x 2
1967} 2489}
1968 2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
1969sub button_down { 2499sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2500 my ($self, $ev, $x, $y) = @_;
1971 2501
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2504 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2505 } else {
1977 return 0 2506 return 0
1978 } 2507 }
1979 2508
1980 1 2509 1
… …
2000 glDisable GL_TEXTURE_2D; 2529 glDisable GL_TEXTURE_2D;
2001} 2530}
2002 2531
2003############################################################################# 2532#############################################################################
2004 2533
2005package CFClient::UI::Image; 2534package CFPlus::UI::Image;
2006 2535
2007our @ISA = CFClient::UI::Base::; 2536our @ISA = CFPlus::UI::Base::;
2008 2537
2009use CFClient::OpenGL; 2538use CFPlus::OpenGL;
2010use Carp qw/confess/;
2011 2539
2012our %loaded_images; 2540our %texture_cache;
2013 2541
2014sub new { 2542sub new {
2015 my $class = shift; 2543 my $class = shift;
2016 2544
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 @_,
2548 );
2018 2549
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2550 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required";
2020 2552
2021 $loaded_images{$self->{image}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2023 2555
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2025 2557
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2559
2030 $self 2560 $self
2031} 2561}
2032 2562
2563sub STORABLE_freeze {
2564 my ($self, $cloning) = @_;
2565
2566 $self->{path}
2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2568
2569 $self->{path}
2570}
2571
2572sub STORABLE_attach {
2573 my ($self, $cloning, $path) = @_;
2574
2575 $self->new (path => $path)
2576}
2577
2033sub size_request { 2578sub size_request {
2034 my ($self) = @_; 2579 my ($self) = @_;
2035 2580
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2581 ($self->{tex}{w}, $self->{tex}{h})
2037} 2582}
2038 2583
2039sub _draw { 2584sub _draw {
2040 my ($self) = @_; 2585 my ($self) = @_;
2041 2586
… …
2051 } 2596 }
2052 2597
2053 glEnable GL_TEXTURE_2D; 2598 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2600
2056 $tex->draw_quad_alpha (0, 0, $w, $h); 2601 $tex->draw_quad (0, 0, $w, $h);
2057 2602
2058 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2059} 2604}
2060 2605
2061############################################################################# 2606#############################################################################
2062 2607
2608package CFPlus::UI::ImageButton;
2609
2610our @ISA = CFPlus::UI::Image::;
2611
2612use CFPlus::OpenGL;
2613
2614my %textures;
2615
2616sub new {
2617 my $class = shift;
2618
2619 my $self = $class->SUPER::new (
2620 padding_x => 4,
2621 padding_y => 4,
2622 fg => [1, 1, 1],
2623 active_fg => [0, 0, 1],
2624 can_hover => 1,
2625 align => 0,
2626 valign => 0,
2627 can_events => 1,
2628 @_
2629 );
2630}
2631
2632sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 $self->emit ("activate")
2636 if $x >= 0 && $x < $self->{w}
2637 && $y >= 0 && $y < $self->{h};
2638
2639 1
2640}
2641
2642#############################################################################
2643
2063package CFClient::UI::VGauge; 2644package CFPlus::UI::VGauge;
2064 2645
2065our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2066 2647
2067use List::Util qw(min max); 2648use List::Util qw(min max);
2068 2649
2069use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2070 2651
2071my %tex = ( 2652my %tex = (
2072 food => [ 2653 food => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075 ], 2656 ],
2076 grace => [ 2657 grace => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2079 ], 2660 ],
2080 hp => [ 2661 hp => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083 ], 2664 ],
2084 mana => [ 2665 mana => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2087 ], 2668 ],
2088); 2669);
2089 2670
2090# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2731 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2732 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2733
2153 my $h1 = $self->{h} * (1 - $ycut1); 2734 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2735 my $h2 = $self->{h} * (1 - $ycut2);
2736 my $h3 = $self->{h};
2737
2738 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2739
2156 glEnable GL_BLEND; 2740 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2741 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2742 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2743 glEnable GL_TEXTURE_2D;
… …
2178 2762
2179 if ($t3) { 2763 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2764 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2765 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2766 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2767 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2768 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2769 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2770 glEnd;
2187 } 2771 }
2188 2772
2189 glDisable GL_BLEND; 2773 glDisable GL_BLEND;
2190 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2191} 2775}
2192 2776
2193############################################################################# 2777#############################################################################
2194 2778
2195package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2196 2780
2197our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2198 2782
2199sub new { 2783sub new {
2200 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2201 2785
2202 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2204 can_hover => 1, 2788 can_hover => 1,
2205 can_events => 1, 2789 can_events => 1,
2206 %arg, 2790 %arg,
2207 ); 2791 );
2208 2792
2209 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2210 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2211 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2212 2796
2213 $self 2797 $self
2214} 2798}
2215 2799
2216sub set_fontsize { 2800sub set_fontsize {
… …
2237 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2238} 2822}
2239 2823
2240############################################################################# 2824#############################################################################
2241 2825
2242package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2243 2827
2244use strict; 2828use strict;
2245 2829
2246use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2247 2831
2248our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2249 2833
2250my @tex = 2834my @tex =
2251 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2252 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2253 2837
2254sub new { 2838sub new {
2255 my $class = shift; 2839 my $class = shift;
2256 2840
… …
2277 $self->update; 2861 $self->update;
2278 2862
2279 $self 2863 $self
2280} 2864}
2281 2865
2282sub changed { }
2283
2284sub set_range { 2866sub set_range {
2285 my ($self, $range) = @_; 2867 my ($self, $range) = @_;
2286 2868
2287 ($range, $self->{range}) = ($self->{range}, $range); 2869 ($range, $self->{range}) = ($self->{range}, $range);
2288 2870
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2871 if ("@$range" ne "@{$self->{range}}") {
2872 $self->update;
2873 $self->set_value ($self->{range}[0]);
2874 }
2291} 2875}
2292 2876
2293sub set_value { 2877sub set_value {
2294 my ($self, $value) = @_; 2878 my ($self, $value) = @_;
2295 2879
… …
2306 if $unit; 2890 if $unit;
2307 2891
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2892 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2893
2310 if ($value != $old_value) { 2894 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2895 $self->emit (changed => $value);
2312 $self->update; 2896 $self->update;
2313 } 2897 }
2314} 2898}
2315 2899
2316sub size_request { 2900sub size_request {
2317 my ($self) = @_; 2901 my ($self) = @_;
2318 2902
2319 ($self->{req_w}, $self->{req_h}) 2903 ($self->{req_w}, $self->{req_h})
2320} 2904}
2321 2905
2322sub button_down { 2906sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2907 my ($self, $ev, $x, $y) = @_;
2324 2908
2325 $self->SUPER::button_down ($ev, $x, $y); 2909 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2910
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2912
2329 $self->mouse_motion ($ev, $x, $y) 2913 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2914}
2331 2915
2332sub mouse_motion { 2916sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2917 my ($self, $ev, $x, $y) = @_;
2334 2918
2335 if ($GRAB == $self) { 2919 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2920 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2921
… …
2343 } else { 2927 } else {
2344 return 0; 2928 return 0;
2345 } 2929 }
2346 2930
2347 1 2931 1
2932}
2933
2934sub invoke_mouse_wheel {
2935 my ($self, $ev) = @_;
2936
2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942
2943 ! ! $delta
2348} 2944}
2349 2945
2350sub update { 2946sub update {
2351 my ($self) = @_; 2947 my ($self) = @_;
2352 2948
… …
2401 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2402} 2998}
2403 2999
2404############################################################################# 3000#############################################################################
2405 3001
2406package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2407 3003
2408our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2409 3005
2410sub new { 3006sub new {
2411 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2412 3008
2413 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2414 3010
2415 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2416 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2417 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2418 to_value => sub { shift }, 3014 to_value => sub { shift },
2419 from_value => sub { shift }, 3015 from_value => sub { shift },
2420 %arg, 3016 %arg,
2421 ); 3017 );
2422 3018
… …
2442sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2444 3040
2445############################################################################# 3041#############################################################################
2446 3042
2447package CFClient::UI::TextView; 3043package CFPlus::UI::TextScroller;
2448 3044
2449our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2450 3046
2451use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2452 3048
2453sub new { 3049sub new {
2454 my $class = shift; 3050 my $class = shift;
2455 3051
2456 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
2457 fontsize => 1, 3053 fontsize => 1,
2458 can_events => 0, 3054 can_events => 1,
3055 indent => 0,
2459 #font => default_font 3056 #font => default_font
2460 @_, 3057 @_,
2461 3058
2462 layout => (new CFClient::Layout 1), 3059 layout => (new CFPlus::Layout),
2463 par => [], 3060 par => [],
3061 max_par => 0,
2464 height => 0, 3062 height => 0,
2465 children => [ 3063 children => [
2466 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2468 ], 3066 ],
2469 ); 3067 );
2470 3068
2471 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2472 3070
… …
2478 3076
2479 $self->{fontsize} = $fontsize; 3077 $self->{fontsize} = $fontsize;
2480 $self->reflow; 3078 $self->reflow;
2481} 3079}
2482 3080
3081sub size_request {
3082 my ($self) = @_;
3083
3084 my ($empty, $slider) = @{ $self->{children} };
3085
3086 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request
3088}
3089
2483sub size_allocate { 3090sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 3091 my ($self, $w, $h) = @_;
2485 3092
2486 $self->SUPER::size_allocate ($w, $h); 3093 my ($empty, $slider, @other) = @{ $self->{children} };
3094 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 3095
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3096 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3097 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 3098 $self->{layout}->set_width ($empty->{w});
3099 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 3100
2492 $self->reflow; 3101 $self->reflow;
2493}
2494 3102
2495sub text_size { 3103 local $self->{children} = [$empty, $slider];
3104 $self->SUPER::invoke_size_allocate ($w, $h)
3105}
3106
3107sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 3108 my ($self, $ev) = @_;
3109
3110 return 0 unless $ev->{dy}; # only vertical movements
3111
3112 $self->{children}[1]->emit (mouse_wheel => $ev);
3113
3114 1
3115}
3116
3117sub get_layout {
3118 my ($self, $para) = @_;
2497 3119
2498 my $layout = $self->{layout}; 3120 my $layout = $self->{layout};
2499 3121
3122 $layout->set_font ($self->{font}) if $self->{font};
3123 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3124 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 3125 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3126 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 3127 $layout->set_markup ($para->{markup});
3128
3129 $layout->set_shapes (
3130 map
3131 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3132 @{$para->{widget}}
2503 3133 );
3134
2504 $layout->size 3135 $layout
2505} 3136}
2506 3137
2507sub reflow { 3138sub reflow {
2508 my ($self) = @_; 3139 my ($self) = @_;
2509 3140
… …
2516 3147
2517 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2518 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2519} 3150}
2520 3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
3165}
3166
2521sub clear { 3167sub clear {
2522 my ($self) = @_; 3168 my ($self) = @_;
3169
3170 my (undef, undef, @other) = @{ $self->{children} };
3171 $self->remove ($_) for @other;
2523 3172
2524 $self->{par} = []; 3173 $self->{par} = [];
2525 $self->{height} = 0; 3174 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 3176}
2528 3177
2529sub add_paragraph { 3178sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 3179 my $self = shift;
2531 3180
2532 for my $line (split /\n/, $text) { 3181 for my $para (@_) {
2533 my ($w, $h) = $self->text_size ($line); 3182 $para = {
3183 fg => [1, 1, 1, 1],
3184 indent => 0,
3185 markup => "",
3186 widget => [],
3187 ref $para ? %$para : (markup => $para),
3188 w => 1e10,
3189 wrapped => 1,
3190 };
3191
3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
3199
3200 $self->{need_reflow}++;
3201 $self->update;
3202}
3203
3204sub scroll_to_bottom {
3205 my ($self) = @_;
3206
3207 $self->{scroll_to} = $#{$self->{par}};
3208 $self->update;
3209}
3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
2534 $self->{height} += $h; 3233 $self->{height} = $height;
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2536 }
2537 3235
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
2539} 3242}
2540 3243
2541sub update { 3244sub update {
2542 my ($self) = @_; 3245 my ($self) = @_;
2543 3246
… …
2545 3248
2546 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2547 3250
2548 delete $self->{texture}; 3251 delete $self->{texture};
2549 3252
2550 $ROOT->on_post_alloc ($self, sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 3257
2553 if (delete $self->{need_reflow}) {
2554 my $height = 0;
2555
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h;
2567 }
2568
2569 $height += $_->[1];
2570 }
2571
2572 $self->{height} = $height;
2573
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575
2576 delete $self->{texture};
2577 }
2578
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 3259 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2582 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2583 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2584 3271
2585 my $y0 = $top; 3272 my $y0 = $top;
2586 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2587 3274
2588 my $y = 0;
2589
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593
2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598 for my $par (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2600 3278
2601 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 3280 my $layout = $self->get_layout ($para);
2603 $layout->set_width ($W - $par->[3]);
2604 $layout->set_markup ($par->[4]);
2605 3281
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3282 $layout->render ($para->{indent}, $y - $y0);
2607 3283
2608 glRasterPos $par->[3], $y - $y0; 3284 if (my @w = @{ $para->{widget} }) {
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3285 my @s = $layout->get_shapes;
3286
3287 for (@w) {
3288 my ($dx, $dy) = splice @s, 0, 2, ();
3289
3290 $_->{x} = $dx + $para->{indent};
3291 $_->{y} = $dy + $y - $y0;
3292
3293 $_->draw;
3294 }
3295 }
2610 } 3296 }
2611 3297
2612 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2613 } 3300 }
2614 3301
2615 glDisable GL_BLEND; 3302 $self->{top_paragraph} = $top_paragraph;
2616 }; 3303 };
2617 }); 3304 });
2618} 3305}
2619 3306
3307sub reconfigure {
3308 my ($self) = @_;
3309
3310 $self->SUPER::reconfigure;
3311
3312 $_->{w} = 1e10 for @{ $self->{par} };
3313 $self->reflow;
3314}
3315
2620sub _draw { 3316sub _draw {
2621 my ($self) = @_; 3317 my ($self) = @_;
2622 3318
2623 glEnable GL_TEXTURE_2D; 3319 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 3321 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 3323 glDisable GL_TEXTURE_2D;
2628 3324
2629 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2630
2631} 3326}
2632 3327
2633############################################################################# 3328#############################################################################
2634 3329
2635package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2636 3331
2637use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2638 3333
2639our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2640 3335
2641sub moveto { 3336sub moveto {
2642 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2643 3338
2644 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2672 glPopMatrix; 3367 glPopMatrix;
2673} 3368}
2674 3369
2675############################################################################# 3370#############################################################################
2676 3371
2677package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2678 3373
2679our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2680 3375
2681sub new { 3376sub new {
2682 my $class = shift; 3377 my $class = shift;
2683 3378
2684 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2696 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2697} 3392}
2698 3393
2699############################################################################# 3394#############################################################################
2700 3395
2701package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2702 3397
2703our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2704 3399
2705use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2706 3401
2707sub new { 3402sub new {
2708 my $class = shift; 3403 my $class = shift;
2709 3404
2710 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2713 ) 3408 )
2714} 3409}
2715 3410
2716sub set_tooltip_from { 3411sub set_tooltip_from {
2717 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2718 3416
2719 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2720 3418
2721 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 3422 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 3423 . "visible $widget->{visible}";
2726 } 3424 }
2727 3425
3426 $tooltip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//;
3428
2728 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2729 markup => $tooltip, 3430 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 3432 fontsize => 0.8,
2732 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2733 ellipsise => 0, 3434 ellipsise => 0,
2734 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2735 ); 3436 );
2736} 3437}
2737 3438
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 3443
2743 ($w + 4, $h + 4) 3444 ($w + 4, $h + 4)
2744} 3445}
2745 3446
2746sub size_allocate { 3447sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 3448 my ($self, $w, $h) = @_;
2748 3449
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 3450 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 3451}
2751 3452
2752sub visibility_change { 3453sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 3454 my ($self, $visible) = @_;
2754 3455
2755 return unless $visible; 3456 return unless $visible;
2756 3457
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 3458 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner} 3459 my $widget = $self->{owner}
2759 or return; 3460 or return;
2760 3461
3462 if ($widget->{visible}) {
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3463 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 3464
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3465 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 3466 if $x + $self->{w} > $self->{root}{w};
2765 3467
2766 $self->move_abs ($x, $y); 3468 $self->move_abs ($x, $y);
3469 } else {
3470 $self->hide;
3471 }
2767 }); 3472 });
2768} 3473}
2769 3474
2770sub _draw { 3475sub _draw {
2771 my ($self) = @_; 3476 my ($self) = @_;
… …
2795 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
2796} 3501}
2797 3502
2798############################################################################# 3503#############################################################################
2799 3504
2800package CFClient::UI::Face; 3505package CFPlus::UI::Face;
2801 3506
2802our @ISA = CFClient::UI::Base::; 3507our @ISA = CFPlus::UI::DrawBG::;
2803 3508
2804use CFClient::OpenGL; 3509use CFPlus::OpenGL;
2805 3510
2806sub new { 3511sub new {
2807 my $class = shift; 3512 my $class = shift;
2808 3513
2809 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
2810 aspect => 1, 3517 aspect => 1,
2811 can_events => 0, 3518 can_events => 0,
2812 @_, 3519 @_,
2813 ); 3520 );
2814 3521
2815 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
2816 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
2817 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2818 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
2819 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2820 hard => 1, 3528 parked => 1,
2821 interval => $self->{animspeed},
2822 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
2823 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
2824 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
2825 }, 3537 },
2826 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
2827 } 3542 }
2828 3543
2829 $self 3544 $self
2830} 3545}
2831 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
2832sub size_request { 3577sub size_request {
2833 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
2834} 3593}
2835 3594
2836sub update { 3595sub update {
2837 my ($self) = @_; 3596 my ($self) = @_;
2838 3597
2839 return unless $self->{visible}; 3598 return unless $self->{visible};
2840 3599
2841 $self->SUPER::update; 3600 $self->SUPER::update;
2842} 3601}
2843 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
2844sub _draw { 3611sub _draw {
2845 my ($self) = @_; 3612 my ($self) = @_;
2846 3613
2847 return unless $::CONN; 3614 return unless $::CONN;
2848 3615
2849 my $face; 3616 $self->SUPER::_draw;
2850 3617
2851 if ($self->{frame}) {
2852 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
2853 3619 or return;
2854 $face = $anim->[ $self->{frame} % @$anim ]
2855 if $anim && @$anim;
2856 }
2857 3620
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
2859 3622
2860 if ($tex) { 3623 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3626 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3628 glDisable GL_TEXTURE_2D;
2866 } 3629 }
2867} 3630}
2868 3631
2869sub DESTROY { 3632sub destroy {
2870 my ($self) = @_; 3633 my ($self) = @_;
2871 3634
2872 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
2873 if $self->{timer}; 3636 if $self->{timer};
2874 3637
2875 $self->SUPER::DESTROY; 3638 $self->SUPER::destroy;
2876} 3639}
2877 3640
2878############################################################################# 3641#############################################################################
2879 3642
2880package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
2881 3644
2882our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
2883 3646
2884# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
2885 3648
2886############################################################################# 3649#############################################################################
2887 3650
2888package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
2889 3652
2890our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
2891 3654
2892use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2893 3656
2894sub new { 3657sub new {
2895 my $class = shift; 3658 my $class = shift;
2896 3659
2897 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
2898 items => [], 3661 items => [],
2899 z => 100, 3662 z => 100,
2900 @_, 3663 @_,
2901 ); 3664 );
2902 3665
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2904 3667
2905 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
2907 3670
2908 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
2909 if (!ref $widget) { 3672 if (!ref $widget) {
3673 if ($widget =~ /\t/) {
3674 my ($left, $right) = split /\t/, $widget, 2;
3675
2910 $widget = new CFClient::UI::Label 3676 $widget = new CFPlus::UI::HBox
2911 can_hover => 1, 3677 can_hover => 1,
2912 can_events => 1, 3678 can_events => 1,
3679 tooltip => $tooltip,
3680 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ],
3684 ;
3685
3686 } else {
3687 $widget = new CFPlus::UI::Label
3688 can_hover => 1,
3689 can_events => 1,
2913 text => $widget; 3690 markup => $widget,
3691 tooltip => $tooltip;
3692 }
2914 } 3693 }
2915 3694
2916 $self->{item}{$widget} = $item; 3695 $self->{item}{$widget} = $item;
2917 3696
2918 $self->{vbox}->add ($widget); 3697 $self->{vbox}->add ($widget);
… …
2923 3702
2924# popup given the event (must be a mouse button down event currently) 3703# popup given the event (must be a mouse button down event currently)
2925sub popup { 3704sub popup {
2926 my ($self, $ev) = @_; 3705 my ($self, $ev) = @_;
2927 3706
2928 $self->_emit ("popdown"); 3707 $self->emit ("popdown");
2929 3708
2930 # maybe save $GRAB? must be careful about events... 3709 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3710 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3711 $self->{button} = $ev->{button};
2933 3712
2934 $self->show; 3713 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3714 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3715}
2937 3716
2938sub mouse_motion { 3717sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3718 my ($self, $ev, $x, $y) = @_;
2940 3719
2941 # TODO: should use vbox->find_widget or so 3720 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3721 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3722 $self->{hover} = $self->{item}{$HOVER};
2944 3723
2945 0 3724 0
2946} 3725}
2947 3726
2948sub button_up { 3727sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3728 my ($self, $ev, $x, $y) = @_;
2950 3729
2951 if ($ev->{button} == $self->{button}) { 3730 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3731 undef $GRAB;
2953 $self->hide; 3732 $self->hide;
2954 3733
2955 $self->_emit ("popdown"); 3734 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3735 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3736 } else {
2958 return 0 3737 return 0
2959 } 3738 }
2960 3739
2961 1 3740 1
2962} 3741}
2963 3742
2964############################################################################# 3743#############################################################################
2965 3744
2966package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
2967 3746
2968our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
2969 3748
2970sub new { 3749sub new {
2971 my $class = shift; 3750 my $class = shift;
2972 3751
2973 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
2987 3766
2988 $self->{current} = $self->{children}[0] 3767 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3768 if @{ $self->{children} };
2990} 3769}
2991 3770
3771sub get_current_page {
3772 my ($self) = @_;
3773
3774 $self->{current}
3775}
3776
2992sub set_current_page { 3777sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3778 my ($self, $page_or_widget) = @_;
2994 3779
2995 my $widget = ref $page_or_widget 3780 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3781 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3782 : $self->{children}[$page_or_widget];
2998 3783
2999 $self->{current} = $widget; 3784 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3785 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3786
3002 $self->_emit (page_changed => $self->{current}); 3787 $self->emit (page_changed => $self->{current});
3003 3788
3004 $self->realloc; 3789 $self->realloc;
3005} 3790}
3006 3791
3007sub visible_children { 3792sub visible_children {
… …
3012 my ($self) = @_; 3797 my ($self) = @_;
3013 3798
3014 $self->{current}->size_request 3799 $self->{current}->size_request
3015} 3800}
3016 3801
3017sub size_allocate { 3802sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3019 3804
3020 $self->{current}->configure (0, 0, $w, $h); 3805 $self->{current}->configure (0, 0, $w, $h);
3806
3807 1
3021} 3808}
3022 3809
3023sub _draw { 3810sub _draw {
3024 my ($self) = @_; 3811 my ($self) = @_;
3025 3812
3026 $self->{current}->draw; 3813 $self->{current}->draw;
3027} 3814}
3028 3815
3029############################################################################# 3816#############################################################################
3030 3817
3031package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3032 3819
3033our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3034 3821
3035sub new { 3822sub new {
3036 my $class = shift; 3823 my $class = shift;
3037 3824
3038 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3042 @_, 3829 @_,
3043 ); 3830 );
3044 3831
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3049} 3836}
3050 3837
3051sub add { 3838sub add {
3052 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3053 3840
3054 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3055 3842
3056 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3057 markup => $title, 3844 markup => $title,
3058 tooltip => $tooltip, 3845 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3060 ); 3847 );
3061 3848
3062 $self->{multiplexer}->add ($widget); 3849 $self->{multiplexer}->add ($widget);
3063} 3850}
3064 3851
3852sub get_current_page {
3853 my ($self) = @_;
3854
3855 $self->{multiplexer}->get_current_page
3856}
3857
3065sub set_current_page { 3858sub set_current_page {
3066 my ($self, $page) = @_; 3859 my ($self, $page) = @_;
3067 3860
3068 $self->{multiplexer}->set_current_page ($page); 3861 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3863}
3071 3864
3072############################################################################# 3865#############################################################################
3073 3866
3074package CFClient::UI::Statusbox; 3867package CFPlus::UI::Selector;
3075 3868
3869use utf8;
3870
3076our @ISA = CFClient::UI::VBox::; 3871our @ISA = CFPlus::UI::Button::;
3077 3872
3078sub new { 3873sub new {
3079 my $class = shift; 3874 my $class = shift;
3080 3875
3081 $class->SUPER::new ( 3876 my $self = $class->SUPER::new (
3877 options => [], # [value, title, longdesc], ...
3878 value => undef,
3879 @_,
3880 );
3881
3882 $self->_set_value ($self->{value});
3883
3884 $self
3885}
3886
3887sub invoke_button_down {
3888 my ($self, $ev) = @_;
3889
3890 my @menu_items;
3891
3892 for (@{ $self->{options} }) {
3893 my ($value, $title, $tooltip) = @$_;
3894
3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3896 }
3897
3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3899}
3900
3901sub _set_value {
3902 my ($self, $value) = @_;
3903
3904 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3905 or return;
3906
3907 $self->{value} = $item->[0];
3908 $self->set_markup ("$item->[1] ⇓");
3909 $self->set_tooltip ($item->[2]);
3910}
3911
3912sub set_value {
3913 my ($self, $value) = @_;
3914
3915 return unless $self->{value} ne $value;
3916
3917 $self->_set_value ($value);
3918 $self->emit (changed => $value);
3919}
3920
3921#############################################################################
3922
3923package CFPlus::UI::Statusbox;
3924
3925our @ISA = CFPlus::UI::VBox::;
3926
3927sub new {
3928 my $class = shift;
3929
3930 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3931 fontsize => 0.8,
3083 @_, 3932 @_,
3084 ) 3933 );
3934
3935 CFPlus::weaken (my $this = $self);
3936
3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3938
3939 $self
3085} 3940}
3086 3941
3087sub reorder { 3942sub reorder {
3088 my ($self) = @_; 3943 my ($self) = @_;
3089 my $NOW = time; 3944 my $NOW = Time::HiRes::time;
3945
3946 # freeze display when hovering over any label
3947 return if $CFPlus::UI::TOOLTIP->{owner}
3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3949 values %{ $self->{item} };
3090 3950
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3953 }
3094 3954
… …
3097 my @items = sort { 3957 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3958 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3959 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3960 } values %{ $self->{item} };
3101 3961
3962 $self->{timer}->interval (1);
3963
3102 my $count = 10 + 1; 3964 my $count = 10 + 1;
3103 for my $item (@items) { 3965 for my $item (@items) {
3104 last unless --$count; 3966 last unless --$count;
3105 3967
3106 push @widgets, $item->{label} ||= do { 3968 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3969 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3970 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3971 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3972 : $item->{text};
3111 3973
3112 for ($short) { 3974 for ($short) {
3113 s/^\s+//; 3975 s/^\s+//;
3114 s/\s+/ /g; 3976 s/\s+/ /g;
3115 } 3977 }
3116 3978
3117 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3118 markup => $short, 3980 markup => $short,
3119 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3985 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3986 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3987 can_events => 1,
3126 can_hover => 1 3988 can_hover => 1
3127 }; 3989 };
3990
3991 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3992 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3993 $label->update;
3994 $label->set_max_size (undef, $label->{req_h} * $diff)
3995 if $diff < 1;
3996 $self->{timer}->interval (1/30);
3997 } else {
3998 $label->{fg}[3] = $item->{fg}[3] || 1;
3999 }
4000
4001 push @widgets, $label;
3128 } 4002 }
3129 4003
3130 $self->clear; 4004 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 4005 $self->SUPER::add (reverse @widgets);
3132} 4006}
… …
3137 $text =~ s/^\s+//; 4011 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 4012 $text =~ s/\s+$//;
3139 4013
3140 return unless $text; 4014 return unless $text;
3141 4015
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 4016 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 4017
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4018 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 4019
3146 if (my $item = $self->{item}{$group}) { 4020 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 4021 if ($item->{text} eq $text) {
3148 $item->{count}++; 4022 $item->{count}++;
3149 } else { 4023 } else {
3150 $item->{count} = 1; 4024 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 4025 $item->{text} = $item->{tooltip} = $text;
3152 } 4026 }
3153 $item->{id} = ++$self->{id}; 4027 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 4028 $item->{timeout} = $timeout;
3155 delete $item->{label}; 4029 delete $item->{label};
3156 } else { 4030 } else {
3157 $self->{item}{$group} = { 4031 $self->{item}{$group} = {
3158 id => ++$self->{id}, 4032 id => ++$self->{id},
… …
3164 count => 1, 4038 count => 1,
3165 %arg, 4039 %arg,
3166 }; 4040 };
3167 } 4041 }
3168 4042
4043 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 4044 $self->reorder;
4045 });
3170} 4046}
3171 4047
3172sub reconfigure { 4048sub reconfigure {
3173 my ($self) = @_; 4049 my ($self) = @_;
3174 4050
… …
3177 4053
3178 $self->reorder; 4054 $self->reorder;
3179 $self->SUPER::reconfigure; 4055 $self->SUPER::reconfigure;
3180} 4056}
3181 4057
4058sub destroy {
4059 my ($self) = @_;
4060
4061 $self->{timer}->cancel;
4062
4063 $self->SUPER::destroy;
4064}
4065
3182############################################################################# 4066#############################################################################
3183 4067
3184package CFClient::UI::Inventory;
3185
3186our @ISA = CFClient::UI::ScrolledWindow::;
3187
3188sub new {
3189 my $class = shift;
3190
3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3433 @_,
3434 )
3435}
3436
3437# XXX: Do sorting? Argl...
3438sub add_spell {
3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3441
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root; 4068package CFPlus::UI::Root;
3480 4069
3481our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3482 4071
4072use List::Util qw(min max);
4073
3483use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3484 4075
3485sub new { 4076sub new {
3486 my $class = shift; 4077 my $class = shift;
3487 4078
3488 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3489 visible => 1, 4080 visible => 1,
3490 @_, 4081 @_,
3491 ); 4082 );
3492 4083
3493 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3494 4085
3495 $self 4086 $self
3496} 4087}
3497 4088
3498sub size_request { 4089sub size_request {
… …
3513 $coord = $max - $size if $coord > $max - $size; 4104 $coord = $max - $size if $coord > $max - $size;
3514 4105
3515 int $coord + 0.5 4106 int $coord + 0.5
3516} 4107}
3517 4108
3518sub size_allocate { 4109sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 4110 my ($self, $w, $h) = @_;
3520 4111
3521 for my $child ($self->children) { 4112 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4113 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 4114
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 4118 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 4119 $Y = _to_pixel $Y, $H, $self->{h};
3529 4120
3530 $child->configure ($X, $Y, $W, $H); 4121 $child->configure ($X, $Y, $W, $H);
3531 } 4122 }
4123
4124 1
3532} 4125}
3533 4126
3534sub coord2local { 4127sub coord2local {
3535 my ($self, $x, $y) = @_; 4128 my ($self, $x, $y) = @_;
3536 4129
… …
3621 4214
3622 delete $queue{$widget+0}; 4215 delete $queue{$widget+0};
3623 4216
3624 my ($w, $h) = $widget->size_request; 4217 my ($w, $h) = $widget->size_request;
3625 4218
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4219 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4220 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4221
4222 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4223 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 4224
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 4225 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 4226 $h = $widget->{force_h} if exists $widget->{force_h};
3631 4227
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4228 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 4256
3661 $w = 0 if $w < 0; 4257 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 4258 $h = 0 if $h < 0;
3663 4259
4260 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h;
4262
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268
3664 $w = int $w + 0.5; 4269 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 4270 $h = int $h + 0.5;
3666 4271
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w}; 4273 $widget->{old_w} = $widget->{w};
… …
3678 4283
3679 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3680 $_->() 4285 $_->()
3681 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3682 } 4287 }
3683
3684 4288
3685 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3687 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3688 4292
… …
3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3693 glLoadIdentity; 4297 glLoadIdentity;
3694 4298
3695 { 4299 {
3696 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3697 4301
3698 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3700 }
3701 4304
3702 $self->_draw; 4305 $self->_draw;
4306 }
3703} 4307}
3704 4308
3705############################################################################# 4309#############################################################################
3706 4310
3707package CFClient::UI; 4311package CFPlus::UI;
3708 4312
3709$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3710$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3711 4315
37121 43161
3713 4317

Diff Legend

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