ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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