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

Diff Legend

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