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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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