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

Diff Legend

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