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

Diff Legend

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