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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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