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.274 by root, Sat Jun 3 22:20:52 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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