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.382 by root, Thu Jul 19 19:58:56 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
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
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (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 (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 (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
996sub update { 1137sub update {
997 my ($self) = @_; 1138 my ($self) = @_;
998 1139
999 $self->SUPER::update; 1140 $self->SUPER::update;
1000 1141 $self->update_slider;
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 while (@_) {
1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1616 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1618 }
1272 1619
1620 $self->{force_realloc} = 1;
1621 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1622 $self->realloc;
1623}
1624
1625sub remove {
1626 my ($self, $child) = @_;
1627
1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1274} 1633}
1275 1634
1276# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1636sub clear {
1278 my ($self) = @_; 1637 my ($self) = @_;
… …
1319 (sum @$ws), 1678 (sum @$ws),
1320 (sum @$hs), 1679 (sum @$hs),
1321 ) 1680 )
1322} 1681}
1323 1682
1324sub size_allocate { 1683sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1684 my ($self, $w, $h) = @_;
1326 1685
1327 my ($ws, $hs) = $self->get_wh; 1686 my ($ws, $hs) = $self->get_wh;
1328 1687
1329 my $req_w = (sum @$ws) || 1; 1688 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1689 my $req_h = (sum @$hs) || 1;
1331 1690
1332 # TODO: nicer code && do row_expand 1691 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1692 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1693 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1694 my $col_expand = (sum @col_expand) || 1;
1336 1695
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1697
1341 CFClient::UI::harmonize $ws; 1698 CFPlus::UI::harmonize $ws;
1699
1700 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1;
1703
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705
1342 CFClient::UI::harmonize $hs; 1706 CFPlus::UI::harmonize $hs;
1343 1707
1344 my $y; 1708 my $y;
1345 1709
1346 for my $r (0 .. $#{$self->{children}}) { 1710 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1711 my $row = $self->{children}[$r]
… …
1361 } 1725 }
1362 1726
1363 $y += $row_h; 1727 $y += $row_h;
1364 } 1728 }
1365 1729
1730 1
1366} 1731}
1367 1732
1368sub find_widget { 1733sub find_widget {
1369 my ($self, $x, $y) = @_; 1734 my ($self, $x, $y) = @_;
1370 1735
… …
1389 } 1754 }
1390} 1755}
1391 1756
1392############################################################################# 1757#############################################################################
1393 1758
1394package CFClient::UI::Box; 1759package CFPlus::UI::Fixed;
1395 1760
1761use List::Util qw(min max);
1762
1396our @ISA = CFClient::UI::Container::; 1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1837}
1838
1839#############################################################################
1840
1841package CFPlus::UI::Box;
1842
1843our @ISA = CFPlus::UI::Container::;
1397 1844
1398sub size_request { 1845sub size_request {
1399 my ($self) = @_; 1846 my ($self) = @_;
1400 1847
1401 $self->{vertical} 1848 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1854 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1855 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1856 )
1410} 1857}
1411 1858
1412sub size_allocate { 1859sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1860 my ($self, $w, $h) = @_;
1414 1861
1415 my $space = $self->{vertical} ? $h : $w; 1862 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1863 my @children = $self->visible_children;
1417 1864
1418 my @req; 1865 my @req;
1419 1866
1420 if ($self->{homogeneous}) { 1867 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1868 @req = ($space / (@children || 1)) x @children;
1422 } else { 1869 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1870 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1871 my $req = List::Util::sum @req;
1425 1872
1426 if ($req > $space) { 1873 if ($req > $space) {
1427 # ah well, not enough space 1874 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1875 $_ *= $space / $req for @req;
1429 } else { 1876 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1877 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1878
1432 $space = ($space - $req) / $expand; # remaining space to give away 1879 $space = ($space - $req) / $expand; # remaining space to give away
1433 1880
1434 $req[$_] += $space * $children->[$_]{expand} 1881 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1882 for 0 .. $#children;
1436 } 1883 }
1437 } 1884 }
1438 1885
1439 CFClient::UI::harmonize \@req; 1886 CFPlus::UI::harmonize \@req;
1440 1887
1441 my $pos = 0; 1888 my $pos = 0;
1442 for (0 .. $#$children) { 1889 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1890 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1891 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1892
1446 $pos += $alloc; 1893 $pos += $alloc;
1447 } 1894 }
1448 1895
1449 1 1896 1
1450} 1897}
1451 1898
1452############################################################################# 1899#############################################################################
1453 1900
1454package CFClient::UI::HBox; 1901package CFPlus::UI::HBox;
1455 1902
1456our @ISA = CFClient::UI::Box::; 1903our @ISA = CFPlus::UI::Box::;
1457 1904
1458sub new { 1905sub new {
1459 my $class = shift; 1906 my $class = shift;
1460 1907
1461 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1464 ) 1911 )
1465} 1912}
1466 1913
1467############################################################################# 1914#############################################################################
1468 1915
1469package CFClient::UI::VBox; 1916package CFPlus::UI::VBox;
1470 1917
1471our @ISA = CFClient::UI::Box::; 1918our @ISA = CFPlus::UI::Box::;
1472 1919
1473sub new { 1920sub new {
1474 my $class = shift; 1921 my $class = shift;
1475 1922
1476 $class->SUPER::new ( 1923 $class->SUPER::new (
… …
1479 ) 1926 )
1480} 1927}
1481 1928
1482############################################################################# 1929#############################################################################
1483 1930
1484package CFClient::UI::Label; 1931package CFPlus::UI::Label;
1485 1932
1486our @ISA = CFClient::UI::DrawBG::; 1933our @ISA = CFPlus::UI::DrawBG::;
1487 1934
1488use CFClient::OpenGL; 1935use CFPlus::OpenGL;
1489 1936
1490sub new { 1937sub new {
1491 my ($class, %arg) = @_; 1938 my ($class, %arg) = @_;
1492 1939
1493 my $self = $class->SUPER::new ( 1940 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1943 #active_bg => none
1497 #font => default_font 1944 #font => default_font
1498 #text => initial text 1945 #text => initial text
1499 #markup => initial narkup 1946 #markup => initial narkup
1500 #max_w => maximum pixel width 1947 #max_w => maximum pixel width
1948 #style => 0, # render flags
1501 ellipsise => 3, # end 1949 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1950 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1951 fontsize => 1,
1504 align => -1, 1952 align => -1,
1505 valign => -1, 1953 valign => -1,
1506 padding_x => 2, 1954 padding_x => 2,
1507 padding_y => 2, 1955 padding_y => 2,
1508 can_events => 0, 1956 can_events => 0,
1509 %arg 1957 %arg
1510 ); 1958 );
1511 1959
1512 if (exists $self->{template}) { 1960 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1961 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1962 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1963 $self->{template} = $layout;
1516 } 1964 }
1517 1965
1518 if (exists $self->{markup}) { 1966 if (exists $self->{markup}) {
… …
1522 } 1970 }
1523 1971
1524 $self 1972 $self
1525} 1973}
1526 1974
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1975sub update {
1538 my ($self) = @_; 1976 my ($self) = @_;
1539 1977
1540 delete $self->{texture}; 1978 delete $self->{texture};
1541 $self->SUPER::update; 1979 $self->SUPER::update;
1542} 1980}
1543 1981
1982sub realloc {
1983 my ($self) = @_;
1984
1985 delete $self->{ox};
1986 $self->SUPER::realloc;
1987}
1988
1544sub set_text { 1989sub set_text {
1545 my ($self, $text) = @_; 1990 my ($self, $text) = @_;
1546 1991
1547 return if $self->{text} eq "T$text"; 1992 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1993 $self->{text} = "T$text";
1549 1994
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1995 $self->{layout}->set_text ($text);
1552 1996
1997 delete $self->{size_req};
1553 $self->realloc; 1998 $self->realloc;
1554 $self->update; 1999 $self->update;
1555} 2000}
1556 2001
1557sub set_markup { 2002sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 2005 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 2006 $self->{text} = "M$markup";
1562 2007
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2008 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 2009
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 2010 $self->{layout}->set_markup ($markup);
1567 2011
2012 delete $self->{size_req};
1568 $self->realloc; 2013 $self->realloc;
1569 $self->update; 2014 $self->update;
1570} 2015}
1571 2016
1572sub size_request { 2017sub size_request {
1573 my ($self) = @_; 2018 my ($self) = @_;
1574 2019
2020 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2021 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 2022 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2023 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2024 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2025 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 2026
1581 my ($w, $h) = $self->{layout}->size; 2027 my ($w, $h) = $self->{layout}->size;
1582 2028
1583 if (exists $self->{template}) { 2029 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 2030 $self->{template}->set_font ($self->{font}) if $self->{font};
2031 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2032 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 2033
1587 my ($w2, $h2) = $self->{template}->size; 2034 my ($w2, $h2) = $self->{template}->size;
1588 2035
1589 $w = List::Util::max $w, $w2; 2036 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 2037 $h = List::Util::max $h, $h2;
2038 }
2039
2040 [$w, $h]
1591 } 2041 };
1592 2042
1593 ($w, $h) 2043 @{ $self->{size_req} }
1594} 2044}
1595 2045
2046sub baseline_shift {
2047 $_[0]{layout}->descent
2048}
2049
1596sub size_allocate { 2050sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 2051 my ($self, $w, $h) = @_;
1598 2052
1599 delete $self->{ox}; 2053 delete $self->{ox};
1600 2054
1601 delete $self->{texture} 2055 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2056 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2057
2058 1
1603} 2059}
1604 2060
1605sub set_fontsize { 2061sub set_fontsize {
1606 my ($self, $fontsize) = @_; 2062 my ($self, $fontsize) = @_;
1607 2063
1608 $self->{fontsize} = $fontsize; 2064 $self->{fontsize} = $fontsize;
2065 delete $self->{size_req};
1609 delete $self->{texture}; 2066 delete $self->{texture};
1610 2067
1611 $self->realloc; 2068 $self->realloc;
1612} 2069}
1613 2070
2071sub reconfigure {
2072 my ($self) = @_;
2073
2074 delete $self->{size_req};
2075 delete $self->{texture};
2076
2077 $self->SUPER::reconfigure;
2078}
2079
1614sub _draw { 2080sub _draw {
1615 my ($self) = @_; 2081 my ($self) = @_;
1616 2082
1617 $self->SUPER::_draw; # draw background, if applicable 2083 $self->SUPER::_draw; # draw background, if applicable
1618 2084
1619 my $tex = $self->{texture} ||= do { 2085 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 2086 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2087 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 2088 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2089 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2090 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 2092
1627 new_from_layout CFClient::Texture $self->{layout} 2093 [$self->{layout}->size]
1628 }; 2094 };
1629 2095
1630 unless (exists $self->{ox}) { 2096 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2097 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2098 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 2099 : ($self->{w} - $size->[0]) * 0.5);
1634 2100
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2101 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2102 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 2103 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 2104 };
1639 2105
1640 glEnable GL_TEXTURE_2D; 2106 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2107 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 2108
1643 if ($tex->{format} == GL_ALPHA) { 2109 $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} 2110}
1652 2111
1653############################################################################# 2112#############################################################################
1654 2113
1655package CFClient::UI::EntryBase; 2114package CFPlus::UI::EntryBase;
1656 2115
1657our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1658 2117
1659use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1660 2119
1661sub new { 2120sub new {
1662 my $class = shift; 2121 my $class = shift;
1663 2122
1664 $class->SUPER::new ( 2123 $class->SUPER::new (
… …
1668 active_fg => [0, 0, 0], 2127 active_fg => [0, 0, 0],
1669 can_hover => 1, 2128 can_hover => 1,
1670 can_focus => 1, 2129 can_focus => 1,
1671 valign => 0, 2130 valign => 0,
1672 can_events => 1, 2131 can_events => 1,
2132 ellipsise => 0,
1673 #text => ... 2133 #text => ...
2134 #hidden => "*",
1674 @_ 2135 @_
1675 ) 2136 )
1676} 2137}
1677 2138
1678sub _set_text { 2139sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 2146 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 2147 $self->{text} = $text;
1687 2148
1688 $text =~ s/./*/g if $self->{hidden}; 2149 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 2150 $self->{layout}->set_text ("$text ");
2151 delete $self->{size_req};
1690 2152
1691 $self->_emit (changed => $self->{text}); 2153 $self->emit (changed => $self->{text});
2154
2155 $self->realloc;
1692 $self->update; 2156 $self->update;
1693} 2157}
1694 2158
1695sub set_text { 2159sub set_text {
1696 my ($self, $text) = @_; 2160 my ($self, $text) = @_;
1697 2161
1698 $self->{cursor} = length $text; 2162 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 2163 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 2164}
1703 2165
1704sub get_text { 2166sub get_text {
1705 $_[0]{text} 2167 $_[0]{text}
1706} 2168}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 2173 my ($w, $h) = $self->SUPER::size_request;
1712 2174
1713 ($w + 1, $h) # add 1 for cursor 2175 ($w + 1, $h) # add 1 for cursor
1714} 2176}
1715 2177
1716sub key_down { 2178sub invoke_key_down {
1717 my ($self, $ev) = @_; 2179 my ($self, $ev) = @_;
1718 2180
1719 my $mod = $ev->{mod}; 2181 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 2182 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 2183 my $uni = $ev->{unicode};
1722 2184
1723 my $text = $self->get_text; 2185 my $text = $self->get_text;
2186
2187 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1724 2188
1725 if ($uni == 8) { 2189 if ($uni == 8) {
1726 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727 } elsif ($uni == 127) { 2191 } elsif ($uni == 127) {
1728 substr $text, $self->{cursor}, 1, ""; 2192 substr $text, $self->{cursor}, 1, "";
1729 } elsif ($sym == CFClient::SDLK_LEFT) { 2193 } elsif ($sym == CFPlus::SDLK_LEFT) {
1730 --$self->{cursor} if $self->{cursor}; 2194 --$self->{cursor} if $self->{cursor};
1731 } elsif ($sym == CFClient::SDLK_RIGHT) { 2195 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1732 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2196 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1733 } elsif ($sym == CFClient::SDLK_HOME) { 2197 } elsif ($sym == CFPlus::SDLK_HOME) {
2198 # what a hack
2199 $self->{cursor} =
2200 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2201 ? length $1
2202 : 0;
2203 } elsif ($sym == CFPlus::SDLK_END) {
2204 # uh, again
2205 $self->{cursor} =
2206 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2207 ? $self->{cursor} + length $1
2208 : length $self->{text};
2209 } elsif ($uni == 21) { # ctrl-u
2210 $text = "";
1734 $self->{cursor} = 0; 2211 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 2212 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 2213 $self->emit ('escape');
1739 } elsif ($uni) { 2214 } elsif ($uni == 0x0d) {
2215 substr $text, $self->{cursor}++, 0, "\012";
2216 } elsif ($uni >= 0x20) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 2217 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 2218 } else {
1742 return 0; 2219 return 0;
1743 } 2220 }
1744 2221
1745 $self->_set_text ($text); 2222 $self->_set_text ($text);
1746 2223
1747 $self->realloc; 2224 $self->realloc;
2225 $self->update;
1748 2226
1749 1 2227 1
1750} 2228}
1751 2229
1752sub focus_in { 2230sub invoke_focus_in {
1753 my ($self) = @_; 2231 my ($self) = @_;
1754 2232
1755 $self->{last_activity} = $::NOW; 2233 $self->{last_activity} = $::NOW;
1756 2234
1757 $self->SUPER::focus_in; 2235 $self->SUPER::invoke_focus_in
1758} 2236}
1759 2237
1760sub button_down { 2238sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 2239 my ($self, $ev, $x, $y) = @_;
1762 2240
1763 $self->SUPER::button_down ($ev, $x, $y); 2241 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 2242
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 2243 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 2244
1767 # byte-index to char-index 2245 # byte-index to char-index
1768 my $text = $self->{text}; 2246 my $text = $self->{text};
1769 utf8::encode $text; 2247 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 2248 $self->{cursor} = length $text;
1771 2249
1772 $self->_set_text ($self->{text}); 2250 $self->_set_text ($self->{text});
1773 $self->update; 2251 $self->update;
1774 2252
1775 1 2253 1
1776} 2254}
1777 2255
1778sub mouse_motion { 2256sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 2257 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2258# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 2259
1782 0 2260 1
1783} 2261}
1784 2262
1785sub _draw { 2263sub _draw {
1786 my ($self) = @_; 2264 my ($self) = @_;
1787 2265
… …
1814 utf8::encode $text; 2292 utf8::encode $text;
1815 2293
1816 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2294 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1817 } 2295 }
1818 2296
1819 glColor @{$self->{fg}};
1820 glBegin GL_LINES; 2297 glBegin GL_LINES;
1821 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2298 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}; 2299 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1823 glEnd; 2300 glEnd;
1824 } 2301 }
1825} 2302}
1826 2303
2304#############################################################################
2305
1827package CFClient::UI::Entry; 2306package CFPlus::UI::Entry;
1828 2307
1829our @ISA = CFClient::UI::EntryBase::; 2308our @ISA = CFPlus::UI::EntryBase::;
1830 2309
1831use CFClient::OpenGL; 2310use CFPlus::OpenGL;
1832 2311
1833sub key_down { 2312sub invoke_key_down {
1834 my ($self, $ev) = @_; 2313 my ($self, $ev) = @_;
1835 2314
1836 my $sym = $ev->{sym}; 2315 my $sym = $ev->{sym};
1837 2316
1838 if ($sym == 13) { 2317 if ($ev->{uni} == 0x0d || $sym == 13) {
1839 unshift @{$self->{history}}, 2318 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 2319 my $txt = $self->get_text;
2320
1841 $self->{history_pointer} = -1; 2321 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 2322 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 2323 $self->emit (activate => $txt);
1844 $self->update; 2324 $self->update;
1845 2325
1846 } elsif ($sym == CFClient::SDLK_UP) { 2326 } elsif ($sym == CFPlus::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 2327 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 2328 $self->{history_saveback} = $self->get_text;
1849 } 2329 }
1850 if (@{$self->{history} || []} > 0) { 2330 if (@{$self->{history} || []} > 0) {
1851 $self->{history_pointer}++; 2331 $self->{history_pointer}++;
… …
1853 $self->{history_pointer} = @{$self->{history} || []} - 1; 2333 $self->{history_pointer} = @{$self->{history} || []} - 1;
1854 } 2334 }
1855 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2335 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1856 } 2336 }
1857 2337
1858 } elsif ($sym == CFClient::SDLK_DOWN) { 2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
1859 $self->{history_pointer}--; 2339 $self->{history_pointer}--;
1860 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2340 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861 2341
1862 if ($self->{history_pointer} >= 0) { 2342 if ($self->{history_pointer} >= 0) {
1863 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1864 } else { 2344 } else {
1865 $self->set_text ($self->{history_saveback}); 2345 $self->set_text ($self->{history_saveback});
1866 } 2346 }
1867 2347
1868 } else { 2348 } else {
1869 return $self->SUPER::key_down ($ev) 2349 return $self->SUPER::invoke_key_down ($ev)
1870 } 2350 }
1871 2351
1872 1 2352 1
1873} 2353}
1874 2354
1875############################################################################# 2355#############################################################################
1876 2356
2357package CFPlus::UI::TextEdit;
2358
2359our @ISA = CFPlus::UI::EntryBase::;
2360
2361use CFPlus::OpenGL;
2362
2363sub move_cursor_ver {
2364 my ($self, $dy) = @_;
2365
2366 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2367
2368 $y += $dy;
2369
2370 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2371 $self->{cursor} = $index;
2372 delete $self->{cur_h};
2373 $self->update;
2374 return;
2375 }
2376}
2377
2378sub invoke_key_down {
2379 my ($self, $ev) = @_;
2380
2381 my $sym = $ev->{sym};
2382
2383 if ($sym == CFPlus::SDLK_UP) {
2384 $self->move_cursor_ver (-1);
2385 } elsif ($sym == CFPlus::SDLK_DOWN) {
2386 $self->move_cursor_ver (+1);
2387 } else {
2388 return $self->SUPER::invoke_key_down ($ev)
2389 }
2390
2391 1
2392}
2393
2394#############################################################################
2395
1877package CFClient::UI::Button; 2396package CFPlus::UI::Button;
1878 2397
1879our @ISA = CFClient::UI::Label::; 2398our @ISA = CFPlus::UI::Label::;
1880 2399
1881use CFClient::OpenGL; 2400use CFPlus::OpenGL;
1882 2401
1883my @tex = 2402my @tex =
1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1885 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
1886 2405
1887sub new { 2406sub new {
1888 my $class = shift; 2407 my $class = shift;
1889 2408
1890 $class->SUPER::new ( 2409 $class->SUPER::new (
1891 padding_x => 4, 2410 padding_x => 4,
1892 padding_y => 4, 2411 padding_y => 4,
1893 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
1894 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
1895 can_hover => 1, 2414 can_hover => 1,
1896 align => 0, 2415 align => 0,
1897 valign => 0, 2416 valign => 0,
1898 can_events => 1, 2417 can_events => 1,
1899 @_ 2418 @_
1900 ) 2419 )
1901} 2420}
1902 2421
1903sub activate { }
1904
1905sub button_up { 2422sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2423 my ($self, $ev, $x, $y) = @_;
1907 2424
1908 $self->emit ("activate") 2425 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2426 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2427 && $y >= 0 && $y < $self->{h};
… …
1913} 2430}
1914 2431
1915sub _draw { 2432sub _draw {
1916 my ($self) = @_; 2433 my ($self) = @_;
1917 2434
1918 local $self->{fg} = $self->{fg}; 2435 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 2436
1924 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
1927 2440
2441 my $tex = $tex[$GRAB == $self];
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 2443
1930 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
1931 2445
1932 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
1933} 2447}
1934 2448
1935############################################################################# 2449#############################################################################
1936 2450
1937package CFClient::UI::CheckBox; 2451package CFPlus::UI::CheckBox;
1938 2452
1939our @ISA = CFClient::UI::DrawBG::; 2453our @ISA = CFPlus::UI::DrawBG::;
1940 2454
1941my @tex = 2455my @tex =
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2456 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2457 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944 2458
1945use CFClient::OpenGL; 2459use CFPlus::OpenGL;
1946 2460
1947sub new { 2461sub new {
1948 my $class = shift; 2462 my $class = shift;
1949 2463
1950 $class->SUPER::new ( 2464 $class->SUPER::new (
… …
1964 my ($self) = @_; 2478 my ($self) = @_;
1965 2479
1966 (6) x 2 2480 (6) x 2
1967} 2481}
1968 2482
2483sub toggle {
2484 my ($self) = @_;
2485
2486 $self->{state} = !$self->{state};
2487 $self->emit (changed => $self->{state});
2488 $self->update;
2489}
2490
1969sub button_down { 2491sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2492 my ($self, $ev, $x, $y) = @_;
1971 2493
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2494 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2495 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2496 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2497 } else {
1977 return 0 2498 return 0
1978 } 2499 }
1979 2500
1980 1 2501 1
… …
2000 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
2001} 2522}
2002 2523
2003############################################################################# 2524#############################################################################
2004 2525
2005package CFClient::UI::Image; 2526package CFPlus::UI::Image;
2006 2527
2007our @ISA = CFClient::UI::Base::; 2528our @ISA = CFPlus::UI::Base::;
2008 2529
2009use CFClient::OpenGL; 2530use CFPlus::OpenGL;
2010use Carp qw/confess/;
2011 2531
2012our %loaded_images; 2532our %texture_cache;
2013 2533
2014sub new { 2534sub new {
2015 my $class = shift; 2535 my $class = shift;
2016 2536
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2537 my $self = $class->SUPER::new (
2538 can_events => 0,
2539 @_,
2540 );
2018 2541
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2542 $self->{path} || $self->{tex}
2543 or Carp::croak "'path' or 'tex' attributes required";
2020 2544
2021 $loaded_images{$self->{image}} ||= 2545 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2546 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2023 2547
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2548 CFPlus::weaken $texture_cache{$self->{path}};
2025 2549
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2550 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2551
2030 $self 2552 $self
2031} 2553}
2032 2554
2555sub STORABLE_freeze {
2556 my ($self, $cloning) = @_;
2557
2558 $self->{path}
2559 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2560
2561 $self->{path}
2562}
2563
2564sub STORABLE_attach {
2565 my ($self, $cloning, $path) = @_;
2566
2567 $self->new (path => $path)
2568}
2569
2033sub size_request { 2570sub size_request {
2034 my ($self) = @_; 2571 my ($self) = @_;
2035 2572
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2573 ($self->{tex}{w}, $self->{tex}{h})
2037} 2574}
2038 2575
2039sub _draw { 2576sub _draw {
2040 my ($self) = @_; 2577 my ($self) = @_;
2041 2578
… …
2051 } 2588 }
2052 2589
2053 glEnable GL_TEXTURE_2D; 2590 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2592
2056 $tex->draw_quad_alpha (0, 0, $w, $h); 2593 $tex->draw_quad (0, 0, $w, $h);
2057 2594
2058 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2059} 2596}
2060 2597
2061############################################################################# 2598#############################################################################
2062 2599
2600package CFPlus::UI::ImageButton;
2601
2602our @ISA = CFPlus::UI::Image::;
2603
2604use CFPlus::OpenGL;
2605
2606my %textures;
2607
2608sub new {
2609 my $class = shift;
2610
2611 my $self = $class->SUPER::new (
2612 padding_x => 4,
2613 padding_y => 4,
2614 fg => [1, 1, 1],
2615 active_fg => [0, 0, 1],
2616 can_hover => 1,
2617 align => 0,
2618 valign => 0,
2619 can_events => 1,
2620 @_
2621 );
2622}
2623
2624sub invoke_button_up {
2625 my ($self, $ev, $x, $y) = @_;
2626
2627 $self->emit ("activate")
2628 if $x >= 0 && $x < $self->{w}
2629 && $y >= 0 && $y < $self->{h};
2630
2631 1
2632}
2633
2634#############################################################################
2635
2063package CFClient::UI::VGauge; 2636package CFPlus::UI::VGauge;
2064 2637
2065our @ISA = CFClient::UI::Base::; 2638our @ISA = CFPlus::UI::Base::;
2066 2639
2067use List::Util qw(min max); 2640use List::Util qw(min max);
2068 2641
2069use CFClient::OpenGL; 2642use CFPlus::OpenGL;
2070 2643
2071my %tex = ( 2644my %tex = (
2072 food => [ 2645 food => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2647 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075 ], 2648 ],
2076 grace => [ 2649 grace => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2650 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/ 2651 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2079 ], 2652 ],
2080 hp => [ 2653 hp => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2655 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083 ], 2656 ],
2084 mana => [ 2657 mana => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 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/ 2659 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2087 ], 2660 ],
2088); 2661);
2089 2662
2090# eg. VGauge->new (gauge => 'food'), default gauge: food 2663# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2723 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2724 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2725
2153 my $h1 = $self->{h} * (1 - $ycut1); 2726 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2727 my $h2 = $self->{h} * (1 - $ycut2);
2728 my $h3 = $self->{h};
2729
2730 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2731
2156 glEnable GL_BLEND; 2732 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2733 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2734 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2735 glEnable GL_TEXTURE_2D;
… …
2178 2754
2179 if ($t3) { 2755 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2756 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2757 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2758 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2759 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2760 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2761 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2762 glEnd;
2187 } 2763 }
2188 2764
2189 glDisable GL_BLEND; 2765 glDisable GL_BLEND;
2190 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2191} 2767}
2192 2768
2193############################################################################# 2769#############################################################################
2194 2770
2195package CFClient::UI::Gauge; 2771package CFPlus::UI::Gauge;
2196 2772
2197our @ISA = CFClient::UI::VBox::; 2773our @ISA = CFPlus::UI::VBox::;
2198 2774
2199sub new { 2775sub new {
2200 my ($class, %arg) = @_; 2776 my ($class, %arg) = @_;
2201 2777
2202 my $self = $class->SUPER::new ( 2778 my $self = $class->SUPER::new (
… …
2204 can_hover => 1, 2780 can_hover => 1,
2205 can_events => 1, 2781 can_events => 1,
2206 %arg, 2782 %arg,
2207 ); 2783 );
2208 2784
2209 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2785 $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); 2786 $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"); 2787 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2212 2788
2213 $self 2789 $self
2214} 2790}
2215 2791
2216sub set_fontsize { 2792sub set_fontsize {
… …
2237 $self->{value}->set_text ($val); 2813 $self->{value}->set_text ($val);
2238} 2814}
2239 2815
2240############################################################################# 2816#############################################################################
2241 2817
2242package CFClient::UI::Slider; 2818package CFPlus::UI::Slider;
2243 2819
2244use strict; 2820use strict;
2245 2821
2246use CFClient::OpenGL; 2822use CFPlus::OpenGL;
2247 2823
2248our @ISA = CFClient::UI::DrawBG::; 2824our @ISA = CFPlus::UI::DrawBG::;
2249 2825
2250my @tex = 2826my @tex =
2251 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2827 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2252 qw(s1_slider.png s1_slider_bg.png); 2828 qw(s1_slider.png s1_slider_bg.png);
2253 2829
2254sub new { 2830sub new {
2255 my $class = shift; 2831 my $class = shift;
2256 2832
… …
2277 $self->update; 2853 $self->update;
2278 2854
2279 $self 2855 $self
2280} 2856}
2281 2857
2282sub changed { }
2283
2284sub set_range { 2858sub set_range {
2285 my ($self, $range) = @_; 2859 my ($self, $range) = @_;
2286 2860
2287 ($range, $self->{range}) = ($self->{range}, $range); 2861 ($range, $self->{range}) = ($self->{range}, $range);
2288 2862
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2863 if ("@$range" ne "@{$self->{range}}") {
2864 $self->update;
2865 $self->set_value ($self->{range}[0]);
2866 }
2291} 2867}
2292 2868
2293sub set_value { 2869sub set_value {
2294 my ($self, $value) = @_; 2870 my ($self, $value) = @_;
2295 2871
… …
2306 if $unit; 2882 if $unit;
2307 2883
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2884 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2885
2310 if ($value != $old_value) { 2886 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2887 $self->emit (changed => $value);
2312 $self->update; 2888 $self->update;
2313 } 2889 }
2314} 2890}
2315 2891
2316sub size_request { 2892sub size_request {
2317 my ($self) = @_; 2893 my ($self) = @_;
2318 2894
2319 ($self->{req_w}, $self->{req_h}) 2895 ($self->{req_w}, $self->{req_h})
2320} 2896}
2321 2897
2322sub button_down { 2898sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2899 my ($self, $ev, $x, $y) = @_;
2324 2900
2325 $self->SUPER::button_down ($ev, $x, $y); 2901 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2902
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2903 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2904
2329 $self->mouse_motion ($ev, $x, $y) 2905 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2906}
2331 2907
2332sub mouse_motion { 2908sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2909 my ($self, $ev, $x, $y) = @_;
2334 2910
2335 if ($GRAB == $self) { 2911 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2912 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2913
… …
2343 } else { 2919 } else {
2344 return 0; 2920 return 0;
2345 } 2921 }
2346 2922
2347 1 2923 1
2924}
2925
2926sub invoke_mouse_wheel {
2927 my ($self, $ev) = @_;
2928
2929 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2930
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2932
2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2934
2935 ! ! $delta
2348} 2936}
2349 2937
2350sub update { 2938sub update {
2351 my ($self) = @_; 2939 my ($self) = @_;
2352 2940
… …
2401 glDisable GL_TEXTURE_2D; 2989 glDisable GL_TEXTURE_2D;
2402} 2990}
2403 2991
2404############################################################################# 2992#############################################################################
2405 2993
2406package CFClient::UI::ValSlider; 2994package CFPlus::UI::ValSlider;
2407 2995
2408our @ISA = CFClient::UI::HBox::; 2996our @ISA = CFPlus::UI::HBox::;
2409 2997
2410sub new { 2998sub new {
2411 my ($class, %arg) = @_; 2999 my ($class, %arg) = @_;
2412 3000
2413 my $range = delete $arg{range}; 3001 my $range = delete $arg{range};
2414 3002
2415 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
2416 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3004 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2417 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3005 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2418 to_value => sub { shift }, 3006 to_value => sub { shift },
2419 from_value => sub { shift }, 3007 from_value => sub { shift },
2420 %arg, 3008 %arg,
2421 ); 3009 );
2422 3010
… …
2442sub set_range { shift->{slider}->set_range (@_) } 3030sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 3031sub set_value { shift->{slider}->set_value (@_) }
2444 3032
2445############################################################################# 3033#############################################################################
2446 3034
2447package CFClient::UI::TextView; 3035package CFPlus::UI::TextScroller;
2448 3036
2449our @ISA = CFClient::UI::HBox::; 3037our @ISA = CFPlus::UI::HBox::;
2450 3038
2451use CFClient::OpenGL; 3039use CFPlus::OpenGL;
2452 3040
2453sub new { 3041sub new {
2454 my $class = shift; 3042 my $class = shift;
2455 3043
2456 my $self = $class->SUPER::new ( 3044 my $self = $class->SUPER::new (
2457 fontsize => 1, 3045 fontsize => 1,
2458 can_events => 0, 3046 can_events => 1,
3047 indent => 0,
2459 #font => default_font 3048 #font => default_font
2460 @_, 3049 @_,
2461 3050
2462 layout => (new CFClient::Layout 1), 3051 layout => (new CFPlus::Layout),
2463 par => [], 3052 par => [],
3053 max_par => 0,
2464 height => 0, 3054 height => 0,
2465 children => [ 3055 children => [
2466 (new CFClient::UI::Empty expand => 1), 3056 (new CFPlus::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 3057 (new CFPlus::UI::Slider vertical => 1),
2468 ], 3058 ],
2469 ); 3059 );
2470 3060
2471 $self->{children}[1]->connect (changed => sub { $self->update }); 3061 $self->{children}[1]->connect (changed => sub { $self->update });
2472 3062
… …
2478 3068
2479 $self->{fontsize} = $fontsize; 3069 $self->{fontsize} = $fontsize;
2480 $self->reflow; 3070 $self->reflow;
2481} 3071}
2482 3072
3073sub size_request {
3074 my ($self) = @_;
3075
3076 my ($empty, $slider) = @{ $self->{children} };
3077
3078 local $self->{children} = [$empty, $slider];
3079 $self->SUPER::size_request
3080}
3081
2483sub size_allocate { 3082sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 3083 my ($self, $w, $h) = @_;
2485 3084
2486 $self->SUPER::size_allocate ($w, $h); 3085 my ($empty, $slider, @other) = @{ $self->{children} };
3086 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 3087
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3088 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3089 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 3090 $self->{layout}->set_width ($empty->{w});
3091 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 3092
2492 $self->reflow; 3093 $self->reflow;
2493}
2494 3094
2495sub text_size { 3095 local $self->{children} = [$empty, $slider];
3096 $self->SUPER::invoke_size_allocate ($w, $h)
3097}
3098
3099sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 3100 my ($self, $ev) = @_;
3101
3102 return 0 unless $ev->{dy}; # only vertical movements
3103
3104 $self->{children}[1]->emit (mouse_wheel => $ev);
3105
3106 1
3107}
3108
3109sub get_layout {
3110 my ($self, $para) = @_;
2497 3111
2498 my $layout = $self->{layout}; 3112 my $layout = $self->{layout};
2499 3113
3114 $layout->set_font ($self->{font}) if $self->{font};
3115 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3116 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 3117 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3118 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 3119 $layout->set_markup ($para->{markup});
3120
3121 $layout->set_shapes (
3122 map
3123 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3124 @{$para->{widget}}
2503 3125 );
3126
2504 $layout->size 3127 $layout
2505} 3128}
2506 3129
2507sub reflow { 3130sub reflow {
2508 my ($self) = @_; 3131 my ($self) = @_;
2509 3132
… …
2516 3139
2517 # todo: base offset on lines or so, not on pixels 3140 # todo: base offset on lines or so, not on pixels
2518 $self->{children}[1]->set_value ($offset); 3141 $self->{children}[1]->set_value ($offset);
2519} 3142}
2520 3143
3144sub current_paragraph {
3145 my ($self) = @_;
3146
3147 $self->{top_paragraph} - 1
3148}
3149
3150sub scroll_to {
3151 my ($self, $para) = @_;
3152
3153 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3154
3155 $self->{scroll_to} = $para;
3156 $self->update;
3157}
3158
2521sub clear { 3159sub clear {
2522 my ($self) = @_; 3160 my ($self) = @_;
3161
3162 my (undef, undef, @other) = @{ $self->{children} };
3163 $self->remove ($_) for @other;
2523 3164
2524 $self->{par} = []; 3165 $self->{par} = [];
2525 $self->{height} = 0; 3166 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3167 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 3168}
2528 3169
2529sub add_paragraph { 3170sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 3171 my $self = shift;
2531 3172
2532 for my $line (split /\n/, $text) { 3173 for my $para (@_) {
2533 my ($w, $h) = $self->text_size ($line); 3174 $para = {
3175 fg => [1, 1, 1, 1],
3176 indent => 0,
3177 markup => "",
3178 widget => [],
3179 ref $para ? %$para : (markup => $para),
3180 w => 1e10,
3181 wrapped => 1,
3182 };
3183
3184 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3185 push @{$self->{par}}, $para;
3186 }
3187
3188 if (my $max = $self->{max_par}) {
3189 shift @{$self->{par}} while @{$self->{par}} > $max;
3190 }
3191
3192 $self->{need_reflow}++;
3193 $self->update;
3194}
3195
3196sub scroll_to_bottom {
3197 my ($self) = @_;
3198
3199 $self->{scroll_to} = $#{$self->{par}};
3200 $self->update;
3201}
3202
3203sub force_uptodate {
3204 my ($self) = @_;
3205
3206 if (delete $self->{need_reflow}) {
3207 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3208
3209 my $height = 0;
3210
3211 for my $para (@{$self->{par}}) {
3212 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3213 my $layout = $self->get_layout ($para);
3214 my ($w, $h) = $layout->size;
3215
3216 $para->{w} = $w + $para->{indent};
3217 $para->{h} = $h;
3218 $para->{wrapped} = $layout->has_wrapped;
3219 }
3220
3221 $para->{y} = $height;
3222 $height += $para->{h};
3223 }
3224
2534 $self->{height} += $h; 3225 $self->{height} = $height;
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3226 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2536 }
2537 3227
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3228 delete $self->{texture};
3229 }
3230
3231 if (my $paridx = delete $self->{scroll_to}) {
3232 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3233 }
2539} 3234}
2540 3235
2541sub update { 3236sub update {
2542 my ($self) = @_; 3237 my ($self) = @_;
2543 3238
… …
2545 3240
2546 return unless $self->{h} > 0; 3241 return unless $self->{h} > 0;
2547 3242
2548 delete $self->{texture}; 3243 delete $self->{texture};
2549 3244
2550 $ROOT->on_post_alloc ($self, sub { 3245 $ROOT->on_post_alloc ($self => sub {
3246 $self->force_uptodate;
3247
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3248 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 3249
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 { 3250 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 3251 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 3252 glClear GL_COLOR_BUFFER_BIT;
2582 3253
3254 package CFPlus::UI::Base;
3255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3256 (0, 0, $self->{w}, $self->{h});
3257
3258 my $top = int $self->{children}[1]{range}[0];
3259
3260 my $paridx = 0;
3261 my $top_paragraph;
2583 my $top = int $self->{children}[1]{range}[0]; 3262 my $top = int $self->{children}[1]{range}[0];
2584 3263
2585 my $y0 = $top; 3264 my $y0 = $top;
2586 my $y1 = $top + $H; 3265 my $y1 = $top + $H;
2587 3266
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}}) { 3267 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 3268 my $h = $para->{h};
3269 my $y = $para->{y};
2600 3270
2601 if ($y0 < $y + $h && $y < $y1) { 3271 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 3272 my $layout = $self->get_layout ($para);
2603 $layout->set_width ($W - $par->[3]);
2604 $layout->set_markup ($par->[4]);
2605 3273
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3274 $layout->render ($para->{indent}, $y - $y0);
2607 3275
2608 glRasterPos $par->[3], $y - $y0; 3276 if (my @w = @{ $para->{widget} }) {
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3277 my @s = $layout->get_shapes;
3278
3279 for (@w) {
3280 my ($dx, $dy) = splice @s, 0, 2, ();
3281
3282 $_->{x} = $dx + $para->{indent};
3283 $_->{y} = $dy + $y - $y0;
3284
3285 $_->draw;
3286 }
3287 }
2610 } 3288 }
2611 3289
2612 $y += $h; 3290 $paridx++;
3291 $top_paragraph ||= $paridx if $y >= $top;
2613 } 3292 }
2614 3293
2615 glDisable GL_BLEND; 3294 $self->{top_paragraph} = $top_paragraph;
2616 }; 3295 };
2617 }); 3296 });
2618} 3297}
2619 3298
3299sub reconfigure {
3300 my ($self) = @_;
3301
3302 $self->SUPER::reconfigure;
3303
3304 $_->{w} = 1e10 for @{ $self->{par} };
3305 $self->reflow;
3306}
3307
2620sub _draw { 3308sub _draw {
2621 my ($self) = @_; 3309 my ($self) = @_;
2622 3310
2623 glEnable GL_TEXTURE_2D; 3311 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 3313 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3314 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 3315 glDisable GL_TEXTURE_2D;
2628 3316
2629 $self->{children}[1]->draw; 3317 $self->{children}[1]->draw;
2630
2631} 3318}
2632 3319
2633############################################################################# 3320#############################################################################
2634 3321
2635package CFClient::UI::Animator; 3322package CFPlus::UI::Animator;
2636 3323
2637use CFClient::OpenGL; 3324use CFPlus::OpenGL;
2638 3325
2639our @ISA = CFClient::UI::Bin::; 3326our @ISA = CFPlus::UI::Bin::;
2640 3327
2641sub moveto { 3328sub moveto {
2642 my ($self, $x, $y) = @_; 3329 my ($self, $x, $y) = @_;
2643 3330
2644 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3331 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2672 glPopMatrix; 3359 glPopMatrix;
2673} 3360}
2674 3361
2675############################################################################# 3362#############################################################################
2676 3363
2677package CFClient::UI::Flopper; 3364package CFPlus::UI::Flopper;
2678 3365
2679our @ISA = CFClient::UI::Button::; 3366our @ISA = CFPlus::UI::Button::;
2680 3367
2681sub new { 3368sub new {
2682 my $class = shift; 3369 my $class = shift;
2683 3370
2684 my $self = $class->SUPER::new ( 3371 my $self = $class->SUPER::new (
… …
2696 $self->{other}->toggle_visibility; 3383 $self->{other}->toggle_visibility;
2697} 3384}
2698 3385
2699############################################################################# 3386#############################################################################
2700 3387
2701package CFClient::UI::Tooltip; 3388package CFPlus::UI::Tooltip;
2702 3389
2703our @ISA = CFClient::UI::Bin::; 3390our @ISA = CFPlus::UI::Bin::;
2704 3391
2705use CFClient::OpenGL; 3392use CFPlus::OpenGL;
2706 3393
2707sub new { 3394sub new {
2708 my $class = shift; 3395 my $class = shift;
2709 3396
2710 $class->SUPER::new ( 3397 $class->SUPER::new (
… …
2713 ) 3400 )
2714} 3401}
2715 3402
2716sub set_tooltip_from { 3403sub set_tooltip_from {
2717 my ($self, $widget) = @_; 3404 my ($self, $widget) = @_;
3405
3406 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3407 if $widget->{tooltip} =~ /^#(.*)$/;
2718 3408
2719 my $tooltip = $widget->{tooltip}; 3409 my $tooltip = $widget->{tooltip};
2720 3410
2721 if ($ENV{CFPLUS_DEBUG} & 2) { 3411 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 3412 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3413 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 3414 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 3415 . "visible $widget->{visible}";
2726 } 3416 }
2727 3417
3418 $tooltip =~ s/^\n+//;
3419 $tooltip =~ s/\n+$//;
3420
2728 $self->add (new CFClient::UI::Label 3421 $self->add (new CFPlus::UI::Label
2729 markup => $tooltip, 3422 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3423 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 3424 fontsize => 0.8,
2732 fg => [0, 0, 0, 1], 3425 style => 1, # FLAG_INVERSE
2733 ellipsise => 0, 3426 ellipsise => 0,
2734 font => ($widget->{tooltip_font} || $::FONT_PROP), 3427 font => ($widget->{tooltip_font} || $::FONT_PROP),
2735 ); 3428 );
2736} 3429}
2737 3430
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3434 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 3435
2743 ($w + 4, $h + 4) 3436 ($w + 4, $h + 4)
2744} 3437}
2745 3438
2746sub size_allocate { 3439sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 3440 my ($self, $w, $h) = @_;
2748 3441
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 3442 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 3443}
2751 3444
2752sub visibility_change { 3445sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 3446 my ($self, $visible) = @_;
2754 3447
2755 return unless $visible; 3448 return unless $visible;
2756 3449
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 3450 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner} 3451 my $widget = $self->{owner}
2759 or return; 3452 or return;
2760 3453
3454 if ($widget->{visible}) {
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3455 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 3456
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3457 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 3458 if $x + $self->{w} > $self->{root}{w};
2765 3459
2766 $self->move_abs ($x, $y); 3460 $self->move_abs ($x, $y);
3461 } else {
3462 $self->hide;
3463 }
2767 }); 3464 });
2768} 3465}
2769 3466
2770sub _draw { 3467sub _draw {
2771 my ($self) = @_; 3468 my ($self) = @_;
… …
2795 $self->SUPER::_draw; 3492 $self->SUPER::_draw;
2796} 3493}
2797 3494
2798############################################################################# 3495#############################################################################
2799 3496
2800package CFClient::UI::Face; 3497package CFPlus::UI::Face;
2801 3498
2802our @ISA = CFClient::UI::Base::; 3499our @ISA = CFPlus::UI::DrawBG::;
2803 3500
2804use CFClient::OpenGL; 3501use CFPlus::OpenGL;
2805 3502
2806sub new { 3503sub new {
2807 my $class = shift; 3504 my $class = shift;
2808 3505
2809 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
2810 aspect => 1, 3509 aspect => 1,
2811 can_events => 0, 3510 can_events => 0,
2812 @_, 3511 @_,
2813 ); 3512 );
2814 3513
2815 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
2816 Scalar::Util::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
2817 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2818 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
2819 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2820 hard => 1, 3520 parked => 1,
2821 interval => $self->{animspeed},
2822 cb => sub { 3521 cb => sub {
3522 return unless $::CONN && $widget;
3523
2823 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
2824 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
2825 }, 3529 },
2826 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
2827 } 3534 }
2828 3535
2829 $self 3536 $self
2830} 3537}
2831 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
2832sub size_request { 3569sub size_request {
2833 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
2834} 3585}
2835 3586
2836sub update { 3587sub update {
2837 my ($self) = @_; 3588 my ($self) = @_;
2838 3589
2839 return unless $self->{visible}; 3590 return unless $self->{visible};
2840 3591
2841 $self->SUPER::update; 3592 $self->SUPER::update;
2842} 3593}
2843 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
2844sub _draw { 3603sub _draw {
2845 my ($self) = @_; 3604 my ($self) = @_;
2846 3605
2847 return unless $::CONN; 3606 return unless $::CONN;
2848 3607
2849 my $face; 3608 $self->SUPER::_draw;
2850 3609
2851 if ($self->{frame}) {
2852 my $anim = $::CONN->{anim}[$self->{anim}]; 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
2853 3611 or return;
2854 $face = $anim->[ $self->{frame} % @$anim ]
2855 if $anim && @$anim;
2856 }
2857 3612
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3613 my $tex = $::CONN->{texture}[$faceid];
2859 3614
2860 if ($tex) { 3615 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3618 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3619 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3620 glDisable GL_TEXTURE_2D;
2866 } 3621 }
2867} 3622}
2868 3623
2869sub DESTROY { 3624sub destroy {
2870 my ($self) = @_; 3625 my ($self) = @_;
2871 3626
2872 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
2873 if $self->{timer}; 3628 if $self->{timer};
2874 3629
2875 $self->SUPER::DESTROY; 3630 $self->SUPER::destroy;
2876} 3631}
2877 3632
2878############################################################################# 3633#############################################################################
2879 3634
2880package CFClient::UI::Buttonbar; 3635package CFPlus::UI::Buttonbar;
2881 3636
2882our @ISA = CFClient::UI::HBox::; 3637our @ISA = CFPlus::UI::HBox::;
2883 3638
2884# TODO: should actualyl wrap buttons and other goodies. 3639# TODO: should actually wrap buttons and other goodies.
2885 3640
2886############################################################################# 3641#############################################################################
2887 3642
2888package CFClient::UI::Menu; 3643package CFPlus::UI::Menu;
2889 3644
2890our @ISA = CFClient::UI::FancyFrame::; 3645our @ISA = CFPlus::UI::Toplevel::;
2891 3646
2892use CFClient::OpenGL; 3647use CFPlus::OpenGL;
2893 3648
2894sub new { 3649sub new {
2895 my $class = shift; 3650 my $class = shift;
2896 3651
2897 my $self = $class->SUPER::new ( 3652 my $self = $class->SUPER::new (
2898 items => [], 3653 items => [],
2899 z => 100, 3654 z => 100,
2900 @_, 3655 @_,
2901 ); 3656 );
2902 3657
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3658 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2904 3659
2905 for my $item (@{ $self->{items} }) { 3660 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3661 my ($widget, $cb, $tooltip) = @$item;
2907 3662
2908 # handle various types of items, only text for now 3663 # handle various types of items, only text for now
2909 if (!ref $widget) { 3664 if (!ref $widget) {
3665 if ($widget =~ /\t/) {
3666 my ($left, $right) = split /\t/, $widget, 2;
3667
2910 $widget = new CFClient::UI::Label 3668 $widget = new CFPlus::UI::HBox
2911 can_hover => 1, 3669 can_hover => 1,
2912 can_events => 1, 3670 can_events => 1,
3671 tooltip => $tooltip,
3672 children => [
3673 (new CFPlus::UI::Label markup => $left, expand => 1),
3674 (new CFPlus::UI::Label markup => $right, align => +1),
3675 ],
3676 ;
3677
3678 } else {
3679 $widget = new CFPlus::UI::Label
3680 can_hover => 1,
3681 can_events => 1,
2913 text => $widget; 3682 markup => $widget,
3683 tooltip => $tooltip;
3684 }
2914 } 3685 }
2915 3686
2916 $self->{item}{$widget} = $item; 3687 $self->{item}{$widget} = $item;
2917 3688
2918 $self->{vbox}->add ($widget); 3689 $self->{vbox}->add ($widget);
… …
2923 3694
2924# popup given the event (must be a mouse button down event currently) 3695# popup given the event (must be a mouse button down event currently)
2925sub popup { 3696sub popup {
2926 my ($self, $ev) = @_; 3697 my ($self, $ev) = @_;
2927 3698
2928 $self->_emit ("popdown"); 3699 $self->emit ("popdown");
2929 3700
2930 # maybe save $GRAB? must be careful about events... 3701 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3702 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3703 $self->{button} = $ev->{button};
2933 3704
2934 $self->show; 3705 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3706 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3707}
2937 3708
2938sub mouse_motion { 3709sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3710 my ($self, $ev, $x, $y) = @_;
2940 3711
2941 # TODO: should use vbox->find_widget or so 3712 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3713 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3714 $self->{hover} = $self->{item}{$HOVER};
2944 3715
2945 0 3716 0
2946} 3717}
2947 3718
2948sub button_up { 3719sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3720 my ($self, $ev, $x, $y) = @_;
2950 3721
2951 if ($ev->{button} == $self->{button}) { 3722 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3723 undef $GRAB;
2953 $self->hide; 3724 $self->hide;
2954 3725
2955 $self->_emit ("popdown"); 3726 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3727 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3728 } else {
2958 return 0 3729 return 0
2959 } 3730 }
2960 3731
2961 1 3732 1
2962} 3733}
2963 3734
2964############################################################################# 3735#############################################################################
2965 3736
2966package CFClient::UI::Multiplexer; 3737package CFPlus::UI::Multiplexer;
2967 3738
2968our @ISA = CFClient::UI::Container::; 3739our @ISA = CFPlus::UI::Container::;
2969 3740
2970sub new { 3741sub new {
2971 my $class = shift; 3742 my $class = shift;
2972 3743
2973 my $self = $class->SUPER::new ( 3744 my $self = $class->SUPER::new (
… …
2987 3758
2988 $self->{current} = $self->{children}[0] 3759 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3760 if @{ $self->{children} };
2990} 3761}
2991 3762
3763sub get_current_page {
3764 my ($self) = @_;
3765
3766 $self->{current}
3767}
3768
2992sub set_current_page { 3769sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3770 my ($self, $page_or_widget) = @_;
2994 3771
2995 my $widget = ref $page_or_widget 3772 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3773 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3774 : $self->{children}[$page_or_widget];
2998 3775
2999 $self->{current} = $widget; 3776 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3777 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3778
3002 $self->_emit (page_changed => $self->{current}); 3779 $self->emit (page_changed => $self->{current});
3003 3780
3004 $self->realloc; 3781 $self->realloc;
3005} 3782}
3006 3783
3007sub visible_children { 3784sub visible_children {
… …
3012 my ($self) = @_; 3789 my ($self) = @_;
3013 3790
3014 $self->{current}->size_request 3791 $self->{current}->size_request
3015} 3792}
3016 3793
3017sub size_allocate { 3794sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3019 3796
3020 $self->{current}->configure (0, 0, $w, $h); 3797 $self->{current}->configure (0, 0, $w, $h);
3798
3799 1
3021} 3800}
3022 3801
3023sub _draw { 3802sub _draw {
3024 my ($self) = @_; 3803 my ($self) = @_;
3025 3804
3026 $self->{current}->draw; 3805 $self->{current}->draw;
3027} 3806}
3028 3807
3029############################################################################# 3808#############################################################################
3030 3809
3031package CFClient::UI::Notebook; 3810package CFPlus::UI::Notebook;
3032 3811
3033our @ISA = CFClient::UI::VBox::; 3812our @ISA = CFPlus::UI::VBox::;
3034 3813
3035sub new { 3814sub new {
3036 my $class = shift; 3815 my $class = shift;
3037 3816
3038 my $self = $class->SUPER::new ( 3817 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar), 3818 buttonbar => (new CFPlus::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3819 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self 3820 # filter => # will be put between multiplexer and $self
3042 @_, 3821 @_,
3043 ); 3822 );
3044 3823
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3824 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3049} 3828}
3050 3829
3051sub add { 3830sub add {
3052 my ($self, $title, $widget, $tooltip) = @_; 3831 my ($self, $title, $widget, $tooltip) = @_;
3053 3832
3054 Scalar::Util::weaken $self; 3833 CFPlus::weaken $self;
3055 3834
3056 $self->{buttonbar}->add (new CFClient::UI::Button 3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3057 markup => $title, 3836 markup => $title,
3058 tooltip => $tooltip, 3837 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) }, 3838 on_activate => sub { $self->set_current_page ($widget) },
3060 ); 3839 );
3061 3840
3062 $self->{multiplexer}->add ($widget); 3841 $self->{multiplexer}->add ($widget);
3063} 3842}
3064 3843
3844sub get_current_page {
3845 my ($self) = @_;
3846
3847 $self->{multiplexer}->get_current_page
3848}
3849
3065sub set_current_page { 3850sub set_current_page {
3066 my ($self, $page) = @_; 3851 my ($self, $page) = @_;
3067 3852
3068 $self->{multiplexer}->set_current_page ($page); 3853 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3854 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3855}
3071 3856
3072############################################################################# 3857#############################################################################
3073 3858
3074package CFClient::UI::Statusbox; 3859package CFPlus::UI::Selector;
3075 3860
3861use utf8;
3862
3076our @ISA = CFClient::UI::VBox::; 3863our @ISA = CFPlus::UI::Button::;
3077 3864
3078sub new { 3865sub new {
3079 my $class = shift; 3866 my $class = shift;
3080 3867
3081 $class->SUPER::new ( 3868 my $self = $class->SUPER::new (
3869 options => [], # [value, title, longdesc], ...
3870 value => undef,
3871 @_,
3872 );
3873
3874 $self->_set_value ($self->{value});
3875
3876 $self
3877}
3878
3879sub invoke_button_down {
3880 my ($self, $ev) = @_;
3881
3882 my @menu_items;
3883
3884 for (@{ $self->{options} }) {
3885 my ($value, $title, $tooltip) = @$_;
3886
3887 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3888 }
3889
3890 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3891}
3892
3893sub _set_value {
3894 my ($self, $value) = @_;
3895
3896 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3897 or return;
3898
3899 $self->{value} = $item->[0];
3900 $self->set_markup ("$item->[1] ⇓");
3901 $self->set_tooltip ($item->[2]);
3902}
3903
3904sub set_value {
3905 my ($self, $value) = @_;
3906
3907 return unless $self->{value} ne $value;
3908
3909 $self->_set_value ($value);
3910 $self->emit (changed => $value);
3911}
3912
3913#############################################################################
3914
3915package CFPlus::UI::Statusbox;
3916
3917our @ISA = CFPlus::UI::VBox::;
3918
3919sub new {
3920 my $class = shift;
3921
3922 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3923 fontsize => 0.8,
3083 @_, 3924 @_,
3084 ) 3925 );
3926
3927 CFPlus::weaken (my $this = $self);
3928
3929 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3930
3931 $self
3085} 3932}
3086 3933
3087sub reorder { 3934sub reorder {
3088 my ($self) = @_; 3935 my ($self) = @_;
3089 my $NOW = time; 3936 my $NOW = Time::HiRes::time;
3937
3938 # freeze display when hovering over any label
3939 return if $CFPlus::UI::TOOLTIP->{owner}
3940 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3941 values %{ $self->{item} };
3090 3942
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3943 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3944 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3945 }
3094 3946
… …
3097 my @items = sort { 3949 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3950 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3951 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3952 } values %{ $self->{item} };
3101 3953
3954 $self->{timer}->interval (1);
3955
3102 my $count = 10 + 1; 3956 my $count = 10 + 1;
3103 for my $item (@items) { 3957 for my $item (@items) {
3104 last unless --$count; 3958 last unless --$count;
3105 3959
3106 push @widgets, $item->{label} ||= do { 3960 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3961 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3962 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3963 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3964 : $item->{text};
3111 3965
3112 for ($short) { 3966 for ($short) {
3113 s/^\s+//; 3967 s/^\s+//;
3114 s/\s+/ /g; 3968 s/\s+/ /g;
3115 } 3969 }
3116 3970
3117 new CFClient::UI::Label 3971 new CFPlus::UI::Label
3118 markup => $short, 3972 markup => $short,
3119 tooltip => $item->{tooltip}, 3973 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3974 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3975 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3976 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3977 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3978 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3979 can_events => 1,
3126 can_hover => 1 3980 can_hover => 1
3127 }; 3981 };
3982
3983 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3984 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3985 $label->update;
3986 $label->set_max_size (undef, $label->{req_h} * $diff)
3987 if $diff < 1;
3988 $self->{timer}->interval (1/30);
3989 } else {
3990 $label->{fg}[3] = $item->{fg}[3] || 1;
3991 }
3992
3993 push @widgets, $label;
3128 } 3994 }
3129 3995
3130 $self->clear; 3996 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3997 $self->SUPER::add (reverse @widgets);
3132} 3998}
… …
3137 $text =~ s/^\s+//; 4003 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 4004 $text =~ s/\s+$//;
3139 4005
3140 return unless $text; 4006 return unless $text;
3141 4007
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 4008 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 4009
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4010 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 4011
3146 if (my $item = $self->{item}{$group}) { 4012 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 4013 if ($item->{text} eq $text) {
3148 $item->{count}++; 4014 $item->{count}++;
3149 } else { 4015 } else {
3150 $item->{count} = 1; 4016 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 4017 $item->{text} = $item->{tooltip} = $text;
3152 } 4018 }
3153 $item->{id} = ++$self->{id}; 4019 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 4020 $item->{timeout} = $timeout;
3155 delete $item->{label}; 4021 delete $item->{label};
3156 } else { 4022 } else {
3157 $self->{item}{$group} = { 4023 $self->{item}{$group} = {
3158 id => ++$self->{id}, 4024 id => ++$self->{id},
… …
3164 count => 1, 4030 count => 1,
3165 %arg, 4031 %arg,
3166 }; 4032 };
3167 } 4033 }
3168 4034
4035 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 4036 $self->reorder;
4037 });
3170} 4038}
3171 4039
3172sub reconfigure { 4040sub reconfigure {
3173 my ($self) = @_; 4041 my ($self) = @_;
3174 4042
… …
3177 4045
3178 $self->reorder; 4046 $self->reorder;
3179 $self->SUPER::reconfigure; 4047 $self->SUPER::reconfigure;
3180} 4048}
3181 4049
4050sub destroy {
4051 my ($self) = @_;
4052
4053 $self->{timer}->cancel;
4054
4055 $self->SUPER::destroy;
4056}
4057
3182############################################################################# 4058#############################################################################
3183 4059
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; 4060package CFPlus::UI::Root;
3480 4061
3481our @ISA = CFClient::UI::Container::; 4062our @ISA = CFPlus::UI::Container::;
3482 4063
4064use List::Util qw(min max);
4065
3483use CFClient::OpenGL; 4066use CFPlus::OpenGL;
3484 4067
3485sub new { 4068sub new {
3486 my $class = shift; 4069 my $class = shift;
3487 4070
3488 my $self = $class->SUPER::new ( 4071 my $self = $class->SUPER::new (
3489 visible => 1, 4072 visible => 1,
3490 @_, 4073 @_,
3491 ); 4074 );
3492 4075
3493 Scalar::Util::weaken ($self->{root} = $self); 4076 CFPlus::weaken ($self->{root} = $self);
3494 4077
3495 $self 4078 $self
3496} 4079}
3497 4080
3498sub size_request { 4081sub size_request {
… …
3513 $coord = $max - $size if $coord > $max - $size; 4096 $coord = $max - $size if $coord > $max - $size;
3514 4097
3515 int $coord + 0.5 4098 int $coord + 0.5
3516} 4099}
3517 4100
3518sub size_allocate { 4101sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 4102 my ($self, $w, $h) = @_;
3520 4103
3521 for my $child ($self->children) { 4104 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4105 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 4106
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 4110 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 4111 $Y = _to_pixel $Y, $H, $self->{h};
3529 4112
3530 $child->configure ($X, $Y, $W, $H); 4113 $child->configure ($X, $Y, $W, $H);
3531 } 4114 }
4115
4116 1
3532} 4117}
3533 4118
3534sub coord2local { 4119sub coord2local {
3535 my ($self, $x, $y) = @_; 4120 my ($self, $x, $y) = @_;
3536 4121
… …
3621 4206
3622 delete $queue{$widget+0}; 4207 delete $queue{$widget+0};
3623 4208
3624 my ($w, $h) = $widget->size_request; 4209 my ($w, $h) = $widget->size_request;
3625 4210
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4211 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4212 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4213
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 4216
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 4217 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 4218 $h = $widget->{force_h} if exists $widget->{force_h};
3631 4219
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4220 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4247 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 4248
3661 $w = 0 if $w < 0; 4249 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 4250 $h = 0 if $h < 0;
3663 4251
4252 $w = max $widget->{min_w}, $w;
4253 $h = max $widget->{min_h}, $h;
4254
4255# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4256# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4257
4258 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4259 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4260
3664 $w = int $w + 0.5; 4261 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 4262 $h = int $h + 0.5;
3666 4263
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4264 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w}; 4265 $widget->{old_w} = $widget->{w};
… …
3678 4275
3679 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
3680 $_->() 4277 $_->()
3681 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
3682 } 4279 }
3683
3684 4280
3685 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3687 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
3688 4284
… …
3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4287 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692 glMatrixMode GL_MODELVIEW; 4288 glMatrixMode GL_MODELVIEW;
3693 glLoadIdentity; 4289 glLoadIdentity;
3694 4290
3695 { 4291 {
3696 package CFClient::UI::Base; 4292 package CFPlus::UI::Base;
3697 4293
3698 ($draw_x, $draw_y, $draw_w, $draw_h) = 4294 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h}); 4295 (0, 0, $self->{w}, $self->{h});
3700 }
3701 4296
3702 $self->_draw; 4297 $self->_draw;
4298 }
3703} 4299}
3704 4300
3705############################################################################# 4301#############################################################################
3706 4302
3707package CFClient::UI; 4303package CFPlus::UI;
3708 4304
3709$ROOT = new CFClient::UI::Root; 4305$ROOT = new CFPlus::UI::Root;
3710$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4306$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3711 4307
37121 43081
3713 4309

Diff Legend

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