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.279 by root, Mon Jun 5 00:17:47 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 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
861 930
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
863 932
864 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
865} 934}
866 935
867############################################################################# 936#############################################################################
868 937
869package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
870 939
940use List::Util qw(min max);
941
871our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
872 943
873sub new { 944sub new {
874 my $class = shift; 945 my $class = shift;
875 946
876 $class->SUPER::new ( 947 $class->SUPER::new (
… …
889 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
890 961
891 ($w, $h) 962 ($w, $h)
892} 963}
893 964
894sub size_allocate { 965sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
896 967
897 my $child = $self->child; 968 my $child = $self->child;
898 969
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 972
902 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
903 $self->update; 974 $self->update;
975
976 1
904} 977}
905 978
906sub set_offset { 979sub set_offset {
907 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
908 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}) {
909 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
910 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
911 988
989 $self->emit (changed => $x, $y);
912 $self->update; 990 $self->update;
991 }
913} 992}
914 993
915# 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
916sub coord2local { 995sub coord2local {
917 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
932 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
933 1012
934 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
936 ) { 1015 ) {
937 $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})
938 } else { 1017 } else {
939 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
940 } 1019 }
941} 1020}
942 1021
943sub _render { 1022sub _render {
944 my ($self) = @_; 1023 my ($self) = @_;
945 1024
946 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};
947 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};
948 1027
949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950 1029
951 $self->SUPER::_render; 1030 $self->SUPER::_render;
952} 1031}
953 1032
954############################################################################# 1033#############################################################################
955 1034
956package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
957 1036
958our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
959 1038
960sub new { 1039sub new {
961 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
962 1041
963 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
964 1043
965 my $self; 1044 my $self;
966 1045
967 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
968 vertical => 1, 1056 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub { 1058 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
972 }, 1061 },
973 ; 1062 ;
974 1063
975 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
977 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
978 %arg, 1072 %arg,
979 ); 1073 );
980 1074
981 $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
982 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
983 1092
984 $self 1093 $self
985} 1094}
1095
1096#TODO# update range on size_allocate depending on child
986 1097
987sub add { 1098sub add {
988 my ($self, $widget) = @_; 1099 my ($self, $widget) = @_;
989 1100
990 $self->{vp}->add ($self->{child} = $widget); 1101 $self->{vp}->add ($self->{child} = $widget);
991} 1102}
992 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
993sub update { 1128sub update {
994 my ($self) = @_; 1129 my ($self) = @_;
995 1130
1131 $self->update_slider;
996 $self->SUPER::update; 1132 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1133}
1002 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
1003sub size_allocate { 1188sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1005 1190
1191 $self->update_slider;
1006 $self->SUPER::size_allocate ($w, $h); 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1193}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1194
1015############################################################################# 1195#############################################################################
1016 1196
1017package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1018 1198
1019our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1020 1200
1021use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1022 1202
1023sub new { 1203sub new {
1024 my $class = shift; 1204 my $class = shift;
1025 1205
1026 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1052 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1053} 1233}
1054 1234
1055############################################################################# 1235#############################################################################
1056 1236
1057package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1058 1238
1059our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1060 1240
1061use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070 1242
1071sub new { 1243sub new {
1072 my ($class, %arg) = @_; 1244 my ($class, %arg) = @_;
1073 1245
1074 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) = @_;
1075 1357
1076 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1361 border => 0.6,
1080 can_events => 1, 1362 can_events => 1,
1081 min_w => 16, 1363 min_w => 64,
1082 min_h => 16, 1364 min_h => 32,
1083 %arg, 1365 %arg,
1084 ); 1366 );
1085 1367
1086 $self->{title} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1369 align => 0,
1088 valign => 1, 1370 valign => 1,
1089 text => $title, 1371 text => $self->{title},
1090 fontsize => $self->{border} 1372 fontsize => $self->{border},
1091 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 }
1092 1383
1093 $self 1384 $self
1094} 1385}
1095 1386
1096sub add { 1387sub add {
1097 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1098 1389
1099 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1393}
1102 1394
1103sub border { 1395sub border {
1104 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1105} 1397}
1106 1398
1107sub size_request { 1399sub size_request {
1108 my ($self) = @_; 1400 my ($self) = @_;
1109 1401
1110 $self->{title}->size_request 1402 $self->{title_widget}->size_request
1111 if $self->{title}; 1403 if $self->{title_widget};
1404
1405 $self->{close_button}->size_request
1406 if $self->{close_button};
1112 1407
1113 my ($w, $h) = $self->SUPER::size_request; 1408 my ($w, $h) = $self->SUPER::size_request;
1114 1409
1115 ( 1410 (
1116 $w + $self->border * 2, 1411 $w + $self->border * 2,
1117 $h + $self->border * 2, 1412 $h + $self->border * 2,
1118 ) 1413 )
1119} 1414}
1120 1415
1121sub size_allocate { 1416sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1123 1418
1124 if ($self->{title}) { 1419 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1420 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1421 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1422 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1423 }
1129 1424
1130 my $border = $self->border; 1425 my $border = $self->border;
1131 1426
1132 $h -= List::Util::max 0, $border * 2; 1427 $h -= List::Util::max 0, $border * 2;
1133 $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;
1134 1442
1135 $self->child->configure ($border, $border, $w, $h); 1443 1
1136} 1444}
1137 1445
1138sub button_down { 1446sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
1140 1448
1141 my ($w, $h) = @$self{qw(w h)}; 1449 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1450 my $border = $self->border;
1143 1451
… …
1174 1482
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1483 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1484
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1485 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1486 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1487 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1488 };
1181 } else { 1489 } else {
1182 return 0; 1490 return 0;
1183 } 1491 }
1184 1492
1185 1 1493 1
1186} 1494}
1187 1495
1188sub button_up { 1496sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1497 my ($self, $ev, $x, $y) = @_;
1190 1498
1191 !!delete $self->{motion} 1499 ! ! delete $self->{motion}
1192} 1500}
1193 1501
1194sub mouse_motion { 1502sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1196 1504
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1506
1199 !!$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
1200} 1516}
1201 1517
1202sub _draw { 1518sub _draw {
1203 my ($self) = @_; 1519 my ($self) = @_;
1204 1520
… …
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1212 1528
1213 my $border = $self->border; 1529 my $border = $self->border;
1214 1530
1215 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1216 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1219 $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);
1220 1550
1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1223 1553
1224 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1230 1560
1231 glDisable GL_TEXTURE_2D; 1561 glDisable GL_TEXTURE_2D;
1232 1562
1233 $child->draw; 1563 $child->draw;
1234 1564
1235 if ($self->{title}) { 1565 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1566 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1567 $self->{title_widget}->_draw;
1568
1569 glTranslate 0, - ($border - $self->{h});
1238 } 1570 }
1571
1572 $self->{close_button}->draw
1573 if $self->{close_button};
1239} 1574}
1240 1575
1241############################################################################# 1576#############################################################################
1242 1577
1243package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1244 1579
1245our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1246 1581
1247use List::Util qw(max sum); 1582use List::Util qw(max sum);
1248 1583
1249use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1250 1585
1251sub new { 1586sub new {
1252 my $class = shift; 1587 my $class = shift;
1253 1588
1254 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1255 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1256 @_, 1593 @_,
1257 ) 1594 )
1258} 1595}
1259 1596
1260sub children { 1597sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262} 1599}
1263 1600
1601# TODO: store row/col info in child widget and use standard add/del
1264sub add { 1602sub add {
1265 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1266 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
1267 $child->set_parent ($self); 1615 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1269 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1270 $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 }
1271} 1632}
1272 1633
1273# 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?
1274sub clear { 1635sub clear {
1275 my ($self) = @_; 1636 my ($self) = @_;
… …
1316 (sum @$ws), 1677 (sum @$ws),
1317 (sum @$hs), 1678 (sum @$hs),
1318 ) 1679 )
1319} 1680}
1320 1681
1321sub size_allocate { 1682sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1683 my ($self, $w, $h) = @_;
1323 1684
1324 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1325 1686
1326 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1327 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1328 1689
1329 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1330 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1331 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1332 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1333 1694
1334 # linearly scale sizes
1335 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1336 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1337 1696
1338 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
1339 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1340 1706
1341 my $y; 1707 my $y;
1342 1708
1343 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1344 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1358 } 1724 }
1359 1725
1360 $y += $row_h; 1726 $y += $row_h;
1361 } 1727 }
1362 1728
1729 1
1363} 1730}
1364 1731
1365sub find_widget { 1732sub find_widget {
1366 my ($self, $x, $y) = @_; 1733 my ($self, $x, $y) = @_;
1367 1734
… …
1386 } 1753 }
1387} 1754}
1388 1755
1389############################################################################# 1756#############################################################################
1390 1757
1391package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1392 1759
1760use List::Util qw(min max);
1761
1393our @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::;
1394 1843
1395sub size_request { 1844sub size_request {
1396 my ($self) = @_; 1845 my ($self) = @_;
1397 1846
1398 $self->{vertical} 1847 $self->{vertical}
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1853 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1854 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1855 )
1407} 1856}
1408 1857
1409sub size_allocate { 1858sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1859 my ($self, $w, $h) = @_;
1411 1860
1412 my $space = $self->{vertical} ? $h : $w; 1861 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1862 my @children = $self->visible_children;
1414 1863
1415 my @req; 1864 my @req;
1416 1865
1417 if ($self->{homogeneous}) { 1866 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1867 @req = ($space / (@children || 1)) x @children;
1419 } else { 1868 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1869 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1870 my $req = List::Util::sum @req;
1422 1871
1423 if ($req > $space) { 1872 if ($req > $space) {
1424 # ah well, not enough space 1873 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1874 $_ *= $space / $req for @req;
1426 } else { 1875 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1876 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1877
1429 $space = ($space - $req) / $expand; # remaining space to give away 1878 $space = ($space - $req) / $expand; # remaining space to give away
1430 1879
1431 $req[$_] += $space * $children->[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1881 for 0 .. $#children;
1433 } 1882 }
1434 } 1883 }
1435 1884
1436 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1437 1886
1438 my $pos = 0; 1887 my $pos = 0;
1439 for (0 .. $#$children) { 1888 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1441 $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));
1442 1891
1443 $pos += $alloc; 1892 $pos += $alloc;
1444 } 1893 }
1445 1894
1446 1 1895 1
1447} 1896}
1448 1897
1449############################################################################# 1898#############################################################################
1450 1899
1451package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1452 1901
1453our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1454 1903
1455sub new { 1904sub new {
1456 my $class = shift; 1905 my $class = shift;
1457 1906
1458 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1461 ) 1910 )
1462} 1911}
1463 1912
1464############################################################################# 1913#############################################################################
1465 1914
1466package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1467 1916
1468our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1469 1918
1470sub new { 1919sub new {
1471 my $class = shift; 1920 my $class = shift;
1472 1921
1473 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1476 ) 1925 )
1477} 1926}
1478 1927
1479############################################################################# 1928#############################################################################
1480 1929
1481package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1482 1931
1483our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1484 1933
1485use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1486 1935
1487sub new { 1936sub new {
1488 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1489 1938
1490 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1493 #active_bg => none 1942 #active_bg => none
1494 #font => default_font 1943 #font => default_font
1495 #text => initial text 1944 #text => initial text
1496 #markup => initial narkup 1945 #markup => initial narkup
1497 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1498 ellipsise => 3, # end 1948 ellipsise => 3, # end
1499 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1500 fontsize => 1, 1950 fontsize => 1,
1501 align => -1, 1951 align => -1,
1502 valign => -1, 1952 valign => -1,
1503 padding_x => 2, 1953 padding_x => 2,
1504 padding_y => 2, 1954 padding_y => 2,
1505 can_events => 0, 1955 can_events => 0,
1506 %arg 1956 %arg
1507 ); 1957 );
1508 1958
1509 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1511 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout; 1962 $self->{template} = $layout;
1513 } 1963 }
1514 1964
1515 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1519 } 1969 }
1520 1970
1521 $self 1971 $self
1522} 1972}
1523 1973
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1974sub update {
1535 my ($self) = @_; 1975 my ($self) = @_;
1536 1976
1537 delete $self->{texture}; 1977 delete $self->{texture};
1538 $self->SUPER::update; 1978 $self->SUPER::update;
1539} 1979}
1540 1980
1981sub realloc {
1982 my ($self) = @_;
1983
1984 delete $self->{ox};
1985 $self->SUPER::realloc;
1986}
1987
1541sub set_text { 1988sub set_text {
1542 my ($self, $text) = @_; 1989 my ($self, $text) = @_;
1543 1990
1544 return if $self->{text} eq "T$text"; 1991 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1992 $self->{text} = "T$text";
1546 1993
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1994 $self->{layout}->set_text ($text);
1549 1995
1996 delete $self->{size_req};
1550 $self->realloc; 1997 $self->realloc;
1551 $self->update; 1998 $self->update;
1552} 1999}
1553 2000
1554sub set_markup { 2001sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 2004 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 2005 $self->{text} = "M$markup";
1559 2006
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2007 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 2008
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 2009 $self->{layout}->set_markup ($markup);
1564 2010
2011 delete $self->{size_req};
1565 $self->realloc; 2012 $self->realloc;
1566 $self->update; 2013 $self->update;
1567} 2014}
1568 2015
1569sub size_request { 2016sub size_request {
1570 my ($self) = @_; 2017 my ($self) = @_;
1571 2018
2019 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2020 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 2021 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2022 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2023 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2024 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 2025
1578 my ($w, $h) = $self->{layout}->size; 2026 my ($w, $h) = $self->{layout}->size;
1579 2027
1580 if (exists $self->{template}) { 2028 if (exists $self->{template}) {
1581 $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);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 2032
1584 my ($w2, $h2) = $self->{template}->size; 2033 my ($w2, $h2) = $self->{template}->size;
1585 2034
1586 $w = List::Util::max $w, $w2; 2035 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 2036 $h = List::Util::max $h, $h2;
2037 }
2038
2039 [$w, $h]
1588 } 2040 };
1589 2041
1590 ($w, $h) 2042 @{ $self->{size_req} }
1591} 2043}
1592 2044
2045sub baseline_shift {
2046 $_[0]{layout}->descent
2047}
2048
1593sub size_allocate { 2049sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 2050 my ($self, $w, $h) = @_;
1595 2051
1596 delete $self->{ox}; 2052 delete $self->{ox};
1597 2053
1598 delete $self->{texture} 2054 delete $self->{texture}
1599 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
1600} 2058}
1601 2059
1602sub set_fontsize { 2060sub set_fontsize {
1603 my ($self, $fontsize) = @_; 2061 my ($self, $fontsize) = @_;
1604 2062
1605 $self->{fontsize} = $fontsize; 2063 $self->{fontsize} = $fontsize;
2064 delete $self->{size_req};
1606 delete $self->{texture}; 2065 delete $self->{texture};
1607 2066
1608 $self->realloc; 2067 $self->realloc;
1609} 2068}
1610 2069
2070sub reconfigure {
2071 my ($self) = @_;
2072
2073 delete $self->{size_req};
2074 delete $self->{texture};
2075
2076 $self->SUPER::reconfigure;
2077}
2078
1611sub _draw { 2079sub _draw {
1612 my ($self) = @_; 2080 my ($self) = @_;
1613 2081
1614 $self->SUPER::_draw; # draw background, if applicable 2082 $self->SUPER::_draw; # draw background, if applicable
1615 2083
1616 my $tex = $self->{texture} ||= do { 2084 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 2085 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2086 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 2087 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2088 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2089 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2090 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 2091
1624 new_from_layout CFClient::Texture $self->{layout} 2092 [$self->{layout}->size]
1625 }; 2093 };
1626 2094
1627 unless (exists $self->{ox}) { 2095 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 2098 : ($self->{w} - $size->[0]) * 0.5);
1631 2099
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 2102 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 2103 };
1636 2104
1637 glEnable GL_TEXTURE_2D; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 2107
1640 glColor_premultiply @{$self->{fg}} 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 2109}
1647 2110
1648############################################################################# 2111#############################################################################
1649 2112
1650package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1651 2114
1652our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1653 2116
1654use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1655 2118
1656sub new { 2119sub new {
1657 my $class = shift; 2120 my $class = shift;
1658 2121
1659 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1663 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1664 can_hover => 1, 2127 can_hover => 1,
1665 can_focus => 1, 2128 can_focus => 1,
1666 valign => 0, 2129 valign => 0,
1667 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1668 #text => ... 2132 #text => ...
2133 #hidden => "*",
1669 @_ 2134 @_
1670 ) 2135 )
1671} 2136}
1672 2137
1673sub _set_text { 2138sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 2145 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 2146 $self->{text} = $text;
1682 2147
1683 $text =~ s/./*/g if $self->{hidden}; 2148 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 2149 $self->{layout}->set_text ("$text ");
2150 delete $self->{size_req};
1685 2151
1686 $self->_emit (changed => $self->{text}); 2152 $self->emit (changed => $self->{text});
2153
2154 $self->realloc;
1687 $self->update; 2155 $self->update;
1688} 2156}
1689 2157
1690sub set_text { 2158sub set_text {
1691 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
1692 2160
1693 $self->{cursor} = length $text; 2161 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 2162 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 2163}
1698 2164
1699sub get_text { 2165sub get_text {
1700 $_[0]{text} 2166 $_[0]{text}
1701} 2167}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 2172 my ($w, $h) = $self->SUPER::size_request;
1707 2173
1708 ($w + 1, $h) # add 1 for cursor 2174 ($w + 1, $h) # add 1 for cursor
1709} 2175}
1710 2176
1711sub key_down { 2177sub invoke_key_down {
1712 my ($self, $ev) = @_; 2178 my ($self, $ev) = @_;
1713 2179
1714 my $mod = $ev->{mod}; 2180 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1717 2183
1718 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;
1719 2187
1720 if ($uni == 8) { 2188 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } 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 = "";
1729 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2212 $self->emit ('escape');
1734 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2217 } else {
1737 return 0; 2218 return 0;
1738 } 2219 }
1739 2220
1740 $self->_set_text ($text); 2221 $self->_set_text ($text);
1741 2222
1742 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1743 2225
1744 1 2226 1
1745} 2227}
1746 2228
1747sub focus_in { 2229sub invoke_focus_in {
1748 my ($self) = @_; 2230 my ($self) = @_;
1749 2231
1750 $self->{last_activity} = $::NOW; 2232 $self->{last_activity} = $::NOW;
1751 2233
1752 $self->SUPER::focus_in; 2234 $self->SUPER::invoke_focus_in
1753} 2235}
1754 2236
1755sub button_down { 2237sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2238 my ($self, $ev, $x, $y) = @_;
1757 2239
1758 $self->SUPER::button_down ($ev, $x, $y); 2240 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2241
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2243
1762 # byte-index to char-index 2244 # byte-index to char-index
1763 my $text = $self->{text}; 2245 my $text = $self->{text};
1764 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1766 2248
1767 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1768 $self->update; 2250 $self->update;
1769 2251
1770 1 2252 1
1771} 2253}
1772 2254
1773sub mouse_motion { 2255sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2256 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 2258
1777 0 2259 1
1778} 2260}
1779 2261
1780sub _draw { 2262sub _draw {
1781 my ($self) = @_; 2263 my ($self) = @_;
1782 2264
… …
1809 utf8::encode $text; 2291 utf8::encode $text;
1810 2292
1811 @$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)
1812 } 2294 }
1813 2295
1814 glColor @{$self->{fg}};
1815 glBegin GL_LINES; 2296 glBegin GL_LINES;
1816 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};
1817 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};
1818 glEnd; 2299 glEnd;
1819 } 2300 }
1820} 2301}
1821 2302
2303#############################################################################
2304
1822package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1823 2306
1824our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1825 2308
1826use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1827 2310
1828sub key_down { 2311sub invoke_key_down {
1829 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1830 2313
1831 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1832 2315
1833 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
2319
1836 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2322 $self->emit (activate => $txt);
1839 $self->update; 2323 $self->update;
1840 2324
1841 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1844 } 2328 }
1845 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2333 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2335 }
1852 2336
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2340
1857 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2343 } else {
1860 $self->set_text ($self->{history_saveback}); 2344 $self->set_text ($self->{history_saveback});
1861 } 2345 }
1862 2346
1863 } else { 2347 } else {
1864 return $self->SUPER::key_down ($ev) 2348 return $self->SUPER::invoke_key_down ($ev)
1865 } 2349 }
1866 2350
1867 1 2351 1
1868} 2352}
1869 2353
1870############################################################################# 2354#############################################################################
1871 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
1872package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1873 2396
1874our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1875 2398
1876use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1877 2400
1878my @tex = 2401my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1881 2404
1882sub new { 2405sub new {
1883 my $class = shift; 2406 my $class = shift;
1884 2407
1885 $class->SUPER::new ( 2408 $class->SUPER::new (
1886 padding_x => 4, 2409 padding_x => 4,
1887 padding_y => 4, 2410 padding_y => 4,
1888 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1889 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1890 can_hover => 1, 2413 can_hover => 1,
1891 align => 0, 2414 align => 0,
1892 valign => 0, 2415 valign => 0,
1893 can_events => 1, 2416 can_events => 1,
1894 @_ 2417 @_
1895 ) 2418 )
1896} 2419}
1897 2420
1898sub activate { }
1899
1900sub button_up { 2421sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2422 my ($self, $ev, $x, $y) = @_;
1902 2423
1903 $self->emit ("activate") 2424 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2425 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2426 && $y >= 0 && $y < $self->{h};
… …
1914 2435
1915 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1917 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1918 2439
2440 my $tex = $tex[$GRAB == $self];
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 2442
1921 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1922 2444
1923 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1924} 2446}
1925 2447
1926############################################################################# 2448#############################################################################
1927 2449
1928package CFClient::UI::CheckBox; 2450package CFPlus::UI::CheckBox;
1929 2451
1930our @ISA = CFClient::UI::DrawBG::; 2452our @ISA = CFPlus::UI::DrawBG::;
1931 2453
1932my @tex = 2454my @tex =
1933 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1934 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1935 2457
1936use CFClient::OpenGL; 2458use CFPlus::OpenGL;
1937 2459
1938sub new { 2460sub new {
1939 my $class = shift; 2461 my $class = shift;
1940 2462
1941 $class->SUPER::new ( 2463 $class->SUPER::new (
… …
1955 my ($self) = @_; 2477 my ($self) = @_;
1956 2478
1957 (6) x 2 2479 (6) x 2
1958} 2480}
1959 2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
1960sub button_down { 2490sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2491 my ($self, $ev, $x, $y) = @_;
1962 2492
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2495 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2496 } else {
1968 return 0 2497 return 0
1969 } 2498 }
1970 2499
1971 1 2500 1
… …
1991 glDisable GL_TEXTURE_2D; 2520 glDisable GL_TEXTURE_2D;
1992} 2521}
1993 2522
1994############################################################################# 2523#############################################################################
1995 2524
1996package CFClient::UI::Image; 2525package CFPlus::UI::Image;
1997 2526
1998our @ISA = CFClient::UI::Base::; 2527our @ISA = CFPlus::UI::Base::;
1999 2528
2000use CFClient::OpenGL; 2529use CFPlus::OpenGL;
2001use Carp qw/confess/;
2002 2530
2003our %loaded_images; 2531our %texture_cache;
2004 2532
2005sub new { 2533sub new {
2006 my $class = shift; 2534 my $class = shift;
2007 2535
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2009 2540
2010 $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";
2011 2543
2012 $loaded_images{$self->{image}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 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;
2014 2546
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
2016 2548
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2550
2021 $self 2551 $self
2022} 2552}
2023 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
2024sub size_request { 2569sub size_request {
2025 my ($self) = @_; 2570 my ($self) = @_;
2026 2571
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2572 ($self->{tex}{w}, $self->{tex}{h})
2028} 2573}
2029 2574
2030sub _draw { 2575sub _draw {
2031 my ($self) = @_; 2576 my ($self) = @_;
2032 2577
… …
2042 } 2587 }
2043 2588
2044 glEnable GL_TEXTURE_2D; 2589 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046 2591
2047 $tex->draw_quad_alpha (0, 0, $w, $h); 2592 $tex->draw_quad (0, 0, $w, $h);
2048 2593
2049 glDisable GL_TEXTURE_2D; 2594 glDisable GL_TEXTURE_2D;
2050} 2595}
2051 2596
2052############################################################################# 2597#############################################################################
2053 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
2054package CFClient::UI::VGauge; 2635package CFPlus::UI::VGauge;
2055 2636
2056our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2057 2638
2058use List::Util qw(min max); 2639use List::Util qw(min max);
2059 2640
2060use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2061 2642
2062my %tex = ( 2643my %tex = (
2063 food => [ 2644 food => [
2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2066 ], 2647 ],
2067 grace => [ 2648 grace => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 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/
2070 ], 2651 ],
2071 hp => [ 2652 hp => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2074 ], 2655 ],
2075 mana => [ 2656 mana => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 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/
2078 ], 2659 ],
2079); 2660);
2080 2661
2081# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2722 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2723 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2724
2144 my $h1 = $self->{h} * (1 - $ycut1); 2725 my $h1 = $self->{h} * (1 - $ycut1);
2145 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);
2146 2730
2147 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2732 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2734 glEnable GL_TEXTURE_2D;
… …
2169 2753
2170 if ($t3) { 2754 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2755 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2756 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2758 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2761 glEnd;
2178 } 2762 }
2179 2763
2180 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2181 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2182} 2766}
2183 2767
2184############################################################################# 2768#############################################################################
2185 2769
2186package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2187 2771
2188our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2189 2773
2190sub new { 2774sub new {
2191 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2192 2776
2193 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2195 can_hover => 1, 2779 can_hover => 1,
2196 can_events => 1, 2780 can_events => 1,
2197 %arg, 2781 %arg,
2198 ); 2782 );
2199 2783
2200 $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");
2201 $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);
2202 $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");
2203 2787
2204 $self 2788 $self
2205} 2789}
2206 2790
2207sub set_fontsize { 2791sub set_fontsize {
… …
2228 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2229} 2813}
2230 2814
2231############################################################################# 2815#############################################################################
2232 2816
2233package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2234 2818
2235use strict; 2819use strict;
2236 2820
2237use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2238 2822
2239our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2240 2824
2241my @tex = 2825my @tex =
2242 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2243 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2244 2828
2245sub new { 2829sub new {
2246 my $class = shift; 2830 my $class = shift;
2247 2831
… …
2268 $self->update; 2852 $self->update;
2269 2853
2270 $self 2854 $self
2271} 2855}
2272 2856
2273sub changed { }
2274
2275sub set_range { 2857sub set_range {
2276 my ($self, $range) = @_; 2858 my ($self, $range) = @_;
2277 2859
2278 ($range, $self->{range}) = ($self->{range}, $range); 2860 ($range, $self->{range}) = ($self->{range}, $range);
2279 2861
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2862 if ("@$range" ne "@{$self->{range}}") {
2863 $self->update;
2864 $self->set_value ($self->{range}[0]);
2865 }
2282} 2866}
2283 2867
2284sub set_value { 2868sub set_value {
2285 my ($self, $value) = @_; 2869 my ($self, $value) = @_;
2286 2870
… …
2297 if $unit; 2881 if $unit;
2298 2882
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2883 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2884
2301 if ($value != $old_value) { 2885 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2886 $self->emit (changed => $value);
2303 $self->update; 2887 $self->update;
2304 } 2888 }
2305} 2889}
2306 2890
2307sub size_request { 2891sub size_request {
2308 my ($self) = @_; 2892 my ($self) = @_;
2309 2893
2310 ($self->{req_w}, $self->{req_h}) 2894 ($self->{req_w}, $self->{req_h})
2311} 2895}
2312 2896
2313sub button_down { 2897sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2898 my ($self, $ev, $x, $y) = @_;
2315 2899
2316 $self->SUPER::button_down ($ev, $x, $y); 2900 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2901
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2903
2320 $self->mouse_motion ($ev, $x, $y) 2904 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2905}
2322 2906
2323sub mouse_motion { 2907sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2908 my ($self, $ev, $x, $y) = @_;
2325 2909
2326 if ($GRAB == $self) { 2910 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2911 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2912
… …
2334 } else { 2918 } else {
2335 return 0; 2919 return 0;
2336 } 2920 }
2337 2921
2338 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
2339} 2935}
2340 2936
2341sub update { 2937sub update {
2342 my ($self) = @_; 2938 my ($self) = @_;
2343 2939
… …
2392 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2393} 2989}
2394 2990
2395############################################################################# 2991#############################################################################
2396 2992
2397package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2398 2994
2399our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2400 2996
2401sub new { 2997sub new {
2402 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2403 2999
2404 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2405 3001
2406 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift }, 3005 to_value => sub { shift },
2410 from_value => sub { shift }, 3006 from_value => sub { shift },
2411 %arg, 3007 %arg,
2412 ); 3008 );
2413 3009
… …
2433sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2435 3031
2436############################################################################# 3032#############################################################################
2437 3033
2438package CFClient::UI::TextView; 3034package CFPlus::UI::TextScroller;
2439 3035
2440our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2441 3037
2442use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2443 3039
2444sub new { 3040sub new {
2445 my $class = shift; 3041 my $class = shift;
2446 3042
2447 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2448 fontsize => 1, 3044 fontsize => 1,
2449 can_events => 0, 3045 can_events => 1,
3046 indent => 0,
2450 #font => default_font 3047 #font => default_font
2451 @_, 3048 @_,
2452 3049
2453 layout => (new CFClient::Layout 1), 3050 layout => (new CFPlus::Layout),
2454 par => [], 3051 par => [],
3052 max_par => 0,
2455 height => 0, 3053 height => 0,
2456 children => [ 3054 children => [
2457 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2459 ], 3057 ],
2460 ); 3058 );
2461 3059
2462 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2463 3061
… …
2469 3067
2470 $self->{fontsize} = $fontsize; 3068 $self->{fontsize} = $fontsize;
2471 $self->reflow; 3069 $self->reflow;
2472} 3070}
2473 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
2474sub size_allocate { 3081sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 3082 my ($self, $w, $h) = @_;
2476 3083
2477 $self->SUPER::size_allocate ($w, $h); 3084 my ($empty, $slider, @other) = @{ $self->{children} };
3085 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 3086
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3087 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3088 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $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});
2482 3091
2483 $self->reflow; 3092 $self->reflow;
2484}
2485 3093
2486sub text_size { 3094 local $self->{children} = [$empty, $slider];
3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
2487 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) = @_;
2488 3110
2489 my $layout = $self->{layout}; 3111 my $layout = $self->{layout};
2490 3112
3113 $layout->set_font ($self->{font}) if $self->{font};
3114 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3115 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $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});
2493 $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}}
2494 3124 );
3125
2495 $layout->size 3126 $layout
2496} 3127}
2497 3128
2498sub reflow { 3129sub reflow {
2499 my ($self) = @_; 3130 my ($self) = @_;
2500 3131
… …
2507 3138
2508 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2510} 3141}
2511 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
2512sub clear { 3158sub clear {
2513 my ($self) = @_; 3159 my ($self) = @_;
3160
3161 my (undef, undef, @other) = @{ $self->{children} };
3162 $self->remove ($_) for @other;
2514 3163
2515 $self->{par} = []; 3164 $self->{par} = [];
2516 $self->{height} = 0; 3165 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 3167}
2519 3168
2520sub add_paragraph { 3169sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 3170 my $self = shift;
2522 3171
2523 for my $line (split /\n/, $text) { 3172 for my $para (@_) {
2524 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
2525 $self->{height} += $h; 3224 $self->{height} = $height;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 }
2528 3226
2529 $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 }
2530} 3233}
2531 3234
2532sub update { 3235sub update {
2533 my ($self) = @_; 3236 my ($self) = @_;
2534 3237
… …
2536 3239
2537 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2538 3241
2539 delete $self->{texture}; 3242 delete $self->{texture};
2540 3243
2541 $ROOT->on_post_alloc ($self, sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 3248
2544 if (delete $self->{need_reflow}) {
2545 my $height = 0;
2546
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2562
2563 $self->{height} = $height;
2564
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2566
2567 delete $self->{texture};
2568 }
2569
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2573 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;
2574 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2575 3262
2576 my $y0 = $top; 3263 my $y0 = $top;
2577 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2578 3265
2579 my $y = 0;
2580
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2591 3269
2592 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 3271 my $layout = $self->get_layout ($para);
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 3272
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3273 $layout->render ($para->{indent}, $y - $y0);
2598 3274
2599 glRasterPos $par->[3], $y - $y0; 3275 if (my @w = @{ $para->{widget} }) {
2600 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 }
2601 } 3287 }
2602 3288
2603 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2604 } 3291 }
2605 3292
2606 glDisable GL_BLEND; 3293 $self->{top_paragraph} = $top_paragraph;
2607 }; 3294 };
2608 }); 3295 });
3296}
3297
3298sub reconfigure {
3299 my ($self) = @_;
3300
3301 $self->SUPER::reconfigure;
3302
3303 $_->{w} = 1e10 for @{ $self->{par} };
3304 $self->reflow;
2609} 3305}
2610 3306
2611sub _draw { 3307sub _draw {
2612 my ($self) = @_; 3308 my ($self) = @_;
2613 3309
… …
2616 glColor 0, 0, 0, 1; 3312 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (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});
2618 glDisable GL_TEXTURE_2D; 3314 glDisable GL_TEXTURE_2D;
2619 3315
2620 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2621
2622} 3317}
2623 3318
2624############################################################################# 3319#############################################################################
2625 3320
2626package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2627 3322
2628use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2629 3324
2630our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2631 3326
2632sub moveto { 3327sub moveto {
2633 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2634 3329
2635 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2663 glPopMatrix; 3358 glPopMatrix;
2664} 3359}
2665 3360
2666############################################################################# 3361#############################################################################
2667 3362
2668package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2669 3364
2670our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2671 3366
2672sub new { 3367sub new {
2673 my $class = shift; 3368 my $class = shift;
2674 3369
2675 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2687 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2688} 3383}
2689 3384
2690############################################################################# 3385#############################################################################
2691 3386
2692package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2693 3388
2694our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2695 3390
2696use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2697 3392
2698sub new { 3393sub new {
2699 my $class = shift; 3394 my $class = shift;
2700 3395
2701 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2704 ) 3399 )
2705} 3400}
2706 3401
2707sub set_tooltip_from { 3402sub set_tooltip_from {
2708 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2709 3407
2710 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2711 3409
2712 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3412 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 3413 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 3414 . "visible $widget->{visible}";
2717 } 3415 }
2718 3416
3417 $tooltip =~ s/^\n+//;
3418 $tooltip =~ s/\n+$//;
3419
2719 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2720 markup => $tooltip, 3421 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 3423 fontsize => 0.8,
2723 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2724 ellipsise => 0, 3425 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 ); 3427 );
2727} 3428}
2728 3429
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3433 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3434
2734 ($w + 4, $h + 4) 3435 ($w + 4, $h + 4)
2735} 3436}
2736 3437
2737sub size_allocate { 3438sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3439 my ($self, $w, $h) = @_;
2739 3440
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3441 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3442}
2742 3443
2743sub visibility_change { 3444sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3445 my ($self, $visible) = @_;
2745 3446
2746 return unless $visible; 3447 return unless $visible;
2747 3448
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2750 or return; 3451 or return;
2751 3452
3453 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3455
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3457 if $x + $self->{w} > $self->{root}{w};
2756 3458
2757 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2758 }); 3463 });
2759} 3464}
2760 3465
2761sub _draw { 3466sub _draw {
2762 my ($self) = @_; 3467 my ($self) = @_;
… …
2786 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2787} 3492}
2788 3493
2789############################################################################# 3494#############################################################################
2790 3495
2791package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2792 3497
2793our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2794 3499
2795use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2796 3501
2797sub new { 3502sub new {
2798 my $class = shift; 3503 my $class = shift;
2799 3504
2800 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2801 aspect => 1, 3508 aspect => 1,
2802 can_events => 0, 3509 can_events => 0,
2803 @_, 3510 @_,
2804 ); 3511 );
2805 3512
2806 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2808 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2809 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1, 3519 parked => 1,
2812 interval => $self->{animspeed},
2813 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2814 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2815 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2816 }, 3528 },
2817 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2818 } 3533 }
2819 3534
2820 $self 3535 $self
2821} 3536}
2822 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
2823sub size_request { 3568sub size_request {
2824 (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)
2825} 3584}
2826 3585
2827sub update { 3586sub update {
2828 my ($self) = @_; 3587 my ($self) = @_;
2829 3588
2830 return unless $self->{visible}; 3589 return unless $self->{visible};
2831 3590
2832 $self->SUPER::update; 3591 $self->SUPER::update;
2833} 3592}
2834 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
2835sub _draw { 3602sub _draw {
2836 my ($self) = @_; 3603 my ($self) = @_;
2837 3604
2838 return unless $::CONN; 3605 return unless $::CONN;
2839 3606
2840 my $face; 3607 $self->SUPER::_draw;
2841 3608
2842 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
2844 3610 or return;
2845 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim;
2847 }
2848 3611
2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
2850 3613
2851 if ($tex) { 3614 if ($tex) {
2852 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2854 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3619 glDisable GL_TEXTURE_2D;
2857 } 3620 }
2858} 3621}
2859 3622
2860sub DESTROY { 3623sub destroy {
2861 my ($self) = @_; 3624 my ($self) = @_;
2862 3625
2863 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
2864 if $self->{timer}; 3627 if $self->{timer};
2865 3628
2866 $self->SUPER::DESTROY; 3629 $self->SUPER::destroy;
2867} 3630}
2868 3631
2869############################################################################# 3632#############################################################################
2870 3633
2871package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
2872 3635
2873our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
2874 3637
2875# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
2876 3639
2877############################################################################# 3640#############################################################################
2878 3641
2879package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
2880 3643
2881our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
2882 3645
2883use CFClient::OpenGL; 3646use CFPlus::OpenGL;
2884 3647
2885sub new { 3648sub new {
2886 my $class = shift; 3649 my $class = shift;
2887 3650
2888 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
2889 items => [], 3652 items => [],
2890 z => 100, 3653 z => 100,
2891 @_, 3654 @_,
2892 ); 3655 );
2893 3656
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2895 3658
2896 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
2898 3661
2899 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
2900 if (!ref $widget) { 3663 if (!ref $widget) {
3664 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2;
3666
2901 $widget = new CFClient::UI::Label 3667 $widget = new CFPlus::UI::HBox
2902 can_hover => 1, 3668 can_hover => 1,
2903 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,
2904 text => $widget; 3681 markup => $widget,
3682 tooltip => $tooltip;
3683 }
2905 } 3684 }
2906 3685
2907 $self->{item}{$widget} = $item; 3686 $self->{item}{$widget} = $item;
2908 3687
2909 $self->{vbox}->add ($widget); 3688 $self->{vbox}->add ($widget);
… …
2914 3693
2915# 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)
2916sub popup { 3695sub popup {
2917 my ($self, $ev) = @_; 3696 my ($self, $ev) = @_;
2918 3697
2919 $self->_emit ("popdown"); 3698 $self->emit ("popdown");
2920 3699
2921 # maybe save $GRAB? must be careful about events... 3700 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3701 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3702 $self->{button} = $ev->{button};
2924 3703
2925 $self->show; 3704 $self->show;
2926 $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);
2927} 3706}
2928 3707
2929sub mouse_motion { 3708sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3709 my ($self, $ev, $x, $y) = @_;
2931 3710
2932 # TODO: should use vbox->find_widget or so 3711 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3712 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3713 $self->{hover} = $self->{item}{$HOVER};
2935 3714
2936 0 3715 0
2937} 3716}
2938 3717
2939sub button_up { 3718sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3719 my ($self, $ev, $x, $y) = @_;
2941 3720
2942 if ($ev->{button} == $self->{button}) { 3721 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3722 undef $GRAB;
2944 $self->hide; 3723 $self->hide;
2945 3724
2946 $self->_emit ("popdown"); 3725 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3726 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3727 } else {
2949 return 0 3728 return 0
2950 } 3729 }
2951 3730
2952 1 3731 1
2953} 3732}
2954 3733
2955############################################################################# 3734#############################################################################
2956 3735
2957package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
2958 3737
2959our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
2960 3739
2961sub new { 3740sub new {
2962 my $class = shift; 3741 my $class = shift;
2963 3742
2964 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
2978 3757
2979 $self->{current} = $self->{children}[0] 3758 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3759 if @{ $self->{children} };
2981} 3760}
2982 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{current}
3766}
3767
2983sub set_current_page { 3768sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3769 my ($self, $page_or_widget) = @_;
2985 3770
2986 my $widget = ref $page_or_widget 3771 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3772 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3773 : $self->{children}[$page_or_widget];
2989 3774
2990 $self->{current} = $widget; 3775 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3776 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3777
2993 $self->_emit (page_changed => $self->{current}); 3778 $self->emit (page_changed => $self->{current});
2994 3779
2995 $self->realloc; 3780 $self->realloc;
2996} 3781}
2997 3782
2998sub visible_children { 3783sub visible_children {
… …
3003 my ($self) = @_; 3788 my ($self) = @_;
3004 3789
3005 $self->{current}->size_request 3790 $self->{current}->size_request
3006} 3791}
3007 3792
3008sub size_allocate { 3793sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
3010 3795
3011 $self->{current}->configure (0, 0, $w, $h); 3796 $self->{current}->configure (0, 0, $w, $h);
3797
3798 1
3012} 3799}
3013 3800
3014sub _draw { 3801sub _draw {
3015 my ($self) = @_; 3802 my ($self) = @_;
3016 3803
3017 $self->{current}->draw; 3804 $self->{current}->draw;
3018} 3805}
3019 3806
3020############################################################################# 3807#############################################################################
3021 3808
3022package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3023 3810
3024our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3025 3812
3026sub new { 3813sub new {
3027 my $class = shift; 3814 my $class = shift;
3028 3815
3029 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3033 @_, 3820 @_,
3034 ); 3821 );
3035 3822
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3040} 3827}
3041 3828
3042sub add { 3829sub add {
3043 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3044 3831
3045 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3046 3833
3047 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3048 markup => $title, 3835 markup => $title,
3049 tooltip => $tooltip, 3836 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3051 ); 3838 );
3052 3839
3053 $self->{multiplexer}->add ($widget); 3840 $self->{multiplexer}->add ($widget);
3054} 3841}
3055 3842
3843sub get_current_page {
3844 my ($self) = @_;
3845
3846 $self->{multiplexer}->get_current_page
3847}
3848
3056sub set_current_page { 3849sub set_current_page {
3057 my ($self, $page) = @_; 3850 my ($self, $page) = @_;
3058 3851
3059 $self->{multiplexer}->set_current_page ($page); 3852 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3854}
3062 3855
3063############################################################################# 3856#############################################################################
3064 3857
3065package CFClient::UI::Statusbox; 3858package CFPlus::UI::Selector;
3066 3859
3860use utf8;
3861
3067our @ISA = CFClient::UI::VBox::; 3862our @ISA = CFPlus::UI::Button::;
3068 3863
3069sub new { 3864sub new {
3070 my $class = shift; 3865 my $class = shift;
3071 3866
3072 $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 (
3073 fontsize => 0.8, 3922 fontsize => 0.8,
3074 @_, 3923 @_,
3075 ) 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
3076} 3931}
3077 3932
3078sub reorder { 3933sub reorder {
3079 my ($self) = @_; 3934 my ($self) = @_;
3080 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} };
3081 3941
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3944 }
3085 3945
… …
3088 my @items = sort { 3948 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3949 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3950 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3951 } values %{ $self->{item} };
3092 3952
3953 $self->{timer}->interval (1);
3954
3093 my $count = 10 + 1; 3955 my $count = 10 + 1;
3094 for my $item (@items) { 3956 for my $item (@items) {
3095 last unless --$count; 3957 last unless --$count;
3096 3958
3097 push @widgets, $item->{label} ||= do { 3959 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3960 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3961 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3962 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3963 : $item->{text};
3102 3964
3103 for ($short) { 3965 for ($short) {
3104 s/^\s+//; 3966 s/^\s+//;
3105 s/\s+/ /g; 3967 s/\s+/ /g;
3106 } 3968 }
3107 3969
3108 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3109 markup => $short, 3971 markup => $short,
3110 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3976 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3977 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3978 can_events => 1,
3117 can_hover => 1 3979 can_hover => 1
3118 }; 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;
3119 } 3993 }
3120 3994
3121 $self->clear; 3995 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3996 $self->SUPER::add (reverse @widgets);
3123} 3997}
… …
3128 $text =~ s/^\s+//; 4002 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 4003 $text =~ s/\s+$//;
3130 4004
3131 return unless $text; 4005 return unless $text;
3132 4006
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 4007 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 4008
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4009 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 4010
3137 if (my $item = $self->{item}{$group}) { 4011 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 4012 if ($item->{text} eq $text) {
3139 $item->{count}++; 4013 $item->{count}++;
3140 } else { 4014 } else {
3141 $item->{count} = 1; 4015 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 4016 $item->{text} = $item->{tooltip} = $text;
3143 } 4017 }
3144 $item->{id} = ++$self->{id}; 4018 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 4019 $item->{timeout} = $timeout;
3146 delete $item->{label}; 4020 delete $item->{label};
3147 } else { 4021 } else {
3148 $self->{item}{$group} = { 4022 $self->{item}{$group} = {
3149 id => ++$self->{id}, 4023 id => ++$self->{id},
… …
3155 count => 1, 4029 count => 1,
3156 %arg, 4030 %arg,
3157 }; 4031 };
3158 } 4032 }
3159 4033
4034 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 4035 $self->reorder;
4036 });
3161} 4037}
3162 4038
3163sub reconfigure { 4039sub reconfigure {
3164 my ($self) = @_; 4040 my ($self) = @_;
3165 4041
… …
3168 4044
3169 $self->reorder; 4045 $self->reorder;
3170 $self->SUPER::reconfigure; 4046 $self->SUPER::reconfigure;
3171} 4047}
3172 4048
4049sub destroy {
4050 my ($self) = @_;
4051
4052 $self->{timer}->cancel;
4053
4054 $self->SUPER::destroy;
4055}
4056
3173############################################################################# 4057#############################################################################
3174 4058
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3471 4060
3472our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3473 4062
4063use List::Util qw(min max);
4064
3474use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3475 4066
3476sub new { 4067sub new {
3477 my $class = shift; 4068 my $class = shift;
3478 4069
3479 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3480 visible => 1, 4071 visible => 1,
3481 @_, 4072 @_,
3482 ); 4073 );
3483 4074
3484 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3485 4076
3486 $self 4077 $self
3487} 4078}
3488 4079
3489sub size_request { 4080sub size_request {
… …
3504 $coord = $max - $size if $coord > $max - $size; 4095 $coord = $max - $size if $coord > $max - $size;
3505 4096
3506 int $coord + 0.5 4097 int $coord + 0.5
3507} 4098}
3508 4099
3509sub size_allocate { 4100sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 4101 my ($self, $w, $h) = @_;
3511 4102
3512 for my $child ($self->children) { 4103 for my $child ($self->children) {
3513 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)};
3514 4105
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 4109 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 4110 $Y = _to_pixel $Y, $H, $self->{h};
3520 4111
3521 $child->configure ($X, $Y, $W, $H); 4112 $child->configure ($X, $Y, $W, $H);
3522 } 4113 }
4114
4115 1
3523} 4116}
3524 4117
3525sub coord2local { 4118sub coord2local {
3526 my ($self, $x, $y) = @_; 4119 my ($self, $x, $y) = @_;
3527 4120
… …
3612 4205
3613 delete $queue{$widget+0}; 4206 delete $queue{$widget+0};
3614 4207
3615 my ($w, $h) = $widget->size_request; 4208 my ($w, $h) = $widget->size_request;
3616 4209
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4210 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $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};
3619 4215
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 4216 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 4217 $h = $widget->{force_h} if exists $widget->{force_h};
3622 4218
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4219 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 4247
3652 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3654 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
3655 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
3657 4262
3658 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}) {
3659 $widget->{old_w} = $widget->{w}; 4264 $widget->{old_w} = $widget->{w};
… …
3669 4274
3670 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3671 $_->() 4276 $_->()
3672 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3673 } 4278 }
3674
3675 4279
3676 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3678 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3679 4283
… …
3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3684 glLoadIdentity; 4288 glLoadIdentity;
3685 4289
3686 { 4290 {
3687 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3688 4292
3689 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3691 }
3692 4295
3693 $self->_draw; 4296 $self->_draw;
4297 }
3694} 4298}
3695 4299
3696############################################################################# 4300#############################################################################
3697 4301
3698package CFClient::UI; 4302package CFPlus::UI;
3699 4303
3700$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3702 4306
37031 43071
3704 4308

Diff Legend

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