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

Diff Legend

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