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

Diff Legend

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