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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.448 by root, Tue Dec 25 07:39:18 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, %arg) = @_; 1023 my ($class, %arg) = @_;
961 1024
962 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
963 1026
964 my $self; 1027 my $self;
965 1028
966 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,
967 vertical => 1, 1043 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub { 1045 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
971 }, 1048 },
972 ; 1049 ;
973 1050
974 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1054 can_events => 1,
976 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
977 %arg, 1059 %arg,
978 ); 1060 );
979 1061
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
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
981 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
982 1086
983 $self 1087 $self
984} 1088}
985 1089
… …
987 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
988 1092
989 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
990} 1094}
991 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
992sub 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 {
993 my ($self) = @_; 1131 my ($self, $ev) = @_;
994 1132
995 $self->SUPER::update; 1133 $self->grab_focus;
996 1134
997 # todo: overwrite size_allocate of child 1135 my $ox = $self->{vp}{view_x};
998 my $child = $self->{vp}->child; 1136 my $oy = $self->{vp}{view_y};
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1137
1000} 1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1001 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
1002sub size_allocate { 1189sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1004 1191
1192 $self->update_slider;
1005 $self->SUPER::size_allocate ($w, $h); 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1194}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1195
1014############################################################################# 1196#############################################################################
1015 1197
1016package CFClient::UI::Frame; 1198package CFPlus::UI::Frame;
1017 1199
1018our @ISA = CFClient::UI::Bin::; 1200our @ISA = CFPlus::UI::Bin::;
1019 1201
1020use CFClient::OpenGL; 1202use CFPlus::OpenGL;
1021 1203
1022sub new { 1204sub new {
1023 my $class = shift; 1205 my $class = shift;
1024 1206
1025 $class->SUPER::new ( 1207 $class->SUPER::new (
… …
1033 1215
1034 if ($self->{bg}) { 1216 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1036 1218
1037 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1040
1041 glBegin GL_QUADS;
1042 glVertex 0 , 0;
1043 glVertex 0 , $h;
1044 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1045 glVertex $w, 0;
1046 glEnd;
1047
1048 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1049 } 1224 }
1050 1225
1051 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1052} 1227}
1053 1228
1054############################################################################# 1229#############################################################################
1055 1230
1056package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1057 1232
1058our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1059 1234
1060use CFClient::OpenGL; 1235use CFPlus::OpenGL;
1061
1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1236
1070sub new { 1237sub new {
1071 my ($class, %arg) = @_; 1238 my ($class, %arg) = @_;
1072 1239
1073 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) = @_;
1074 1351
1075 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1354 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1355 border => 0.6,
1079 can_events => 1, 1356 can_events => 1,
1080 min_w => 16, 1357 min_w => 64,
1081 min_h => 16, 1358 min_h => 32,
1082 %arg, 1359 %arg,
1083 ); 1360 );
1084 1361
1085 $self->{title} = new CFClient::UI::Label 1362 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1363 align => 0,
1087 valign => 1, 1364 valign => 1,
1088 text => $title, 1365 text => $self->{title},
1089 fontsize => $self->{border} 1366 fontsize => $self->{border},
1090 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 }
1091 1377
1092 $self 1378 $self
1093} 1379}
1094 1380
1095sub add { 1381sub add {
1096 my ($self, @widgets) = @_; 1382 my ($self, @widgets) = @_;
1097 1383
1098 $self->SUPER::add (@widgets); 1384 $self->SUPER::add (@widgets);
1385 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1386 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1387}
1101 1388
1102sub border { 1389sub border {
1103 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1104} 1391}
1105 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
1106sub size_request { 1402sub size_request {
1107 my ($self) = @_; 1403 my ($self) = @_;
1108 1404
1109 $self->{title}->size_request 1405 $self->{title_widget}->size_request
1110 if $self->{title}; 1406 if $self->{title_widget};
1407
1408 $self->{close_button}->size_request
1409 if $self->{close_button};
1111 1410
1112 my ($w, $h) = $self->SUPER::size_request; 1411 my ($w, $h) = $self->SUPER::size_request;
1113 1412
1114 ( 1413 (
1115 $w + $self->border * 2, 1414 $w + $self->border * 2,
1116 $h + $self->border * 2, 1415 $h + $self->border * 2,
1117 ) 1416 )
1118} 1417}
1119 1418
1120sub size_allocate { 1419sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1420 my ($self, $w, $h) = @_;
1122 1421
1123 if ($self->{title}) { 1422 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1423 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1424 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1425 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1426 }
1128 1427
1129 my $border = $self->border; 1428 my $border = $self->border;
1130 1429
1131 $h -= List::Util::max 0, $border * 2; 1430 $h -= List::Util::max 0, $border * 2;
1132 $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;
1133 1445
1134 $self->child->configure ($border, $border, $w, $h); 1446 1
1135} 1447}
1136 1448
1137sub button_down { 1449sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
1139 1451
1140 my ($w, $h) = @$self{qw(w h)}; 1452 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1453 my $border = $self->border;
1142 1454
… …
1158 my $dy = $ev->{y} - $oy; 1470 my $dy = $ev->{y} - $oy;
1159 1471
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1474
1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1476 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1477 };
1166 1478
1167 } elsif ($lr ^ $td) { 1479 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1480 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1481 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
1173 1485
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1486 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1487
1176 $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});
1177 }; 1491 };
1178 } else { 1492 } else {
1179 return 0; 1493 return 0;
1180 } 1494 }
1181 1495
1182 1 1496 1
1183} 1497}
1184 1498
1185sub button_up { 1499sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
1187 1501
1188 !!delete $self->{motion} 1502 ! ! delete $self->{motion}
1189} 1503}
1190 1504
1191sub mouse_motion { 1505sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1193 1507
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1509
1196 !!$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
1197} 1519}
1198 1520
1199sub _draw { 1521sub _draw {
1200 my ($self) = @_; 1522 my ($self) = @_;
1201 1523
… …
1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1209 1531
1210 my $border = $self->border; 1532 my $border = $self->border;
1211 1533
1212 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1213 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1216 $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);
1217 1553
1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1220 1556
1221 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1227 1563
1228 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1229 1565
1230 $child->draw; 1566 $child->draw;
1231 1567
1232 if ($self->{title}) { 1568 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1569 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1570 $self->{title_widget}->_draw;
1571
1572 glTranslate 0, - ($border - $self->{h});
1235 } 1573 }
1574
1575 $self->{close_button}->draw
1576 if $self->{close_button};
1236} 1577}
1237 1578
1238############################################################################# 1579#############################################################################
1239 1580
1240package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1241 1582
1242our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1243 1584
1244use List::Util qw(max sum); 1585use List::Util qw(max sum);
1245 1586
1246use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1247 1588
1248sub new { 1589sub new {
1249 my $class = shift; 1590 my $class = shift;
1250 1591
1251 $class->SUPER::new ( 1592 $class->SUPER::new (
1252 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1253 @_, 1595 @_,
1254 ) 1596 )
1255} 1597}
1256 1598
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1259}
1260
1261sub add { 1599sub add {
1262 my ($self, $x, $y, $child) = @_;
1263
1264 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child;
1266
1267 $self->realloc;
1268}
1269
1270# TODO: move to container class maybe? send children a signal on removal?
1271sub clear {
1272 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);
1273 1631
1274 my @children = $self->children; 1632 my @children = $self->children;
1275 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 }
1276 1643 }
1277 for (@children) {
1278 delete $_->{parent};
1279 $_->hide;
1280 }
1281 1644
1282 $self->realloc; 1645 # second pass, rows
1283} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1284
1285sub get_wh {
1286 my ($self) = @_;
1287
1288 my (@w, @h);
1289
1290 for my $y (0 .. $#{$self->{children}}) {
1291 my $row = $self->{children}[$y]
1292 or next;
1293
1294 for my $x (0 .. $#$row) {
1295 my $widget = $row->[$x]
1296 or next;
1297 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1298 1648
1299 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1300 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1301 } 1653 }
1302 } 1654 }
1303 1655
1304 (\@w, \@h) 1656 (\@w, \@h)
1305} 1657}
… …
1313 (sum @$ws), 1665 (sum @$ws),
1314 (sum @$hs), 1666 (sum @$hs),
1315 ) 1667 )
1316} 1668}
1317 1669
1318sub size_allocate { 1670sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
1320 1672
1321 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1322 1674
1323 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1324 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1325 1677
1326 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1327 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1328 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1329 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1330 1682
1331 # linearly scale sizes
1332 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1333 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1334 1684
1335 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
1336 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1337 1694
1338 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1339 1697
1340 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1341 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)};
1342 or next;
1343 1700
1344 my $x = 0; 1701 $widget->configure (
1345 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1346 1704 );
1347 for my $c (0 .. $#$row) { 1705 }
1348 my $col_w = $ws->[$c];
1349 1706
1350 if (my $widget = $row->[$c]) { 1707 1
1351 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1352 }
1353 1709
1354 $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};
1355 } 1737 }
1356
1357 $y += $row_h;
1358 } 1738 }
1359 1739
1360} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1361 1742
1362sub 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 {
1363 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1364 1762
1365 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1366 $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;
1367 1766
1368 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1369 1769
1370 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1371 $res = $_->find_widget ($x, $y) 1771 }
1372 and return $res; 1772
1373 } 1773 1
1374
1375 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1376}
1377
1378sub _draw {
1379 my ($self) = @_;
1380
1381 for (grep $_, @{$self->{children}}) {
1382 $_->draw for grep $_, @$_;
1383 }
1384} 1774}
1385 1775
1386############################################################################# 1776#############################################################################
1387 1777
1388package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1389 1779
1390our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1391 1781
1392sub size_request { 1782sub size_request {
1393 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1394 1786
1395 $self->{vertical} 1787 $self->{vertical}
1396 ? ( 1788 ? (
1397 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1399 ) 1791 )
1400 : ( 1792 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1403 ) 1795 )
1404} 1796}
1405 1797
1406sub size_allocate { 1798sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1408 1800
1409 my $space = $self->{vertical} ? $h : $w; 1801 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1802 my @children = $self->visible_children;
1411 1803
1412 my @req; 1804 my @req;
1413 1805
1414 if ($self->{homogeneous}) { 1806 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1807 @req = ($space / (@children || 1)) x @children;
1416 } else { 1808 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1809 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1810 my $req = List::Util::sum @req;
1419 1811
1420 if ($req > $space) { 1812 if ($req > $space) {
1421 # ah well, not enough space 1813 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1814 $_ *= $space / $req for @req;
1423 } else { 1815 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1817
1426 $space = ($space - $req) / $expand; # remaining space to give away 1818 $space = ($space - $req) / $expand; # remaining space to give away
1427 1819
1428 $req[$_] += $space * $children->[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1821 for 0 .. $#children;
1430 } 1822 }
1431 } 1823 }
1432 1824
1433 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1434 1826
1435 my $pos = 0; 1827 my $pos = 0;
1436 for (0 .. $#$children) { 1828 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1438 $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));
1439 1831
1440 $pos += $alloc; 1832 $pos += $alloc;
1441 } 1833 }
1442 1834
1443 1 1835 1
1444} 1836}
1445 1837
1446############################################################################# 1838#############################################################################
1447 1839
1448package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1449 1841
1450our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1451 1843
1452sub new { 1844sub new {
1453 my $class = shift; 1845 my $class = shift;
1454 1846
1455 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1458 ) 1850 )
1459} 1851}
1460 1852
1461############################################################################# 1853#############################################################################
1462 1854
1463package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1464 1856
1465our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1466 1858
1467sub new { 1859sub new {
1468 my $class = shift; 1860 my $class = shift;
1469 1861
1470 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1473 ) 1865 )
1474} 1866}
1475 1867
1476############################################################################# 1868#############################################################################
1477 1869
1478package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1479 1871
1480our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1481 1873
1482use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1483 1875
1484sub new { 1876sub new {
1485 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1486 1878
1487 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1490 #active_bg => none 1882 #active_bg => none
1491 #font => default_font 1883 #font => default_font
1492 #text => initial text 1884 #text => initial text
1493 #markup => initial narkup 1885 #markup => initial narkup
1494 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1495 ellipsise => 3, # end 1888 ellipsise => 3, # end
1496 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1497 fontsize => 1, 1890 fontsize => 1,
1498 align => -1, 1891 align => -1,
1499 valign => -1, 1892 valign => -1,
1500 padding_x => 2, 1893 padding_x => 2,
1501 padding_y => 2, 1894 padding_y => 2,
1502 can_events => 0, 1895 can_events => 0,
1503 %arg 1896 %arg
1504 ); 1897 );
1505 1898
1506 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1507 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1508 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1509 $self->{template} = $layout; 1902 $self->{template} = $layout;
1510 } 1903 }
1511 1904
1512 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1516 } 1909 }
1517 1910
1518 $self 1911 $self
1519} 1912}
1520 1913
1521sub escape($) {
1522 local $_ = $_[0];
1523
1524 s/&/&amp;/g;
1525 s/>/&gt;/g;
1526 s/</&lt;/g;
1527
1528 $_
1529}
1530
1531sub update { 1914sub update {
1532 my ($self) = @_; 1915 my ($self) = @_;
1533 1916
1534 delete $self->{texture}; 1917 delete $self->{texture};
1535 $self->SUPER::update; 1918 $self->SUPER::update;
1536} 1919}
1537 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
1538sub set_text { 1934sub set_text {
1539 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1540 1936
1541 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1543 1939
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1940 $self->{layout}->set_text ($text);
1546 1941
1942 delete $self->{size_req};
1547 $self->realloc; 1943 $self->realloc;
1548 $self->update; 1944 $self->update;
1549} 1945}
1550 1946
1551sub set_markup { 1947sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1950 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1951 $self->{text} = "M$markup";
1556 1952
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1953 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1954
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1955 $self->{layout}->set_markup ($markup);
1561 1956
1957 delete $self->{size_req};
1562 $self->realloc; 1958 $self->realloc;
1563 $self->update; 1959 $self->update;
1564} 1960}
1565 1961
1566sub size_request { 1962sub size_request {
1567 my ($self) = @_; 1963 my ($self) = @_;
1568 1964
1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1973
1575 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1576 1975
1577 if (exists $self->{template}) { 1976 if (exists $self->{template}) {
1578 $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);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1979 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1980
1581 my ($w2, $h2) = $self->{template}->size; 1981 my ($w2, $h2) = $self->{template}->size;
1582 1982
1583 $w = List::Util::max $w, $w2; 1983 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1984 $h = List::Util::max $h, $h2;
1985 }
1986
1987 [$w, $h]
1585 } 1988 };
1586 1989
1587 ($w, $h) 1990 @{ $self->{size_req} }
1588} 1991}
1589 1992
1993sub baseline_shift {
1994 $_[0]{layout}->descent
1995}
1996
1590sub size_allocate { 1997sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1998 my ($self, $w, $h) = @_;
1592 1999
1593 delete $self->{ox}; 2000 delete $self->{ox};
1594 2001
1595 delete $self->{texture} 2002 delete $self->{texture}
1596 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
1597} 2006}
1598 2007
1599sub set_fontsize { 2008sub set_fontsize {
1600 my ($self, $fontsize) = @_; 2009 my ($self, $fontsize) = @_;
1601 2010
1602 $self->{fontsize} = $fontsize; 2011 $self->{fontsize} = $fontsize;
2012 delete $self->{size_req};
1603 delete $self->{texture}; 2013 delete $self->{texture};
1604 2014
1605 $self->realloc; 2015 $self->realloc;
1606} 2016}
1607 2017
2018sub reconfigure {
2019 my ($self) = @_;
2020
2021 delete $self->{size_req};
2022 delete $self->{texture};
2023
2024 $self->SUPER::reconfigure;
2025}
2026
1608sub _draw { 2027sub _draw {
1609 my ($self) = @_; 2028 my ($self) = @_;
1610 2029
1611 $self->SUPER::_draw; # draw background, if applicable 2030 $self->SUPER::_draw; # draw background, if applicable
1612 2031
1613 my $tex = $self->{texture} ||= do { 2032 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 2033 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 2035 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2036 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2037 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2038 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 2039
1621 new_from_layout CFClient::Texture $self->{layout} 2040 [$self->{layout}->size]
1622 }; 2041 };
1623 2042
1624 unless (exists $self->{ox}) { 2043 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2044 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2045 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1628 2047
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1632 }; 2053 };
1633 2054
1634 glEnable GL_TEXTURE_2D; 2055# unless ($self->{list}) {
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1636 2057# CFPlus::OpenGL::glNewList $self->{list};
1637 if ($tex->{format} == GL_ALPHA) { 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1638 glColor @{$self->{fg}}; 2059# CFPlus::OpenGL::glEndList;
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 } 2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
1643 2063
1644 glDisable GL_TEXTURE_2D; 2064 $self->{layout}->draw;
1645} 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#}
1646 2074
1647############################################################################# 2075#############################################################################
1648 2076
1649package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1650 2078
1651our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1652 2080
1653use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1654 2082
1655sub new { 2083sub new {
1656 my $class = shift; 2084 my $class = shift;
1657 2085
1658 $class->SUPER::new ( 2086 $class->SUPER::new (
1659 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1660 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1661 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1662 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1663 can_hover => 1, 2093 can_hover => 1,
1664 can_focus => 1, 2094 can_focus => 1,
1665 valign => 0, 2095 valign => 0,
1666 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1667 #text => ... 2098 #text => ...
2099 #hidden => "*",
1668 @_ 2100 @_
1669 ) 2101 )
1670} 2102}
1671 2103
1672sub _set_text { 2104sub _set_text {
… …
1674 2106
1675 delete $self->{cur_h}; 2107 delete $self->{cur_h};
1676 2108
1677 return if $self->{text} eq $text; 2109 return if $self->{text} eq $text;
1678 2110
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 2111 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2112 $self->{text} = $text;
1683 2113
1684 $text =~ s/./*/g if $self->{hidden}; 2114 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2115 $self->{layout}->set_text ("$text ");
2116 delete $self->{size_req};
1686 2117
1687 $self->_emit (changed => $self->{text}); 2118 $self->emit (changed => $self->{text});
2119
2120 $self->realloc;
2121 $self->update;
1688} 2122}
1689 2123
1690sub set_text { 2124sub set_text {
1691 my ($self, $text) = @_; 2125 my ($self, $text) = @_;
1692 2126
1693 $self->{cursor} = length $text; 2127 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 2128 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 2129}
1698 2130
1699sub get_text { 2131sub get_text {
1700 $_[0]{text} 2132 $_[0]{text}
1701} 2133}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 2138 my ($w, $h) = $self->SUPER::size_request;
1707 2139
1708 ($w + 1, $h) # add 1 for cursor 2140 ($w + 1, $h) # add 1 for cursor
1709} 2141}
1710 2142
1711sub key_down { 2143sub invoke_key_down {
1712 my ($self, $ev) = @_; 2144 my ($self, $ev) = @_;
1713 2145
1714 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1717 2149
1718 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;
1719 2153
1720 if ($uni == 8) { 2154 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } 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 = "";
1729 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2178 $self->emit ('escape');
1734 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2183 } else {
1737 return 0; 2184 return 0;
1738 } 2185 }
1739 2186
1740 $self->_set_text ($text); 2187 $self->_set_text ($text);
1741 2188
1742 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1743 2191
1744 1 2192 1
1745} 2193}
1746 2194
1747sub focus_in { 2195sub invoke_focus_in {
1748 my ($self) = @_; 2196 my ($self) = @_;
1749 2197
1750 $self->{last_activity} = $::NOW; 2198 $self->{last_activity} = $::NOW;
1751 2199
1752 $self->SUPER::focus_in; 2200 $self->SUPER::invoke_focus_in
1753} 2201}
1754 2202
1755sub button_down { 2203sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2204 my ($self, $ev, $x, $y) = @_;
1757 2205
1758 $self->SUPER::button_down ($ev, $x, $y); 2206 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2207
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2209
1762 # byte-index to char-index 2210 # byte-index to char-index
1763 my $text = $self->{text}; 2211 my $text = $self->{text};
1764 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1766 2214
1767 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1768 $self->update; 2216 $self->update;
1769 2217
1770 1 2218 1
1771} 2219}
1772 2220
1773sub mouse_motion { 2221sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 2224
1777 0 2225 1
1778} 2226}
1779 2227
1780sub _draw { 2228sub _draw {
1781 my ($self) = @_; 2229 my ($self) = @_;
1782 2230
1783 local $self->{fg} = $self->{fg}; 2231 local $self->{fg} = $self->{fg};
1784 2232
1785 if ($FOCUS == $self) { 2233 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 2234 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 2235 $self->{fg} = $self->{active_fg};
1788 } else { 2236 } else {
1789 glColor @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1790 } 2238 }
1791 2239
1792 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS;
1795 glVertex 0 , 0;
1796 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0;
1799 glEnd;
1800 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
1801 2244
1802 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
1803 2246
1804 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
1806 2249
1807 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
1808 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
1809 utf8::encode $text; 2252 utf8::encode $text;
1810 2253
1811 @$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);
1812 } 2255 }
1813 2256
1814 glColor @{$self->{fg}}; 2257 glColor_premultiply @{$self->{active_fg}};
1815 glBegin GL_LINES; 2258 glBegin GL_LINES;
1816 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1817 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};
1818 glEnd; 2261 glEnd;
1819 }
1820}
1821 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
1822package CFClient::UI::Entry; 2281package CFPlus::UI::Entry;
1823 2282
1824our @ISA = CFClient::UI::EntryBase::; 2283our @ISA = CFPlus::UI::EntryBase::;
1825 2284
1826use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1827 2286
1828sub key_down { 2287sub invoke_key_down {
1829 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
1830 2289
1831 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
1832 2291
1833 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2293 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2294 my $txt = $self->get_text;
2295
1836 $self->{history_pointer} = -1; 2296 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2297 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2298 $self->emit (activate => $txt);
1839 $self->update; 2299 $self->update;
1840 2300
1841 } elsif ($sym == CFClient::SDLK_UP) { 2301 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2302 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2303 $self->{history_saveback} = $self->get_text;
1844 } 2304 }
1845 if (@{$self->{history} || []} > 0) { 2305 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2306 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2308 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2309 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2311 }
1852 2312
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2313 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2314 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2315 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2316
1857 if ($self->{history_pointer} >= 0) { 2317 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2318 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2319 } else {
1860 $self->set_text ($self->{history_saveback}); 2320 $self->set_text ($self->{history_saveback});
1861 } 2321 }
1862 2322
1863 } else { 2323 } else {
1864 return $self->SUPER::key_down ($ev) 2324 return $self->SUPER::invoke_key_down ($ev)
1865 } 2325 }
1866 2326
1867 1 2327 1
1868} 2328}
1869 2329
1870############################################################################# 2330#############################################################################
1871 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
1872package CFClient::UI::Button; 2371package CFPlus::UI::ButtonBin;
1873 2372
1874our @ISA = CFClient::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
1875 2374
1876use CFClient::OpenGL; 2375use CFPlus::OpenGL;
1877 2376
1878my @tex = 2377my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
1881 2380
1882sub new { 2381sub new {
1883 my $class = shift; 2382 my $class = shift;
1884 2383
1885 $class->SUPER::new ( 2384 $class->SUPER::new (
1886 padding_x => 4,
1887 padding_y => 4,
1888 fg => [1, 1, 1],
1889 active_fg => [0, 0, 1],
1890 can_hover => 1, 2385 can_hover => 1,
1891 align => 0, 2386 align => 0,
1892 valign => 0, 2387 valign => 0,
1893 can_events => 1, 2388 can_events => 1,
1894 @_ 2389 @_
1895 ) 2390 )
1896} 2391}
1897 2392
1898sub activate { }
1899
1900sub button_up { 2393sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2394 my ($self, $ev, $x, $y) = @_;
1902 2395
1903 $self->emit ("activate") 2396 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2397 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2398 && $y >= 0 && $y < $self->{h};
… …
1908} 2401}
1909 2402
1910sub _draw { 2403sub _draw {
1911 my ($self) = @_; 2404 my ($self) = @_;
1912 2405
1913 local $self->{fg} = $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918
1919 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
1922 2409
2410 my $tex = $tex[$GRAB == $self];
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 2412
1925 glDisable GL_TEXTURE_2D; 2413 glDisable GL_TEXTURE_2D;
1926 2414
1927 $self->SUPER::_draw; 2415 $self->SUPER::_draw;
1928} 2416}
1929 2417
1930############################################################################# 2418#############################################################################
1931 2419
1932package CFClient::UI::CheckBox; 2420package CFPlus::UI::Button;
1933 2421
1934our @ISA = CFClient::UI::DrawBG::; 2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
1935 2425
1936my @tex = 2426my @tex =
1937 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 }
1938 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2481 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1939 2482
1940use CFClient::OpenGL; 2483use CFPlus::OpenGL;
1941 2484
1942sub new { 2485sub new {
1943 my $class = shift; 2486 my $class = shift;
1944 2487
1945 $class->SUPER::new ( 2488 $class->SUPER::new (
… …
1959 my ($self) = @_; 2502 my ($self) = @_;
1960 2503
1961 (6) x 2 2504 (6) x 2
1962} 2505}
1963 2506
2507sub toggle {
2508 my ($self) = @_;
2509
2510 $self->{state} = !$self->{state};
2511 $self->emit (changed => $self->{state});
2512 $self->update;
2513}
2514
1964sub button_down { 2515sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
1966 2517
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2518 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2519 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2520 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2521 } else {
1972 return 0 2522 return 0
1973 } 2523 }
1974 2524
1975 1 2525 1
… …
1978sub _draw { 2528sub _draw {
1979 my ($self) = @_; 2529 my ($self) = @_;
1980 2530
1981 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
1982 2532
1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1984 2534
1985 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
1986 2536
1987 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;
1988 2538
… …
1995 glDisable GL_TEXTURE_2D; 2545 glDisable GL_TEXTURE_2D;
1996} 2546}
1997 2547
1998############################################################################# 2548#############################################################################
1999 2549
2000package CFClient::UI::Image; 2550package CFPlus::UI::Image;
2001 2551
2002our @ISA = CFClient::UI::Base::; 2552our @ISA = CFPlus::UI::Base::;
2003 2553
2004use CFClient::OpenGL; 2554use CFPlus::OpenGL;
2005use Carp qw/confess/;
2006 2555
2007our %loaded_images; 2556our %texture_cache;
2008 2557
2009sub new { 2558sub new {
2010 my $class = shift; 2559 my $class = shift;
2011 2560
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2561 my $self = $class->SUPER::new (
2562 can_events => 0,
2563 scale => 1,
2564 @_,
2565 );
2013 2566
2014 $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";
2015 2569
2016 $loaded_images{$self->{image}} ||= 2570 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 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;
2018 2572
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2573 CFPlus::weaken $texture_cache{$self->{path}};
2020 2574
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2576
2025 $self 2577 $self
2026} 2578}
2027 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
2028sub size_request { 2595sub size_request {
2029 my ($self) = @_; 2596 my ($self) = @_;
2030 2597
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2032} 2599}
2033 2600
2034sub _draw { 2601sub _draw {
2035 my ($self) = @_; 2602 my ($self) = @_;
2036 2603
… …
2053 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2054} 2621}
2055 2622
2056############################################################################# 2623#############################################################################
2057 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
2058package CFClient::UI::VGauge; 2667package CFPlus::UI::VGauge;
2059 2668
2060our @ISA = CFClient::UI::Base::; 2669our @ISA = CFPlus::UI::Base::;
2061 2670
2062use List::Util qw(min max); 2671use List::Util qw(min max);
2063 2672
2064use CFClient::OpenGL; 2673use CFPlus::OpenGL;
2065 2674
2066my %tex = ( 2675my %tex = (
2067 food => [ 2676 food => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2677 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2070 ], 2679 ],
2071 grace => [ 2680 grace => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2681 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 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/
2074 ], 2683 ],
2075 hp => [ 2684 hp => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2685 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2078 ], 2687 ],
2079 mana => [ 2688 mana => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2689 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 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/
2082 ], 2691 ],
2083); 2692);
2084 2693
2085# eg. VGauge->new (gauge => 'food'), default gauge: food 2694# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2754 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2755 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2756
2148 my $h1 = $self->{h} * (1 - $ycut1); 2757 my $h1 = $self->{h} * (1 - $ycut1);
2149 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);
2150 2762
2151 glEnable GL_BLEND; 2763 glEnable GL_BLEND;
2152 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;
2153 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2768
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2769 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2770 glBegin GL_QUADS;
… …
2172 2785
2173 if ($t3) { 2786 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2787 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2788 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2789 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2790 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2791 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2792 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2793 glEnd;
2181 } 2794 }
2182 2795
2183 glDisable GL_BLEND; 2796 glDisable GL_BLEND;
2184 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2185} 2798}
2186 2799
2187############################################################################# 2800#############################################################################
2188 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
2189package CFClient::UI::Gauge; 2940package CFPlus::UI::Gauge;
2190 2941
2191our @ISA = CFClient::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2192 2943
2193sub new { 2944sub new {
2194 my ($class, %arg) = @_; 2945 my ($class, %arg) = @_;
2195 2946
2196 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2198 can_hover => 1, 2949 can_hover => 1,
2199 can_events => 1, 2950 can_events => 1,
2200 %arg, 2951 %arg,
2201 ); 2952 );
2202 2953
2203 $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");
2204 $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);
2205 $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");
2206 2957
2207 $self 2958 $self
2208} 2959}
2209 2960
2210sub set_fontsize { 2961sub set_fontsize {
… …
2231 $self->{value}->set_text ($val); 2982 $self->{value}->set_text ($val);
2232} 2983}
2233 2984
2234############################################################################# 2985#############################################################################
2235 2986
2236package CFClient::UI::Slider; 2987package CFPlus::UI::Slider;
2237 2988
2238use strict; 2989use strict;
2239 2990
2240use CFClient::OpenGL; 2991use CFPlus::OpenGL;
2241 2992
2242our @ISA = CFClient::UI::DrawBG::; 2993our @ISA = CFPlus::UI::DrawBG::;
2243 2994
2244my @tex = 2995my @tex =
2245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2996 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2246 qw(s1_slider.png s1_slider_bg.png); 2997 qw(s1_slider.png s1_slider_bg.png);
2247 2998
2248sub new { 2999sub new {
2249 my $class = shift; 3000 my $class = shift;
2250 3001
… …
2271 $self->update; 3022 $self->update;
2272 3023
2273 $self 3024 $self
2274} 3025}
2275 3026
2276sub changed { }
2277
2278sub set_range { 3027sub set_range {
2279 my ($self, $range) = @_; 3028 my ($self, $range) = @_;
2280 3029
2281 ($range, $self->{range}) = ($self->{range}, $range); 3030 ($range, $self->{range}) = ($self->{range}, $range);
2282 3031
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 3032 if ("@$range" ne "@{$self->{range}}") {
3033 $self->update;
3034 $self->set_value ($self->{range}[0]);
3035 }
2285} 3036}
2286 3037
2287sub set_value { 3038sub set_value {
2288 my ($self, $value) = @_; 3039 my ($self, $value) = @_;
2289 3040
… …
2300 if $unit; 3051 if $unit;
2301 3052
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 3054
2304 if ($value != $old_value) { 3055 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 3056 $self->emit (changed => $value);
2306 $self->update; 3057 $self->update;
2307 } 3058 }
2308} 3059}
2309 3060
2310sub size_request { 3061sub size_request {
2311 my ($self) = @_; 3062 my ($self) = @_;
2312 3063
2313 ($self->{req_w}, $self->{req_h}) 3064 ($self->{req_w}, $self->{req_h})
2314} 3065}
2315 3066
2316sub button_down { 3067sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 3068 my ($self, $ev, $x, $y) = @_;
2318 3069
2319 $self->SUPER::button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 3071
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 3073
2323 $self->mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
2324}
2325 3075
3076 1
3077}
3078
2326sub mouse_motion { 3079sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2328 3081
2329 if ($GRAB == $self) { 3082 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3083 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 3084
… …
2339 } 3092 }
2340 3093
2341 1 3094 1
2342} 3095}
2343 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
2344sub update { 3109sub update {
2345 my ($self) = @_; 3110 my ($self) = @_;
2346 3111
2347 $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}) {
2348 $self->set_value ($self->{range}[0]); 3120 $self->set_value ($self->{range}[0]);
2349 3121
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 3123 my $range = ($hi - $page - $lo) || 1e-100;
2352 3124
… …
2358 $value = ($value - $lo) / $range; 3130 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 3131 $value = $value * $self->{scale} + $self->{offset};
2360 3132
2361 $self->{knob_x} = $value - $knob_w * 0.5; 3133 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 3134 $self->{knob_w} = $knob_w;
2363 }); 3135 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 3136
2371 $self->SUPER::_draw (); 3137 $self->SUPER::_draw ();
2372 3138
2373 glScale $self->{w}, $self->{h}; 3139 glScale $self->{w}, $self->{h};
2374 3140
… …
2394 glDisable GL_TEXTURE_2D; 3160 glDisable GL_TEXTURE_2D;
2395} 3161}
2396 3162
2397############################################################################# 3163#############################################################################
2398 3164
2399package CFClient::UI::ValSlider; 3165package CFPlus::UI::ValSlider;
2400 3166
2401our @ISA = CFClient::UI::HBox::; 3167our @ISA = CFPlus::UI::HBox::;
2402 3168
2403sub new { 3169sub new {
2404 my ($class, %arg) = @_; 3170 my ($class, %arg) = @_;
2405 3171
2406 my $range = delete $arg{range}; 3172 my $range = delete $arg{range};
2407 3173
2408 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3175 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3176 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 3177 to_value => sub { shift },
2412 from_value => sub { shift }, 3178 from_value => sub { shift },
2413 %arg, 3179 %arg,
2414 ); 3180 );
2415 3181
… …
2435sub set_range { shift->{slider}->set_range (@_) } 3201sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 3202sub set_value { shift->{slider}->set_value (@_) }
2437 3203
2438############################################################################# 3204#############################################################################
2439 3205
2440package CFClient::UI::TextView; 3206package CFPlus::UI::TextScroller;
2441 3207
2442our @ISA = CFClient::UI::HBox::; 3208our @ISA = CFPlus::UI::HBox::;
2443 3209
2444use CFClient::OpenGL; 3210use CFPlus::OpenGL;
2445 3211
2446sub new { 3212sub new {
2447 my $class = shift; 3213 my $class = shift;
2448 3214
2449 my $self = $class->SUPER::new ( 3215 my $self = $class->SUPER::new (
2450 fontsize => 1, 3216 fontsize => 1,
2451 can_events => 0, 3217 can_events => 1,
3218 indent => 0,
2452 #font => default_font 3219 #font => default_font
2453 @_, 3220 @_,
2454 3221
2455 layout => (new CFClient::Layout 1), 3222 layout => (new CFPlus::Layout),
2456 par => [], 3223 par => [],
3224 max_par => 0,
2457 height => 0, 3225 height => 0,
2458 children => [ 3226 children => [
2459 (new CFClient::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2461 ], 3229 ],
2462 ); 3230 );
2463 3231
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 3232 $self->{children}[1]->connect (changed => sub { $self->update });
2465 3233
… …
2471 3239
2472 $self->{fontsize} = $fontsize; 3240 $self->{fontsize} = $fontsize;
2473 $self->reflow; 3241 $self->reflow;
2474} 3242}
2475 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
2476sub size_allocate { 3253sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 3254 my ($self, $w, $h) = @_;
2478 3255
2479 $self->SUPER::size_allocate ($w, $h); 3256 my ($empty, $slider, @other) = @{ $self->{children} };
3257 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 3258
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3259 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3260 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $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});
2484 3263
2485 $self->reflow; 3264 $self->reflow;
2486}
2487 3265
2488sub text_size { 3266 local $self->{children} = [$empty, $slider];
3267 $self->SUPER::invoke_size_allocate ($w, $h)
3268}
3269
3270sub invoke_mouse_wheel {
2489 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) = @_;
2490 3282
2491 my $layout = $self->{layout}; 3283 my $layout = $self->{layout};
2492 3284
3285 $layout->set_font ($self->{font}) if $self->{font};
3286 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3287 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $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});
2495 $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}}
2496 3296 );
3297
2497 $layout->size 3298 $layout
2498} 3299}
2499 3300
2500sub reflow { 3301sub reflow {
2501 my ($self) = @_; 3302 my ($self) = @_;
2502 3303
… …
2509 3310
2510 # todo: base offset on lines or so, not on pixels 3311 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset); 3312 $self->{children}[1]->set_value ($offset);
2512} 3313}
2513 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
2514sub clear { 3330sub clear {
2515 my ($self) = @_; 3331 my ($self) = @_;
3332
3333 my (undef, undef, @other) = @{ $self->{children} };
3334 $self->remove ($_) for @other;
2516 3335
2517 $self->{par} = []; 3336 $self->{par} = [];
2518 $self->{height} = 0; 3337 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 3339}
2521 3340
2522sub add_paragraph { 3341sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 3342 my $self = shift;
2524 3343
2525 for my $line (split /\n/, $text) { 3344 for my $para (@_) {
2526 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
2527 $self->{height} += $h; 3396 $self->{height} = $height;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3397 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529 }
2530 3398
2531 $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 }
2532} 3405}
2533 3406
2534sub update { 3407sub update {
2535 my ($self) = @_; 3408 my ($self) = @_;
2536 3409
… …
2538 3411
2539 return unless $self->{h} > 0; 3412 return unless $self->{h} > 0;
2540 3413
2541 delete $self->{texture}; 3414 delete $self->{texture};
2542 3415
2543 $ROOT->on_post_alloc ($self, sub { 3416 $ROOT->on_post_alloc ($self => sub {
3417 $self->force_uptodate;
3418
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 3420
2546 if (delete $self->{need_reflow}) {
2547 my $height = 0;
2548
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2564
2565 $self->{height} = $height;
2566
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568
2569 delete $self->{texture};
2570 }
2571
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 3422 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 3423 glClear GL_COLOR_BUFFER_BIT;
2575 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;
2576 my $top = int $self->{children}[1]{range}[0]; 3433 my $top = int $self->{children}[1]{range}[0];
2577 3434
2578 my $y0 = $top; 3435 my $y0 = $top;
2579 my $y1 = $top + $H; 3436 my $y1 = $top + $H;
2580 3437
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 3438 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 3439 my $h = $para->{h};
3440 my $y = $para->{y};
2593 3441
2594 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 3443 my $layout = $self->get_layout ($para);
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 3444
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
2600 3447
2601 glRasterPos $par->[3], $y - $y0; 3448 if (my @w = @{ $para->{widget} }) {
2602 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 }
2603 } 3460 }
2604 3461
2605 $y += $h; 3462 $paridx++;
3463 $top_paragraph ||= $paridx if $y >= $top;
2606 } 3464 }
2607 3465
2608 glDisable GL_BLEND; 3466 $self->{top_paragraph} = $top_paragraph;
2609 }; 3467 };
2610 }); 3468 });
2611} 3469}
2612 3470
3471sub reconfigure {
3472 my ($self) = @_;
3473
3474 $self->SUPER::reconfigure;
3475
3476 $_->{w} = 1e10 for @{ $self->{par} };
3477 $self->reflow;
3478}
3479
2613sub _draw { 3480sub _draw {
2614 my ($self) = @_; 3481 my ($self) = @_;
2615 3482
2616 glEnable GL_TEXTURE_2D; 3483 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 3485 glColor 0, 0, 0, 1;
2619 $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});
2620 glDisable GL_TEXTURE_2D; 3487 glDisable GL_TEXTURE_2D;
2621 3488
2622 $self->{children}[1]->draw; 3489 $self->{children}[1]->draw;
2623
2624} 3490}
2625 3491
2626############################################################################# 3492#############################################################################
2627 3493
2628package CFClient::UI::Animator; 3494package CFPlus::UI::Animator;
2629 3495
2630use CFClient::OpenGL; 3496use CFPlus::OpenGL;
2631 3497
2632our @ISA = CFClient::UI::Bin::; 3498our @ISA = CFPlus::UI::Bin::;
2633 3499
2634sub moveto { 3500sub moveto {
2635 my ($self, $x, $y) = @_; 3501 my ($self, $x, $y) = @_;
2636 3502
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3503 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 3531 glPopMatrix;
2666} 3532}
2667 3533
2668############################################################################# 3534#############################################################################
2669 3535
2670package CFClient::UI::Flopper; 3536package CFPlus::UI::Flopper;
2671 3537
2672our @ISA = CFClient::UI::Button::; 3538our @ISA = CFPlus::UI::Button::;
2673 3539
2674sub new { 3540sub new {
2675 my $class = shift; 3541 my $class = shift;
2676 3542
2677 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 3555 $self->{other}->toggle_visibility;
2690} 3556}
2691 3557
2692############################################################################# 3558#############################################################################
2693 3559
2694package CFClient::UI::Tooltip; 3560package CFPlus::UI::Tooltip;
2695 3561
2696our @ISA = CFClient::UI::Bin::; 3562our @ISA = CFPlus::UI::Bin::;
2697 3563
2698use CFClient::OpenGL; 3564use CFPlus::OpenGL;
2699 3565
2700sub new { 3566sub new {
2701 my $class = shift; 3567 my $class = shift;
2702 3568
2703 $class->SUPER::new ( 3569 $class->SUPER::new (
… …
2707} 3573}
2708 3574
2709sub set_tooltip_from { 3575sub set_tooltip_from {
2710 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
2711 3577
2712 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 =~ /^#(.*)$/;
2713 3583
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
2719 } 3589 }
2720 3590
3591 $tip =~ s/^\n+//;
3592 $tip =~ s/\n+$//;
3593
2721 $self->add (new CFClient::UI::Label 3594 $self->add (new CFPlus::UI::Label
2722 markup => $tooltip, 3595 markup => $tip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 3597 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3598 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3599 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3601 );
2729} 3602}
2730 3603
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3607 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3608
2736 ($w + 4, $h + 4) 3609 ($w + 4, $h + 4)
2737} 3610}
2738 3611
2739sub size_allocate { 3612sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3613 my ($self, $w, $h) = @_;
2741 3614
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3615 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3616}
2744 3617
2745sub visibility_change { 3618sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3619 my ($self, $visible) = @_;
2747 3620
2748 return unless $visible; 3621 return unless $visible;
2749 3622
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3623 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3624 my $widget = $self->{owner}
2752 or return; 3625 or return;
2753 3626
3627 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3628 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3629
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3630 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3631 if $x + $self->{w} > $self->{root}{w};
2758 3632
2759 $self->move_abs ($x, $y); 3633 $self->move_abs ($x, $y);
3634 } else {
3635 $self->hide;
3636 }
2760 }); 3637 });
2761} 3638}
2762 3639
2763sub _draw { 3640sub _draw {
2764 my ($self) = @_; 3641 my ($self) = @_;
2765 3642
2766 glTranslate 0.375, 0.375;
2767
2768 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
2769 3644
2770 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
2771 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
2772 glVertex 0 , 0;
2773 glVertex 0 , $h;
2774 glVertex $w, $h;
2775 glVertex $w, 0;
2776 glEnd;
2777 3647
2778 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
2779 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
2780 glVertex 0 , 0;
2781 glVertex 0 , $h;
2782 glVertex $w, $h;
2783 glVertex $w, 0;
2784 glEnd;
2785 3650
2786 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
2787 3652
2788 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
2789} 3654}
2790 3655
2791############################################################################# 3656#############################################################################
2792 3657
2793package CFClient::UI::Face; 3658package CFPlus::UI::Face;
2794 3659
2795our @ISA = CFClient::UI::Base::; 3660our @ISA = CFPlus::UI::DrawBG::;
2796 3661
2797use CFClient::OpenGL; 3662use CFPlus::OpenGL;
2798 3663
2799sub new { 3664sub new {
2800 my $class = shift; 3665 my $class = shift;
2801 3666
2802 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
2803 aspect => 1, 3670 aspect => 1,
2804 can_events => 0, 3671 can_events => 0,
2805 @_, 3672 @_,
2806 ); 3673 );
2807 3674
2808 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
2810 3677
2811 $self->{timer} = Event->timer ( 3678 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2813 hard => 1, 3680 return unless $::CONN;
2814 interval => $self->{animspeed}, 3681
2815 cb => sub { 3682 my $w = $widget
3683 or return;
3684
2816 ++$widget->{frame}; 3685 ++$w->{frame};
3686 $w->update_face;
3687
3688 # somehow, $widget can go away
2817 $widget->update; 3689 $w->update;
2818 }, 3690 $w->update_timer;
2819 ); 3691 };
3692
3693 $self->update_face;
3694 $self->update_timer;
2820 } 3695 }
2821 3696
2822 $self 3697 $self
2823} 3698}
2824 3699
3700sub update_timer {
3701 my ($self) = @_;
3702
3703 return unless $self->{timer};
3704
3705 if ($self->{visible}) {
3706 $self->{timer}->start;
3707 } else {
3708 $self->{timer}->stop;
3709 }
3710}
3711
3712sub update_face {
3713 my ($self) = @_;
3714
3715 if ($::CONN) {
3716 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3717 if ($anim && @$anim) {
3718 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3719 delete $self->{face_change_cb};
3720
3721 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3722 unless ($tex->{name} || $tex->{loading}) {
3723 $tex->upload (sub { $self->reconfigure });
3724 }
3725 }
3726 }
3727 }
3728 }
3729}
3730
2825sub size_request { 3731sub size_request {
2826 (32, 8) 3732 my ($self) = @_;
3733
3734 if ($::CONN) {
3735 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3736 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3737 if ($tex->{name}) {
3738 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3739 } elsif (!$tex->{loading}) {
3740 $tex->upload (sub { $self->reconfigure });
3741 }
3742 }
3743
3744 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3745 }
3746 }
3747
3748 ($self->{size_w} || 8, $self->{size_h} || 8)
2827} 3749}
2828 3750
2829sub update { 3751sub update {
2830 my ($self) = @_; 3752 my ($self) = @_;
2831 3753
2832 return unless $self->{visible}; 3754 return unless $self->{visible};
2833 3755
2834 $self->SUPER::update; 3756 $self->SUPER::update;
2835} 3757}
2836 3758
3759sub invoke_visibility_change {
3760 my ($self) = @_;
3761
3762 $self->update_timer;
3763
3764 0
3765}
3766
2837sub _draw { 3767sub _draw {
2838 my ($self) = @_; 3768 my ($self) = @_;
2839 3769
2840 return unless $::CONN; 3770 $self->SUPER::_draw;
2841 3771
2842 my $face; 3772 if (my $tex = $self->{tex}) {
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852
2853 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3773 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3775 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3776 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3777 glDisable GL_TEXTURE_2D;
2859 } 3778 }
2860} 3779}
2861 3780
2862sub DESTROY { 3781sub destroy {
2863 my ($self) = @_; 3782 my ($self) = @_;
2864 3783
2865 $self->{timer}->cancel 3784 (delete $self->{timer})->cancel
2866 if $self->{timer}; 3785 if $self->{timer};
2867 3786
2868 $self->SUPER::DESTROY; 3787 $self->SUPER::destroy;
2869} 3788}
2870 3789
2871############################################################################# 3790#############################################################################
2872 3791
2873package CFClient::UI::Buttonbar; 3792package CFPlus::UI::Buttonbar;
2874 3793
2875our @ISA = CFClient::UI::HBox::; 3794our @ISA = CFPlus::UI::HBox::;
2876 3795
2877# TODO: should actualyl wrap buttons and other goodies. 3796# TODO: should actually wrap buttons and other goodies.
2878 3797
2879############################################################################# 3798#############################################################################
2880 3799
2881package CFClient::UI::Menu; 3800package CFPlus::UI::Menu;
2882 3801
2883our @ISA = CFClient::UI::FancyFrame::; 3802our @ISA = CFPlus::UI::Toplevel::;
2884 3803
2885use CFClient::OpenGL; 3804use CFPlus::OpenGL;
2886 3805
2887sub new { 3806sub new {
2888 my $class = shift; 3807 my $class = shift;
2889 3808
2890 my $self = $class->SUPER::new ( 3809 my $self = $class->SUPER::new (
2891 items => [], 3810 items => [],
2892 z => 100, 3811 z => 100,
2893 @_, 3812 @_,
2894 ); 3813 );
2895 3814
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3815 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897 3816
2898 for my $item (@{ $self->{items} }) { 3817 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3818 my ($widget, $cb, $tooltip) = @$item;
2900 3819
2901 # handle various types of items, only text for now 3820 # handle various types of items, only text for now
2902 if (!ref $widget) { 3821 if (!ref $widget) {
3822 if ($widget =~ /\t/) {
3823 my ($left, $right) = split /\t/, $widget, 2;
3824
2903 $widget = new CFClient::UI::Label 3825 $widget = new CFPlus::UI::HBox
2904 can_hover => 1, 3826 can_hover => 1,
2905 can_events => 1, 3827 can_events => 1,
3828 tooltip => $tooltip,
3829 children => [
3830 (new CFPlus::UI::Label markup => $left, expand => 1),
3831 (new CFPlus::UI::Label markup => $right, align => +1),
3832 ],
3833 ;
3834
3835 } else {
3836 $widget = new CFPlus::UI::Label
3837 can_hover => 1,
3838 can_events => 1,
2906 text => $widget; 3839 markup => $widget,
3840 tooltip => $tooltip;
3841 }
2907 } 3842 }
2908 3843
2909 $self->{item}{$widget} = $item; 3844 $self->{item}{$widget} = $item;
2910 3845
2911 $self->{vbox}->add ($widget); 3846 $self->{vbox}->add ($widget);
… …
2916 3851
2917# popup given the event (must be a mouse button down event currently) 3852# popup given the event (must be a mouse button down event currently)
2918sub popup { 3853sub popup {
2919 my ($self, $ev) = @_; 3854 my ($self, $ev) = @_;
2920 3855
2921 $self->_emit ("popdown"); 3856 $self->emit ("popdown");
2922 3857
2923 # maybe save $GRAB? must be careful about events... 3858 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3859 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3860 $self->{button} = $ev->{button};
2926 3861
2927 $self->show; 3862 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3863 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3864}
2930 3865
2931sub mouse_motion { 3866sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3867 my ($self, $ev, $x, $y) = @_;
2933 3868
2934 # TODO: should use vbox->find_widget or so 3869 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3871 $self->{hover} = $self->{item}{$HOVER};
2937 3872
2938 0 3873 0
2939} 3874}
2940 3875
2941sub button_up { 3876sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3877 my ($self, $ev, $x, $y) = @_;
2943 3878
2944 if ($ev->{button} == $self->{button}) { 3879 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3880 undef $GRAB;
2946 $self->hide; 3881 $self->hide;
2947 3882
2948 $self->_emit ("popdown"); 3883 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3884 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3885 } else {
2951 return 0 3886 return 0
2952 } 3887 }
2953 3888
2954 1 3889 1
2955} 3890}
2956 3891
2957############################################################################# 3892#############################################################################
2958 3893
2959package CFClient::UI::Multiplexer; 3894package CFPlus::UI::Multiplexer;
2960 3895
2961our @ISA = CFClient::UI::Container::; 3896our @ISA = CFPlus::UI::Container::;
2962 3897
2963sub new { 3898sub new {
2964 my $class = shift; 3899 my $class = shift;
2965 3900
2966 my $self = $class->SUPER::new ( 3901 my $self = $class->SUPER::new (
… …
2980 3915
2981 $self->{current} = $self->{children}[0] 3916 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3917 if @{ $self->{children} };
2983} 3918}
2984 3919
3920sub get_current_page {
3921 my ($self) = @_;
3922
3923 $self->{current}
3924}
3925
2985sub set_current_page { 3926sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3927 my ($self, $page_or_widget) = @_;
2987 3928
2988 my $widget = ref $page_or_widget 3929 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3930 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3931 : $self->{children}[$page_or_widget];
2991 3932
2992 $self->{current} = $widget; 3933 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3934 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3935
2995 $self->_emit (page_changed => $self->{current}); 3936 $self->emit (page_changed => $self->{current});
2996 3937
2997 $self->realloc; 3938 $self->realloc;
2998} 3939}
2999 3940
3000sub visible_children { 3941sub visible_children {
… …
3005 my ($self) = @_; 3946 my ($self) = @_;
3006 3947
3007 $self->{current}->size_request 3948 $self->{current}->size_request
3008} 3949}
3009 3950
3010sub size_allocate { 3951sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3952 my ($self, $w, $h) = @_;
3012 3953
3013 $self->{current}->configure (0, 0, $w, $h); 3954 $self->{current}->configure (0, 0, $w, $h);
3955
3956 1
3014} 3957}
3015 3958
3016sub _draw { 3959sub _draw {
3017 my ($self) = @_; 3960 my ($self) = @_;
3018 3961
3019 $self->{current}->draw; 3962 $self->{current}->draw;
3020} 3963}
3021 3964
3022############################################################################# 3965#############################################################################
3023 3966
3024package CFClient::UI::Notebook; 3967package CFPlus::UI::Notebook;
3025 3968
3969use CFPlus::OpenGL;
3970
3026our @ISA = CFClient::UI::VBox::; 3971our @ISA = CFPlus::UI::VBox::;
3027 3972
3028sub new { 3973sub new {
3029 my $class = shift; 3974 my $class = shift;
3030 3975
3031 my $self = $class->SUPER::new ( 3976 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 3977 buttonbar => (new CFPlus::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3978 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3979 active_outline => [.7, .7, 0.2],
3034 # filter => # will be put between multiplexer and $self 3980 # filter => # will be put between multiplexer and $self
3035 @_, 3981 @_,
3036 ); 3982 );
3037 3983
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3984 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3985 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040 3986
3987 {
3988 Scalar::Util::weaken (my $wself = $self);
3989
3990 $self->{multiplexer}->connect (c_add => sub {
3991 my ($mplex, $widgets) = @_;
3992
3993 for my $child (@$widgets) {
3994 Scalar::Util::weaken $child;
3995 $child->{c_tab_} ||= do {
3996 my $tab =
3997 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3998 ? $child->{c_tab}
3999 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4000
4001 $tab->connect (activate => sub {
4002 $wself->set_current_page ($child);
4003 });
4004
4005 $tab
4006 };
4007
4008 $self->{buttonbar}->add ($child->{c_tab_});
4009 }
4010 });
4011
4012 $self->{multiplexer}->connect (c_remove => sub {
4013 my ($mplex, $widgets) = @_;
4014
4015 for my $child (@$widgets) {
4016 $wself->{buttonbar}->remove ($child->{c_tab_});
4017 }
4018 });
4019 }
4020
3041 $self 4021 $self
3042} 4022}
3043 4023
3044sub add { 4024sub add {
4025 my ($self, @widgets) = @_;
4026
4027 $self->{multiplexer}->add (@widgets)
4028}
4029
4030sub remove {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->remove (@widgets)
4034}
4035
4036sub pages {
4037 my ($self) = @_;
4038 $self->{multiplexer}->children
4039}
4040
4041sub add_tab {
3045 my ($self, $title, $widget, $tooltip) = @_; 4042 my ($self, $title, $widget, $tooltip) = @_;
3046 4043
3047 Scalar::Util::weaken $self; 4044 $title = [$title, $tooltip] unless ref $title;
4045 $widget->{c_tab} = $title;
3048 4046
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget); 4047 $self->add ($widget);
4048}
4049
4050sub get_current_page {
4051 my ($self) = @_;
4052
4053 $self->{multiplexer}->get_current_page
3056} 4054}
3057 4055
3058sub set_current_page { 4056sub set_current_page {
3059 my ($self, $page) = @_; 4057 my ($self, $page) = @_;
3060 4058
3061 $self->{multiplexer}->set_current_page ($page); 4059 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 4060 $self->emit (page_changed => $self->{multiplexer}{current});
4061}
4062
4063sub _draw {
4064 my ($self) = @_;
4065
4066 $self->SUPER::_draw ();
4067
4068 if (my $cur = $self->{multiplexer}{current}) {
4069 if ($cur = $cur->{c_tab_}) {
4070 glTranslate $self->{buttonbar}{x} + $cur->{x},
4071 $self->{buttonbar}{y} + $cur->{y};
4072 glLineWidth 3;
4073 #glEnable GL_BLEND;
4074 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4075 glColor @{$self->{active_outline}};
4076 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4077 glLineWidth 1;
4078 #glDisable GL_BLEND;
4079 }
4080 }
3063} 4081}
3064 4082
3065############################################################################# 4083#############################################################################
3066 4084
3067package CFClient::UI::Statusbox; 4085package CFPlus::UI::Selector;
3068 4086
4087use utf8;
4088
3069our @ISA = CFClient::UI::VBox::; 4089our @ISA = CFPlus::UI::Button::;
3070 4090
3071sub new { 4091sub new {
3072 my $class = shift; 4092 my $class = shift;
3073 4093
3074 $class->SUPER::new ( 4094 my $self = $class->SUPER::new (
4095 options => [], # [value, title, longdesc], ...
4096 value => undef,
4097 @_,
4098 );
4099
4100 $self->_set_value ($self->{value});
4101
4102 $self
4103}
4104
4105sub invoke_button_down {
4106 my ($self, $ev) = @_;
4107
4108 my @menu_items;
4109
4110 for (@{ $self->{options} }) {
4111 my ($value, $title, $tooltip) = @$_;
4112
4113 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4114 }
4115
4116 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4117}
4118
4119sub _set_value {
4120 my ($self, $value) = @_;
4121
4122 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4123 $item ||= $self->{options}[0]
4124 or return;
4125
4126 $self->{value} = $item->[0];
4127 $self->set_markup ("$item->[1] ⇓");
4128# $self->set_tooltip ($item->[2]);
4129}
4130
4131sub set_value {
4132 my ($self, $value) = @_;
4133
4134 return unless $self->{value} ne $value;
4135
4136 $self->_set_value ($value);
4137 $self->emit (changed => $value);
4138}
4139
4140sub set_options {
4141 my ($self, $options) = @_;
4142
4143 $self->{options} = $options;
4144 $self->_set_value ($self->{value});
4145}
4146
4147#############################################################################
4148
4149package CFPlus::UI::Statusbox;
4150
4151our @ISA = CFPlus::UI::VBox::;
4152
4153sub new {
4154 my $class = shift;
4155
4156 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 4157 fontsize => 0.8,
3076 @_, 4158 @_,
3077 ) 4159 );
4160
4161 CFPlus::weaken (my $this = $self);
4162
4163 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4164
4165 $self
3078} 4166}
3079 4167
3080sub reorder { 4168sub reorder {
3081 my ($self) = @_; 4169 my ($self) = @_;
3082 my $NOW = time; 4170 my $NOW = Time::HiRes::time;
4171
4172 # freeze display when hovering over any label
4173 return if $CFPlus::UI::TOOLTIP->{owner}
4174 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4175 values %{ $self->{item} };
3083 4176
3084 while (my ($k, $v) = each %{ $self->{item} }) { 4177 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4178 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 4179 }
3087 4180
… …
3094 4187
3095 my $count = 10 + 1; 4188 my $count = 10 + 1;
3096 for my $item (@items) { 4189 for my $item (@items) {
3097 last unless --$count; 4190 last unless --$count;
3098 4191
3099 push @widgets, $item->{label} ||= do { 4192 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 4193 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 4194 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 4195 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 4196 : $item->{text};
3104 4197
3105 for ($short) { 4198 for ($short) {
3106 s/^\s+//; 4199 s/^\s+//;
3107 s/\s+/ /g; 4200 s/\s+/ /g;
3108 } 4201 }
3109 4202
3110 new CFClient::UI::Label 4203 new CFPlus::UI::Label
3111 markup => $short, 4204 markup => $short,
3112 tooltip => $item->{tooltip}, 4205 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 4206 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 4207 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 4208 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 4209 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 4210 fg => [@{ $item->{fg} }],
3118 can_events => 1, 4211 can_events => 1,
3119 can_hover => 1 4212 can_hover => 1
3120 }; 4213 };
4214
4215 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4216 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4217 $label->update;
4218 $label->set_max_size (undef, $label->{req_h} * $diff)
4219 if $diff < 1;
4220 $self->{timer}->set (1/30, 1/30);
4221 } else {
4222 $label->{fg}[3] = $item->{fg}[3] || 1;
4223 }
4224
4225 push @widgets, $label;
3121 } 4226 }
3122 4227
3123 $self->clear; 4228 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 4229 $self->SUPER::add (reverse @widgets);
3125} 4230}
… …
3130 $text =~ s/^\s+//; 4235 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 4236 $text =~ s/\s+$//;
3132 4237
3133 return unless $text; 4238 return unless $text;
3134 4239
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 4240 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 4241
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4242 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 4243
3139 if (my $item = $self->{item}{$group}) { 4244 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 4245 if ($item->{text} eq $text) {
3141 $item->{count}++; 4246 $item->{count}++;
3142 } else { 4247 } else {
3143 $item->{count} = 1; 4248 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 4249 $item->{text} = $item->{tooltip} = $text;
3145 } 4250 }
3146 $item->{id} = ++$self->{id}; 4251 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 4252 $item->{timeout} = $timeout;
3148 delete $item->{label}; 4253 delete $item->{label};
3149 } else { 4254 } else {
3150 $self->{item}{$group} = { 4255 $self->{item}{$group} = {
3151 id => ++$self->{id}, 4256 id => ++$self->{id},
… …
3157 count => 1, 4262 count => 1,
3158 %arg, 4263 %arg,
3159 }; 4264 };
3160 } 4265 }
3161 4266
4267 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 4268 $self->reorder;
4269 });
3163} 4270}
3164 4271
3165sub reconfigure { 4272sub reconfigure {
3166 my ($self) = @_; 4273 my ($self) = @_;
3167 4274
… …
3170 4277
3171 $self->reorder; 4278 $self->reorder;
3172 $self->SUPER::reconfigure; 4279 $self->SUPER::reconfigure;
3173} 4280}
3174 4281
4282sub destroy {
4283 my ($self) = @_;
4284
4285 $self->{timer}->cancel;
4286
4287 $self->SUPER::destroy;
4288}
4289
3175############################################################################# 4290#############################################################################
3176 4291
3177package CFClient::UI::Inventory;
3178
3179our @ISA = CFClient::UI::ScrolledWindow::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root; 4292package CFPlus::UI::Root;
3473 4293
3474our @ISA = CFClient::UI::Container::; 4294our @ISA = CFPlus::UI::Container::;
3475 4295
4296use List::Util qw(min max);
4297
3476use CFClient::OpenGL; 4298use CFPlus::OpenGL;
3477 4299
3478sub new { 4300sub new {
3479 my $class = shift; 4301 my $class = shift;
3480 4302
3481 my $self = $class->SUPER::new ( 4303 my $self = $class->SUPER::new (
3482 visible => 1, 4304 visible => 1,
3483 @_, 4305 @_,
3484 ); 4306 );
3485 4307
3486 Scalar::Util::weaken ($self->{root} = $self); 4308 CFPlus::weaken ($self->{root} = $self);
3487 4309
3488 $self 4310 $self
3489} 4311}
3490 4312
3491sub size_request { 4313sub size_request {
… …
3506 $coord = $max - $size if $coord > $max - $size; 4328 $coord = $max - $size if $coord > $max - $size;
3507 4329
3508 int $coord + 0.5 4330 int $coord + 0.5
3509} 4331}
3510 4332
3511sub size_allocate { 4333sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 4334 my ($self, $w, $h) = @_;
3513 4335
3514 for my $child ($self->children) { 4336 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4337 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 4338
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 4342 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 4343 $Y = _to_pixel $Y, $H, $self->{h};
3522 4344
3523 $child->configure ($X, $Y, $W, $H); 4345 $child->configure ($X, $Y, $W, $H);
3524 } 4346 }
4347
4348 1
3525} 4349}
3526 4350
3527sub coord2local { 4351sub coord2local {
3528 my ($self, $x, $y) = @_; 4352 my ($self, $x, $y) = @_;
3529 4353
… …
3537} 4361}
3538 4362
3539sub update { 4363sub update {
3540 my ($self) = @_; 4364 my ($self) = @_;
3541 4365
3542 $::WANT_REFRESH++; 4366 $::WANT_REFRESH->start;
3543} 4367}
3544 4368
3545sub add { 4369sub add {
3546 my ($self, @children) = @_; 4370 my ($self, @children) = @_;
3547 4371
… …
3584 while ($self->{refresh_hook}) { 4408 while ($self->{refresh_hook}) {
3585 $_->() 4409 $_->()
3586 for values %{delete $self->{refresh_hook}}; 4410 for values %{delete $self->{refresh_hook}};
3587 } 4411 }
3588 4412
3589 if ($self->{realloc}) { 4413 while ($self->{realloc}) {
3590 my %queue; 4414 my %queue;
3591 my @queue; 4415 my @queue;
3592 my $widget; 4416 my $widget;
3593 4417
3594 outer: 4418 outer:
… …
3614 4438
3615 delete $queue{$widget+0}; 4439 delete $queue{$widget+0};
3616 4440
3617 my ($w, $h) = $widget->size_request; 4441 my ($w, $h) = $widget->size_request;
3618 4442
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4443 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4444 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4445
4446 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4447 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 4448
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 4449 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 4450 $h = $widget->{force_h} if exists $widget->{force_h};
3624 4451
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4452 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3638 } 4465 }
3639 } 4466 }
3640 4467
3641 delete $self->{realloc}{$widget+0}; 4468 delete $self->{realloc}{$widget+0};
3642 } 4469 }
3643 }
3644 4470
3645 while (my $size_alloc = delete $self->{size_alloc}) { 4471 while (my $size_alloc = delete $self->{size_alloc}) {
3646 my @queue = sort { $b->{visible} <=> $a->{visible} } 4472 my @queue = sort { $a->{visible} <=> $b->{visible} }
3647 values %$size_alloc; 4473 values %$size_alloc;
3648 4474
3649 while () { 4475 while () {
3650 my $widget = pop @queue || last; 4476 my $widget = pop @queue || last;
3651 4477
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4478 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 4479
3654 $w = 0 if $w < 0; 4480 $w = max $widget->{min_w}, $w;
3655 $h = 0 if $h < 0; 4481 $h = max $widget->{min_h}, $h;
3656 4482
4483# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4484# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4485
4486 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4487 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4488
3657 $w = int $w + 0.5; 4489 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 4490 $h = int $h + 0.5;
3659 4491
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4492 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w}; 4493 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h}; 4494 $widget->{old_h} = $widget->{h};
3663 4495
3664 $widget->{w} = $w; 4496 $widget->{w} = $w;
3665 $widget->{h} = $h; 4497 $widget->{h} = $h;
3666 4498
3667 $widget->emit (size_allocate => $w, $h); 4499 $widget->emit (size_allocate => $w, $h);
4500 }
3668 } 4501 }
3669 } 4502 }
3670 } 4503 }
3671 4504
3672 while ($self->{post_alloc_hook}) { 4505 while ($self->{post_alloc_hook}) {
3673 $_->() 4506 $_->()
3674 for values %{delete $self->{post_alloc_hook}}; 4507 for values %{delete $self->{post_alloc_hook}};
3675 } 4508 }
3676
3677 4509
3678 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4510 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4511 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3680 glClear GL_COLOR_BUFFER_BIT; 4512 glClear GL_COLOR_BUFFER_BIT;
3681 4513
… …
3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4516 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3685 glMatrixMode GL_MODELVIEW; 4517 glMatrixMode GL_MODELVIEW;
3686 glLoadIdentity; 4518 glLoadIdentity;
3687 4519
3688 { 4520 {
3689 package CFClient::UI::Base; 4521 package CFPlus::UI::Base;
3690 4522
3691 ($draw_x, $draw_y, $draw_w, $draw_h) = 4523 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h}); 4524 (0, 0, $self->{w}, $self->{h});
3693 }
3694 4525
3695 $self->_draw; 4526 $self->_draw;
4527 }
3696} 4528}
3697 4529
3698############################################################################# 4530#############################################################################
3699 4531
3700package CFClient::UI; 4532package CFPlus::UI;
3701 4533
3702$ROOT = new CFClient::UI::Root; 4534$ROOT = new CFPlus::UI::Root;
3703$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4535$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3704 4536
37051 45371
3706 4538

Diff Legend

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