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.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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