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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.326 by root, Sun Jul 16 20:04:08 2006 UTC

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

Diff Legend

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