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

Diff Legend

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