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

Diff Legend

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