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.412 by root, Sun Jul 22 20:08:17 2007 UTC

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

Diff Legend

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