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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 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 ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_text ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
45} 76}
46 77
47sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
49} 81}
50 82
51sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
52 my ($ev) = @_; 84 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 93 check_tooltip;
62 } 94 }
63 95
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 97
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
67} 100}
68 101
69sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
70 my ($ev) = @_; 103 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
72 105
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 107
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 109
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
78 112
79 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 115 $grab->update if $grab;
82 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 133
100 check_tooltip; 134 check_tooltip;
101 } 135 }
102 136
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
104} 139}
105 140
106# convert position array to integers 141# convert position array to integers
107sub harmonize { 142sub harmonize {
108 my ($vals) = @_; 143 my ($vals) = @_;
… …
114 $rem += $_ - $i; 149 $rem += $_ - $i;
115 $_ = $i; 150 $_ = $i;
116 } 151 }
117} 152}
118 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
119############################################################################# 195#############################################################################
120 196
121package CFClient::UI::Base; 197package CFClient::UI::Base;
122 198
123use strict; 199use strict;
… …
126 202
127sub new { 203sub new {
128 my $class = shift; 204 my $class = shift;
129 205
130 my $self = bless { 206 my $self = bless {
131 x => 0, 207 x => "center",
132 y => 0, 208 y => "center",
133 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
134 can_events => 1, 212 can_events => 1,
135 @_ 213 @_
136 }, $class; 214 }, $class;
137 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
138 for (keys %$self) { 218 for (keys %$self) {
139 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
141 } 221 }
142 } 222 }
143 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
144 $self 236 $self
145} 237}
146 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
147sub show { 246sub show {
148 my ($self) = @_; 247 my ($self) = @_;
149 248
150 return if $self->{parent}; 249 return if $self->{parent};
151 250
152 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
153} 252}
154 253
254sub set_visible {
255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
278
279 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self;
281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
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
155sub hide { 307sub hide {
156 my ($self) = @_; 308 my ($self) = @_;
157 309
158 return unless $self->{parent}; 310 $self->set_invisible;
159 311
160 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
161} 314}
162 315
163sub move { 316sub move_abs {
164 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
165 318
166 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
169 322
170 $self->update; 323 $self->update;
171} 324}
172 325
173sub set_size { 326sub set_size {
174 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
175 328
176 $self->{user_w} = $w; 329 $self->{force_w} = $w;
177 $self->{user_h} = $h; 330 $self->{force_h} = $h;
178 331
179 $self->check_size; 332 $self->realloc;
180} 333}
181 334
182sub size_request { 335sub size_request {
183 require Carp; 336 require Carp;
184 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
186 339
187sub configure { 340sub configure {
188 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
189 342
190 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
191 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
192 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
193 348
194 # use alignment to adjust x, y 349 # use alignment to adjust x, y
195 350
196 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
197 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
198
199 ($w, $h) = ($w2, $h2);
200 } 353 }
201 354
202 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
203 $self->{x} = $x; 356 $self->{x} = $x;
204 $self->{y} = $y; 357 $self->{y} = $y;
205 $self->update; 358 $self->update;
206 } 359 }
207 360
208 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
209 $self->{w} = $w; 364 $self->{alloc_w} = $w;
210 $self->{h} = $h; 365 $self->{alloc_h} = $h;
211 366
212 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
213 $self->update;
214 } 368 }
215} 369}
216 370
217sub size_allocate { 371sub size_allocate {
218 # nothing to be done 372 # nothing to be done
219} 373}
220 374
375sub children {
376}
377
221sub set_max_size { 378sub set_max_size {
222 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
223 380
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 383}
227 384
228# return top left coordinates 385sub set_tooltip {
229sub _topleft {
230 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
231 387
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
233} 399}
234 400
235# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
236sub coord2local { 402sub coord2local {
237 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
238 404
239 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 406}
242 407
243# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
244sub coord2global { 409sub coord2global {
245 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
246 411
247 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 413}
250 414
251sub focus_in { 415sub focus_in {
252 my ($self) = @_; 416 my ($self) = @_;
253 417
254 return if $FOCUS == $self; 418 return if $FOCUS == $self;
255 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
256 420
257 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
258 422
259 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
260 424
261 $focus->update if $focus; 425 $focus->update if $focus;
262 $FOCUS->update; 426 $FOCUS->update;
263} 427}
264 428
… …
267 431
268 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
269 433
270 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
271 435
272 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
273 437
274 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
275} 442}
276 443
277sub mouse_motion { } 444sub mouse_motion { }
278sub button_up { } 445sub button_up { }
279sub key_down { } 446sub key_down { }
280sub key_up { } 447sub key_up { }
281 448
282sub button_down { 449sub button_down {
283 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
284 451
285 $self->focus_in; 452 $self->focus_in;
286} 453}
287 454
288sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
289sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
290sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
291sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
292sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
293 528
294sub draw { 529sub draw {
295 my ($self) = @_; 530 my ($self) = @_;
296 531
297 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
298 541
299 glPushMatrix; 542 glPushMatrix;
300 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
301 $self->_draw; 544 $self->_draw;
302 glPopMatrix; 545 glPopMatrix;
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
315 glEnd; 558 glEnd;
316 glDisable GL_BLEND; 559 glDisable GL_BLEND;
317 } 560 }
561
562 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix;
564 glColor 1, 1, 0, 1;
565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
566 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1;
571 glEnd;
572 glPopMatrix;
573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574 }
318} 575}
319 576
320sub _draw { 577sub _draw {
321 my ($self) = @_; 578 my ($self) = @_;
322 579
323 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
324} 581}
325 582
326sub find_widget {
327 my ($self, $x, $y) = @_;
328
329 return () unless $self->{can_events};
330
331 return $self
332 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
333 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
334
335 ()
336}
337
338sub set_parent {
339 my ($self, $parent) = @_;
340
341 Scalar::Util::weaken ($self->{parent} = $parent);
342}
343
344sub check_size {
345 my ($self) = @_;
346
347 $self->{parent}
348 or return 1;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368}
369
370sub update {
371 my ($self) = @_;
372
373 $self->{parent}->update
374 if $self->{parent};
375}
376
377sub connect {
378 my ($self, $signal, $cb) = @_;
379
380 push @{ $self->{signal_cb}{$signal} }, $cb;
381}
382
383sub emit {
384 my ($self, $signal, @args) = @_;
385
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
387 $cb->($self, @args);
388 }
389}
390
391sub DESTROY { 583sub DESTROY {
392 my ($self) = @_; 584 my ($self) = @_;
393 585
586 delete $WIDGET{$self+0};
394 #$self->deactivate; 587 #$self->deactivate;
395} 588}
396 589
397############################################################################# 590#############################################################################
398 591
… …
407 my $class = shift; 600 my $class = shift;
408 601
409 # range [value, low, high, page] 602 # range [value, low, high, page]
410 603
411 $class->SUPER::new ( 604 $class->SUPER::new (
412 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
413 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
414 @_ 607 @_
415 ) 608 )
416} 609}
417 610
418sub _draw { 611sub _draw {
419 my ($self) = @_; 612 my ($self) = @_;
420 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
421 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
422 620
423 glEnable GL_BLEND; 621 glEnable GL_BLEND;
424 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
426 624
427 glBegin GL_QUADS; 625 glBegin GL_QUADS;
428 glVertex 0 , 0; 626 glVertex 0 , 0;
429 glVertex 0 , $h; 627 glVertex 0 , $h;
430 glVertex $w, $h; 628 glVertex $w, $h;
431 glVertex $w, 0; 629 glVertex $w, 0;
432 glEnd; 630 glEnd;
433 631
434 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
435} 634}
436 635
437############################################################################# 636#############################################################################
438 637
439package CFClient::UI::Empty; 638package CFClient::UI::Empty;
… …
444 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
445 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
446} 645}
447 646
448sub size_request { 647sub size_request {
449 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
450} 651}
451 652
452sub draw { } 653sub draw { }
453 654
454############################################################################# 655#############################################################################
… …
460sub new { 661sub new {
461 my ($class, %arg) = @_; 662 my ($class, %arg) = @_;
462 663
463 my $children = delete $arg{children} || []; 664 my $children = delete $arg{children} || [];
464 665
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 666 my $self = $class->SUPER::new (
667 children => [],
668 can_events => 0,
669 %arg,
670 );
466 $self->add ($_) for @$children; 671 $self->add ($_) for @$children;
467 672
468 $self 673 $self
469} 674}
470 675
471sub add { 676sub add {
472 my ($self, $child) = @_; 677 my ($self, @widgets) = @_;
473 678
474 $child->set_parent ($self); 679 $_->set_parent ($self)
680 for @widgets;
475 681
476 use sort 'stable'; 682 use sort 'stable';
477 683
478 $self->{children} = [ 684 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 686 @{$self->{children}}, @widgets
481 ]; 687 ];
482 688
483 $child->check_size; 689 $self->realloc;
690}
691
692sub children {
693 @{ $_[0]{children} }
484} 694}
485 695
486sub remove { 696sub remove {
487 my ($self, $child) = @_; 697 my ($self, $child) = @_;
488 698
489 delete $child->{parent}; 699 delete $child->{parent};
700 $child->hide;
490 701
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 703
493 $self->check_size; 704 $self->realloc;
494 $self->update; 705}
706
707sub clear {
708 my ($self) = @_;
709
710 my $children = delete $self->{children};
711 $self->{children} = [];
712
713 for (@$children) {
714 delete $_->{parent};
715 $_->hide;
716 }
717
718 $self->realloc;
495} 719}
496 720
497sub find_widget { 721sub find_widget {
498 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
499 723
… …
574} 798}
575 799
576sub update { 800sub update {
577 my ($self) = @_; 801 my ($self) = @_;
578 802
579 # we want to do this delayed... 803 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 804 $self->SUPER::update;
582}
583
584sub render_chld {
585 my ($self) = @_;
586
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1;
589 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw;
591 };
592} 805}
593 806
594sub size_allocate { 807sub size_allocate {
595 my ($self, $w, $h) = @_; 808 my ($self, $w, $h) = @_;
596 809
597 $self->child->configure (0, 0, $w, $h); 810 $self->SUPER::size_allocate ($w, $h);
811 $self->update;
812}
598 813
814sub _render {
815 my ($self) = @_;
816
817 $self->{children}[0]->draw;
818}
819
820sub render_child {
821 my ($self) = @_;
822
823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
824 glClearColor 0, 0, 0, 0;
825 glClear GL_COLOR_BUFFER_BIT;
826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
599 $self->render_chld; 834 $self->_render;
835 };
600} 836}
601 837
602sub _draw { 838sub _draw {
603 my ($self) = @_; 839 my ($self) = @_;
604 840
605 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
606 842
607 my $tex = $self->{texture} 843 my $tex = $self->{texture}
608 or return; 844 or return;
609 845
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848 glColor 1, 1, 1, 1;
614 849
615 $tex->draw_quad (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 851
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
619} 853}
620 854
621############################################################################# 855#############################################################################
622 856
623package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
624 858
625our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
626
627sub new { die }
628
629sub size_request {
630 my ($self) = @_;
631
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
634
635 @$self{qw(child_w child_h)}
636}
637
638sub _draw {
639 my ($self) = @_;
640
641 $self->{children}[1]->draw;
642}
643
644
645#############################################################################
646
647package CFClient::UI::Frame;
648
649our @ISA = CFClient::UI::Bin::;
650
651use CFClient::OpenGL;
652 860
653sub new { 861sub new {
654 my $class = shift; 862 my $class = shift;
655 863
656 my $self = $class->SUPER::new ( 864 $class->SUPER::new (
657 bg => [1, 1, 1, 1], 865 scroll_x => 0,
658 border_bg => [1, 1, 1, 1], 866 scroll_y => 1,
659 border => 0.8,
660 @_ 867 @_,
661 ); 868 )
662
663 $self
664} 869}
665 870
666sub _draw { 871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
875
876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
880}
881
882sub size_allocate {
667 my ($self) = @_; 883 my ($self, $w, $h) = @_;
668 884
669 my ($w, $h) = ($self->{w}, $self->{h}); 885 my $child = $self->child;
670 886
671 glEnable GL_BLEND; 887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
673 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 889
676# glBegin GL_QUADS; 890 $self->child->configure (0, 0, $w, $h);
677# glColor 0, 0, 0, 0; 891 $self->update;
678# glVertex 0 , 0; 892}
679# glVertex 0 , $h;
680# glVertex $w, $h;
681# glVertex $w, 0;
682# glEnd;
683 893
894sub set_offset {
895 my ($self, $x, $y) = @_;
684 896
685 $self->child->draw; 897 $self->{view_x} = int $x;
686 glDisable GL_BLEND; 898 $self->{view_y} = int $y;
687 glDisable GL_TEXTURE_2D; 899
900 $self->update;
901}
902
903# hmm, this does not work for topleft of $self... but we should not ask for that
904sub coord2local {
905 my ($self, $x, $y) = @_;
906
907 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
908}
909
910sub coord2global {
911 my ($self, $x, $y) = @_;
912
913 $x = List::Util::min $self->{w}, $x - $self->{view_x};
914 $y = List::Util::min $self->{h}, $y - $self->{view_y};
915
916 $self->SUPER::coord2global ($x, $y)
917}
918
919sub find_widget {
920 my ($self, $x, $y) = @_;
921
922 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
923 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
924 ) {
925 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
926 } else {
927 $self->CFClient::UI::Base::find_widget ($x, $y)
928 }
929}
930
931sub _render {
932 my ($self) = @_;
933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
938
939 $self->SUPER::_render;
688} 940}
689 941
690############################################################################# 942#############################################################################
691 943
692package CFClient::UI::FancyFrame; 944package CFClient::UI::ScrolledWindow;
693 945
694our @ISA = CFClient::UI::Bin::; 946our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697
698my @tex =
699 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
700 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
701 947
702sub new { 948sub new {
703 my $class = shift; 949 my $class = shift;
704 950
705 # TODO: user_x, user_y, overwrite moveto? 951 my $self;
952
953 my $slider = new CFClient::UI::Slider
954 vertical => 1,
955 range => [0, 0, 1, 0.01], # HACK fix
956 on_changed => sub {
957 $self->{vp}->set_offset (0, $_[1]);
958 },
959 ;
960
961 $self = $class->SUPER::new (
962 vp => (new CFClient::UI::ViewPort expand => 1),
963 slider => $slider,
964 @_,
965 );
966
967 $self->{vp}->add ($self->{scrolled});
968 $self->add ($self->{vp});
969 $self->add ($self->{slider});
970
971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
991}
992
993#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll
995
996#############################################################################
997
998package CFClient::UI::Frame;
999
1000our @ISA = CFClient::UI::Bin::;
1001
1002use CFClient::OpenGL;
1003
1004sub new {
1005 my $class = shift;
1006
1007 $class->SUPER::new (
1008 bg => undef,
1009 @_,
1010 )
1011}
1012
1013sub _draw {
1014 my ($self) = @_;
1015
1016 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)};
1018
1019 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} };
1022
1023 glBegin GL_QUADS;
1024 glVertex 0 , 0;
1025 glVertex 0 , $h;
1026 glVertex $w, $h;
1027 glVertex $w, 0;
1028 glEnd;
1029
1030 glDisable GL_BLEND;
1031 }
1032
1033 $self->SUPER::_draw;
1034}
1035
1036#############################################################################
1037
1038package CFClient::UI::FancyFrame;
1039
1040our @ISA = CFClient::UI::Bin::;
1041
1042use CFClient::OpenGL;
1043
1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051
1052sub new {
1053 my $class = shift;
706 1054
707 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
710 border => 0.8, 1058 border => 0.6,
711 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
712 @_ 1062 @_
713 ); 1063 );
714 1064
715 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 1066 align => 0,
717 valign => 1, 1067 valign => 1,
718 text => $self->{title}, 1068 text => $self->{title},
719 fontsize => 1; 1069 fontsize => $self->{border};
720 1070
721 $self 1071 $self
722} 1072}
723 1073
724sub border { 1074sub border {
… …
740 my ($self, $w, $h) = @_; 1090 my ($self, $w, $h) = @_;
741 1091
742 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
744 1094
745 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746 if $self->{title}; 1096 if $self->{title};
747 1097
748 $self->child->configure ($self->border, $self->border, $w, $h); 1098 $self->child->configure ($self->border, $self->border, $w, $h);
749} 1099}
750 1100
751sub button_down { 1101sub button_down {
752 my ($self, $ev, $x, $y) = @_; 1102 my ($self, $ev, $x, $y) = @_;
753 1103
1104 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 1105 my $border = $self->border;
755 1106
756 if ($x < $self->{w} && $x >= $self->{w} - $border 1107 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 1108 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 1109
1110 if ($lr & $td) {
1111 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1112 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 1113 my ($bw, $bh) = ($self->{w}, $self->{h});
761 1114
1115 my $mx = $x < $border;
1116 my $my = $y < $border;
1117
762 $self->{motion} = sub { 1118 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
764 1120
765 ($x, $y) = ($ev->{x}, $ev->{y}); 1121 my $dx = $ev->{x} - $ox;
1122 my $dy = $ev->{y} - $oy;
766 1123
767 $self->{user_w} = $bw + $x - $ox; 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
769 $self->check_size; 1126
1127 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
770 }; 1129 };
771 1130
772 } elsif ($x >= 0 && $x < $self->{w} 1131 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
777 1134
778 $self->{motion} = sub { 1135 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
780 1137
781 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
782 1139
783 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
784 $self->update;
785 }; 1141 };
786 } 1142 }
787} 1143}
788 1144
789sub button_up { 1145sub button_up {
… …
802 my ($self) = @_; 1158 my ($self) = @_;
803 1159
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1160 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1162
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1163 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1165
812 my $border = $self->border; 1166 my $border = $self->border;
813 1167
814 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1173
820 my $bg = $tex[0]; 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1175 glColor @{ $self->{bg} };
821 1176
822 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1178 # solve this better(?)
824 my $rep_y = $ch / $bg->{h}; 1179 $bg->{s} = $cw / $bg->{w};
825 1180 $bg->{t} = $ch / $bg->{h};
826 glColor @{ $self->{bg} };
827
828 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 }
832 1183
833 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1185
836 $self->{title}->draw if $self->{title}; 1186 $self->{title}->draw if $self->{title};
1187
837 $self->child->draw; 1188 $self->child->draw;
838} 1189}
839 1190
840############################################################################# 1191#############################################################################
841 1192
… …
850sub new { 1201sub new {
851 my $class = shift; 1202 my $class = shift;
852 1203
853 $class->SUPER::new ( 1204 $class->SUPER::new (
854 col_expand => [], 1205 col_expand => [],
855 @_ 1206 @_,
856 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
857} 1212}
858 1213
859sub add { 1214sub add {
860 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
861 1216
862 $child->set_parent ($self); 1217 $child->set_parent ($self);
863 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
864 1219
865 $child->check_size; 1220 $self->realloc;
866} 1221}
867 1222
868# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
869sub clear { 1224sub clear {
870 my ($self) = @_; 1225 my ($self) = @_;
871 1226
1227 my @children = $self->children;
872 delete $self->{children}; 1228 delete $self->{children};
873 $self->update; 1229
1230 for (@children) {
1231 delete $_->{parent};
1232 $_->hide;
1233 }
1234
1235 $self->realloc;
874} 1236}
875 1237
876sub get_wh { 1238sub get_wh {
877 my ($self) = @_; 1239 my ($self) = @_;
878 1240
… …
909sub size_allocate { 1271sub size_allocate {
910 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
911 1273
912 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
913 1275
914 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
915 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
916 1278
917 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
918 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
919 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
920 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
974 } 1336 }
975} 1337}
976 1338
977############################################################################# 1339#############################################################################
978 1340
979package CFClient::UI::HBox; 1341package CFClient::UI::Box;
980
981# TODO: wrap into common Box base class
982 1342
983our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
984 1344
985sub size_request { 1345sub size_request {
986 my ($self) = @_; 1346 my ($self) = @_;
987 1347
988 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
989 1349 ? (
990 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
991 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
992 (List::Util::max map $_->[1], @alloc), 1352 )
993 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
994} 1357}
995 1358
996sub size_allocate { 1359sub size_allocate {
997 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
998 1361
999 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1000
1001 my $children = $self->{children}; 1363 my $children = $self->{children};
1002 1364
1003 my @h = map $_->{req_w}, @$children; 1365 my @req;
1004 1366
1005 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1006 1368 @req = ($space / (@$children || 1)) x @$children;
1007 if ($req_h > $h) {
1008 # ah well, not enough space
1009 $_ *= $h / $req_h for @h;
1010 } else { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1011 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1012 $exp ||= 1;
1013 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1014 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1015 my $child = $children->[$_];
1016
1017 my $alloc_h = $h[$_];
1018 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1019 $h[$_] = $alloc_h;
1020 } 1383 }
1021 } 1384 }
1022 1385
1023 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1024 1387
1025 my $y = 0; 1388 my $pos = 0;
1026 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1029 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1030 1392
1031 $y += $h; 1393 $pos += $alloc;
1032 } 1394 }
1033 1395
1034 1 1396 1
1035} 1397}
1036 1398
1037############################################################################# 1399#############################################################################
1038 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1039package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1040 1417
1041# TODO: wrap into common Box base class
1042
1043our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1044 1419
1045sub size_request { 1420sub new {
1046 my ($self) = @_; 1421 my $class = shift;
1047 1422
1048 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1049 1424 vertical => 1,
1050 ( 1425 @_,
1051 (List::Util::max map $_->[0], @alloc),
1052 (List::Util::sum map $_->[1], @alloc),
1053 ) 1426 )
1054} 1427}
1055 1428
1056sub size_allocate {
1057 my ($self, $w, $h) = @_;
1058
1059 my $children = $self->{children};
1060
1061 my @h = map $_->{req_h}, @$children;
1062
1063 my $req_h = List::Util::sum @h;
1064
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } else {
1069 my $exp = List::Util::sum map $_->{expand}, @$children;
1070 $exp ||= 1;
1071
1072 for (0 .. $#$children) {
1073 my $child = $children->[$_];
1074
1075 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1076 }
1077 }
1078
1079 CFClient::UI::harmonize \@h;
1080
1081 my $y = 0;
1082 for (0 .. $#$children) {
1083 my $child = $children->[$_];
1084 my $h = $h[$_];
1085 $child->configure (0, $y, $w, $h);
1086
1087 $y += $h;
1088 }
1089
1090 1
1091}
1092
1093############################################################################# 1429#############################################################################
1094 1430
1095package CFClient::UI::Label; 1431package CFClient::UI::Label;
1096 1432
1097our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1098 1434
1099use CFClient::OpenGL; 1435use CFClient::OpenGL;
1100 1436
1101sub new { 1437sub new {
1102 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1103 1439
1104 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1442 #bg => none
1443 #active_bg => none
1106 #font => default_font 1444 #font => default_font
1445 #text => initial text
1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1449 layout => (new CFClient::Layout),
1107 fontsize => 1, 1450 fontsize => 1,
1108 text => "",
1109 align => -1, 1451 align => -1,
1110 valign => -1, 1452 valign => -1,
1111 padding => 2, 1453 padding_x => 2,
1112 layout => new CFClient::Layout, 1454 padding_y => 2,
1113 can_events => 0, 1455 can_events => 0,
1114 %arg 1456 %arg
1115 ); 1457 );
1116 1458
1117 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1460 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1461 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1462 $self->{template} = $layout;
1121 } 1463 }
1122 1464
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1465 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1466 $self->set_markup (delete $self->{markup});
1467 } else {
1468 $self->set_text (delete $self->{text});
1469 }
1125 1470
1126 $self 1471 $self
1127} 1472}
1128 1473
1129sub escape_text { 1474sub escape($) {
1130 local $_ = $_[1]; 1475 local $_ = $_[0];
1131 1476
1132 s/&/&amp;/g; 1477 s/&/&amp;/g;
1133 s/>/&gt;/g; 1478 s/>/&gt;/g;
1134 s/</&lt;/g; 1479 s/</&lt;/g;
1135 1480
1136 $_[1] 1481 $_
1482}
1483
1484sub update {
1485 my ($self) = @_;
1486
1487 delete $self->{texture};
1488 $self->SUPER::update;
1137} 1489}
1138 1490
1139sub set_text { 1491sub set_text {
1140 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1141 1493
1494 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text";
1496
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1143 1499
1144 delete $self->{texture}; 1500 $self->realloc;
1145 $self->check_size;
1146 $self->update; 1501 $self->update;
1147} 1502}
1148 1503
1149sub set_markup { 1504sub set_markup {
1150 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1151 1506
1507 return if $self->{text} eq "M$markup";
1508 $self->{text} = "M$markup";
1509
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1153 1514
1154 delete $self->{texture}; 1515 $self->realloc;
1155 $self->check_size;
1156 $self->update; 1516 $self->update;
1157} 1517}
1158 1518
1159sub size_request { 1519sub size_request {
1160 my ($self) = @_; 1520 my ($self) = @_;
1161 1521
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $self->{layout}->set_width ($self->{max_w} || -1); 1523 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1527
1166 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1167 1529
1168 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1173 1535
1174 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1175 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1176 } 1538 }
1177 1539
1178 ( 1540 ($w, $h)
1179 $w + $self->{padding} * 2,
1180 $h + $self->{padding} * 2,
1181 )
1182} 1541}
1183 1542
1184sub size_allocate { 1543sub size_allocate {
1185 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1186 1545
1187 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1188} 1548}
1189 1549
1190sub set_fontsize { 1550sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1192 1552
1193 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1554 delete $self->{texture};
1195 $self->check_size; 1555
1196 $self->update; 1556 $self->realloc;
1197} 1557}
1198 1558
1199sub _draw { 1559sub _draw {
1200 my ($self) = @_; 1560 my ($self) = @_;
1201 1561
1562 $self->SUPER::_draw; # draw background, if applicable
1563
1202 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1565 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1567 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571
1206 new_from_layout CFClient::Texture $self->{layout} 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1573
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5);
1577
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1207 }; 1583 };
1208 1584
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1585 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1587
1588 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1589 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $tex->draw_quad ($self->{ox}, $self->{oy}); 1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else {
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 }
1229 1594
1230 glDisable GL_TEXTURE_2D; 1595 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1596}
1233 1597
1234############################################################################# 1598#############################################################################
1235 1599
1236package CFClient::UI::EntryBase; 1600package CFClient::UI::EntryBase;
… …
1241 1605
1242sub new { 1606sub new {
1243 my $class = shift; 1607 my $class = shift;
1244 1608
1245 $class->SUPER::new ( 1609 $class->SUPER::new (
1246 fg => [1, 1, 1], 1610 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1611 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1612 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1250 can_hover => 1, 1614 can_hover => 1,
1251 can_focus => 1, 1615 can_focus => 1,
1252 valign => 0, 1616 valign => 0,
1253 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1254 @_ 1619 @_
1255 ) 1620 )
1256} 1621}
1257 1622
1258sub _set_text { 1623sub _set_text {
… …
1268 $self->{text} = $text; 1633 $self->{text} = $text;
1269 1634
1270 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1272 1637
1273 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1639}
1640
1641sub set_text {
1642 my ($self, $text) = @_;
1643
1644 $self->{cursor} = length $text;
1645 $self->_set_text ($text);
1646
1647 $self->realloc;
1274} 1648}
1275 1649
1276sub get_text { 1650sub get_text {
1277 $_[0]{text} 1651 $_[0]{text}
1278} 1652}
… …
1281 my ($self) = @_; 1655 my ($self) = @_;
1282 1656
1283 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1284 1658
1285 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text {
1295 my ($self, $text) = @_;
1296
1297 $self->{cursor} = length $text;
1298 $self->_set_text ($text);
1299 $self->update;
1300} 1660}
1301 1661
1302sub key_down { 1662sub key_down {
1303 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1304 1664
… …
1306 my $sym = $ev->{sym}; 1666 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1667 my $uni = $ev->{unicode};
1308 1668
1309 my $text = $self->get_text; 1669 my $text = $self->get_text;
1310 1670
1311 if ($sym == 8) { 1671 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1672 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1673 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1674 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1675 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1676 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1677 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1678 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1683 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1684 $self->_emit ('escape');
1325 } elsif ($uni) { 1685 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1687 }
1328 1688
1329 $self->_set_text ($text); 1689 $self->_set_text ($text);
1330 $self->update; 1690
1691 $self->realloc;
1331} 1692}
1332 1693
1333sub focus_in { 1694sub focus_in {
1334 my ($self) = @_; 1695 my ($self) = @_;
1335 1696
… …
1411 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1412 1773
1413 my $sym = $ev->{sym}; 1774 my $sym = $ev->{sym};
1414 1775
1415 if ($sym == 13) { 1776 if ($sym == 13) {
1777 unshift @{$self->{history}},
1778 my $txt = $self->get_text;
1779 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1781 $self->_emit (activate => $txt);
1417 $self->update; 1782 $self->update;
1783
1784 } elsif ($sym == CFClient::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text;
1787 }
1788 if (@{$self->{history} || []} > 0) {
1789 $self->{history_pointer}++;
1790 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1791 $self->{history_pointer} = @{$self->{history} || []} - 1;
1792 }
1793 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1794 }
1795
1796 } elsif ($sym == CFClient::SDLK_DOWN) {
1797 $self->{history_pointer}--;
1798 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1799
1800 if ($self->{history_pointer} >= 0) {
1801 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1802 } else {
1803 $self->set_text ($self->{history_saveback});
1804 }
1418 1805
1419 } else { 1806 } else {
1420 $self->SUPER::key_down ($ev); 1807 $self->SUPER::key_down ($ev);
1421 } 1808 }
1422 1809
… …
1436 1823
1437sub new { 1824sub new {
1438 my $class = shift; 1825 my $class = shift;
1439 1826
1440 $class->SUPER::new ( 1827 $class->SUPER::new (
1441 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1442 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1445 can_hover => 1, 1832 can_hover => 1,
1446 align => 0, 1833 align => 0,
1447 valign => 0, 1834 valign => 0,
1448 can_events => 1, 1835 can_events => 1,
1449 @_ 1836 @_
1450 ) 1837 )
1451} 1838}
1452 1839
1840sub activate { }
1841
1453sub button_up { 1842sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1455 1844
1845 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate");
1459 }
1460} 1848}
1461 1849
1462sub _draw { 1850sub _draw {
1463 my ($self) = @_; 1851 my ($self) = @_;
1464 1852
… …
1466 1854
1467 if ($GRAB == $self) { 1855 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1469 } 1857 }
1470 1858
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1861 glColor 0, 0, 0, 1;
1476 1862
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1864
1479 glDisable GL_TEXTURE_2D; 1865 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1866
1482 $self->SUPER::_draw; 1867 $self->SUPER::_draw;
1483} 1868}
1484 1869
1485############################################################################# 1870#############################################################################
… …
1496 1881
1497sub new { 1882sub new {
1498 my $class = shift; 1883 my $class = shift;
1499 1884
1500 $class->SUPER::new ( 1885 $class->SUPER::new (
1501 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1502 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1890 bg => [0, 0, 0, 0.2],
1891 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1892 state => 0,
1505 can_hover => 1, 1893 can_hover => 1,
1506 @_ 1894 @_
1507 ) 1895 )
1508} 1896}
1509 1897
1510sub size_request { 1898sub size_request {
1511 my ($self) = @_; 1899 my ($self) = @_;
1512 1900
1513 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1514} 1902}
1515 1903
1516sub button_down { 1904sub button_down {
1517 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1518 1906
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1521 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1523 } 1911 }
1524} 1912}
1525 1913
1526sub _draw { 1914sub _draw {
1527 my ($self) = @_; 1915 my ($self) = @_;
1528 1916
1529 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1530 1918
1531 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1532 1920
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1534 1924
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1926
1537 glEnable GL_BLEND; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1928
1538 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1930 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1931 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1932}
1548 1933
1549############################################################################# 1934#############################################################################
1550 1935
1551package CFClient::UI::Image; 1936package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1979 glTranslate 0, -$self->{w}, 0;
1595 1980
1596 ($w, $h) = ($h, $w); 1981 ($w, $h) = ($h, $w);
1597 } 1982 }
1598 1983
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1986
1604 $tex->draw_quad (0, 0, $w, $h); 1987 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1988
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1608} 1990}
1609 1991
1610############################################################################# 1992#############################################################################
1611 1993
… …
1659} 2041}
1660 2042
1661sub set_max { 2043sub set_max {
1662 my ($self, $max) = @_; 2044 my ($self, $max) = @_;
1663 2045
2046 return if $self->{max_val} == $max;
2047
1664 $self->{max_val} = $max; 2048 $self->{max_val} = $max;
2049 $self->update;
1665} 2050}
1666 2051
1667sub set_value { 2052sub set_value {
1668 my ($self, $val, $max) = @_; 2053 my ($self, $val, $max) = @_;
1669 2054
1670 $self->set_max ($max) 2055 $self->set_max ($max)
1671 if defined $max; 2056 if defined $max;
1672 2057
1673 $max = $self->{max_val}; 2058 return if $self->{val} == $val;
2059
1674 $self->{val} = $val; 2060 $self->{val} = $val;
1675
1676 $self->update; 2061 $self->update;
1677} 2062}
1678 2063
1679sub _draw { 2064sub _draw {
1680 my ($self) = @_; 2065 my ($self) = @_;
… …
1743 2128
1744sub new { 2129sub new {
1745 my ($class, %arg) = @_; 2130 my ($class, %arg) = @_;
1746 2131
1747 my $self = $class->SUPER::new ( 2132 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2133 tooltip => $arg{type},
2134 can_hover => 1,
2135 can_events => 1,
1749 %arg, 2136 %arg,
1750 ); 2137 );
1751 2138
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2139 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2140 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2141 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2142
1756 $self 2143 $self
1757} 2144}
1758 2145
1759sub set_fontsize { 2146sub set_fontsize {
… …
1761 2148
1762 $self->{value}->set_fontsize ($fsize); 2149 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2150 $self->{max} ->set_fontsize ($fsize);
1764} 2151}
1765 2152
2153sub set_max {
2154 my ($self, $max) = @_;
2155
2156 $self->{gauge}->set_max ($max);
2157 $self->{max}->set_text ($max);
2158}
2159
1766sub set_value { 2160sub set_value {
1767 my ($self, $val, $max) = @_; 2161 my ($self, $val, $max) = @_;
1768 2162
1769 $self->set_max ($max) 2163 $self->set_max ($max)
1770 if defined $max; 2164 if defined $max;
1771 2165
1772 $self->{gauge}->set_value ($val, $max); 2166 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2167 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 2168}
1782 2169
1783############################################################################# 2170#############################################################################
1784 2171
1785package CFClient::UI::Slider; 2172package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2182 qw(s1_slider.png s1_slider_bg.png);
1796 2183
1797sub new { 2184sub new {
1798 my $class = shift; 2185 my $class = shift;
1799 2186
1800 # range [value, low, high, page] 2187 # range [value, low, high, page, unit]
1801 2188
1802 # TODO: 0-width page 2189 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2191 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2195 bg => [0, 0, 0, 0.2],
2196 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2198 min_w => $::WIDTH / 80,
1810 req_h => 20, 2199 min_h => $::WIDTH / 80,
1811 vertical => 0, 2200 vertical => 0,
1812 can_hover => 1, 2201 can_hover => 1,
1813 inner_pad => 5, 2202 inner_pad => 0.02,
1814 @_ 2203 @_
1815 ); 2204 );
1816 2205
2206 $self->set_value ($self->{range}[0]);
2207 $self->update;
2208
1817 $self 2209 $self
1818} 2210}
1819 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2223sub set_value {
2224 my ($self, $value) = @_;
2225
2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2227
2228 $hi = $lo + 1 if $hi <= $lo;
2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2232 $value = $lo if $value < $lo;
2233 $value = $hi - $page if $value > $hi - $page;
2234
2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2236 if $unit;
2237
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239
2240 if ($value != $old_value) {
2241 $self->_emit (changed => $value);
2242 $self->update;
2243 }
2244}
2245
1820sub size_request { 2246sub size_request {
1821 my ($self) = @_; 2247 my ($self) = @_;
1822 2248
1823 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
1824 my $h = $self->{req_h};
1825
1826 $self->{vertical} ? ($h, $w) : ($w, $h)
1827} 2250}
1828 2251
1829sub button_down { 2252sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
1831 2254
1832 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
1833 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
1834} 2260}
1835 2261
1836sub mouse_motion { 2262sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
1838 2264
1839 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267
2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2273 }
2274}
2275
2276sub update {
2277 my ($self) = @_;
2278
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2280 $self->set_value ($self->{range}[0]);
2281
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
1841 2284
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2286
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2289
1847 $x -= $inner_pad_px; # substract the padding 2290 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2291 $value = $value * $self->{scale} + $self->{offset};
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2292
1853 $self->emit (changed => $x); 2293 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2294 $self->{knob_w} = $knob_w;
1855 } 2295 });
1856}
1857 2296
1858# the inner_* stuff is for generating a padding for the slider handle, 2297 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2298}
1865 2299
1866sub _draw { 2300sub _draw {
1867 my ($self) = @_; 2301 my ($self) = @_;
1868 2302
1869 $self->SUPER::_draw (); 2303 $self->SUPER::_draw ();
1870 2304
1871 my ($w, $h) = @$self{qw(w h)}; 2305 glScale $self->{w}, $self->{h};
1872 2306
1873 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
1875 2309
2310 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2312 }
1881 2313
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2316
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2317 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2319
1908 # draw background 2320 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2321 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2322
1911 # draw handle 2323 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2325
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
1916} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
1917 2369
1918############################################################################# 2370#############################################################################
1919 2371
1920package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
1921 2373
… …
1925 2377
1926sub new { 2378sub new {
1927 my $class = shift; 2379 my $class = shift;
1928 2380
1929 my $self = $class->SUPER::new ( 2381 my $self = $class->SUPER::new (
1930 fontsize => 1, 2382 fontsize => 1,
2383 can_events => 0,
1931 #font => default_font 2384 #font => default_font
1932 @_, 2385 @_,
1933 2386
1934 layout => (new CFClient::Layout), 2387 layout => (new CFClient::Layout 1),
1935 par => [], 2388 par => [],
1936 height => 0, 2389 height => 0,
1937 children => [ 2390 children => [
1938 (new CFClient::UI::Empty expand => 1), 2391 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2392 (new CFClient::UI::Slider vertical => 1),
1940 ], 2393 ],
1941 ); 2394 );
1942 2395
1943 $self->{children}[1]->connect (changed => sub { 2396 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2397
1947 $self 2398 $self
1948} 2399}
1949 2400
1950sub set_fontsize { 2401sub set_fontsize {
1951 my ($self, $fontsize) = @_; 2402 my ($self, $fontsize) = @_;
1952 2403
1953 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2405 $self->reflow;
1955}
1956
1957sub text_height {
1958 my ($self, $text) = @_;
1959
1960 my $layout = $self->{layout};
1961
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w});
1964 $layout->set_text ($text);
1965
1966 ($layout->size)[1]
1967}
1968
1969sub reflow {
1970 my ($self) = @_;
1971
1972 $self->{need_reflow}++;
1973 $self->update;
1974} 2406}
1975 2407
1976sub size_allocate { 2408sub size_allocate {
1977 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
1978 2410
… …
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2416
1985 $self->reflow; 2417 $self->reflow;
1986} 2418}
1987 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
1988sub add_paragraph { 2454sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
1990 2456
1991 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
1992 2458 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
1996 2462
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000 $self->{children}[1]->update;
2001} 2464}
2002 2465
2003sub update { 2466sub update {
2004 my ($self) = @_; 2467 my ($self) = @_;
2005 2468
… …
2007 2470
2008 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2009 2472
2010 delete $self->{texture}; 2473 delete $self->{texture};
2011 2474
2012 $ROOT->on_refresh ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2013 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2479 my $height = 0;
2015 2480
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2017 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2018 2496
2019 $self->{height} = $height; 2497 $self->{height} = $height;
2020 2498
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2500
2023 delete $self->{texture}; 2501 delete $self->{texture};
2024 } 2502 }
2025 2503
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2029 2507
2508 my $top = int $self->{children}[1]{range}[0];
2509
2510 my $y0 = $top;
2511 my $y1 = $top + $H;
2512
2513 my $y = 0;
2514
2515 my $layout = $self->{layout};
2516
2517 $layout->set_font ($self->{font}) if $self->{font};
2518
2030 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034
2035 my $top = int $self->{children}[1]{range}[0];
2036
2037 my $y0 = $top;
2038 my $y1 = $top + $self->{h};
2039
2040 my $y = 0;
2041
2042 my $layout = $self->{layout};
2043
2044 $layout->set_font ($self->{font}) if $self->{font};
2045 2522
2046 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2524 my $h = $par->[1];
2048 2525
2049 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2050 $layout->set_text ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2051 2530
2052 glColor @{ $par->[1] }; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2532
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2535 }
2056 2536
2057 $y += $h; 2537 $y += $h;
2058 } 2538 }
2059 2539
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2540 glDisable GL_BLEND;
2062 }; 2541 };
2063 }); 2542 });
2064} 2543}
2065 2544
2066sub _draw { 2545sub _draw {
2067 my ($self) = @_; 2546 my ($self) = @_;
2068 2547
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2074 }
2075 2553
2076 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2077 2555
2078} 2556}
2079 2557
… …
2127 2605
2128sub new { 2606sub new {
2129 my $class = shift; 2607 my $class = shift;
2130 2608
2131 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2132 state => 0, 2610 state => 0,
2133 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2612 @_
2136 ); 2613 );
2137 2614
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2615 $self
2144} 2616}
2145 2617
2146sub toggle_flopper { 2618sub toggle_flopper {
2147 my ($self) = @_; 2619 my ($self) = @_;
2148 2620
2149 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2150 if ($self->{state} = !$self->{state}) {
2151 $CFClient::UI::ROOT->add ($self->{other});
2152 $self->{other}->move ($self->coord2global (0, $self->{h}));
2153 $self->emit ("open");
2154 } else {
2155 $CFClient::UI::ROOT->remove ($self->{other});
2156 $self->emit ("close");
2157 }
2158
2159 $self->emit (changed => $self->{state});
2160} 2622}
2161 2623
2162############################################################################# 2624#############################################################################
2163 2625
2164package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2174 @_, 2636 @_,
2175 can_events => 0, 2637 can_events => 0,
2176 ) 2638 )
2177} 2639}
2178 2640
2179sub set_text { 2641sub set_tooltip_from {
2180 my ($self, $text) = @_; 2642 my ($self, $widget) = @_;
2181 2643
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2644 my $tooltip = $widget->{tooltip};
2183 $self->{label}->set_text ($text); 2645
2184 $self->add ($self->{label}); 2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2653 $self->add (new CFClient::UI::Label
2654 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8,
2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2660 );
2185} 2661}
2186 2662
2187sub size_request { 2663sub size_request {
2188 my ($self) = @_; 2664 my ($self) = @_;
2189 2665
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2667
2194 ($w + 4, $h + 4) 2668 ($w + 4, $h + 4)
2195} 2669}
2196 2670
2671sub size_allocate {
2672 my ($self, $w, $h) = @_;
2673
2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2693}
2694
2197sub _draw { 2695sub _draw {
2198 my ($self) = @_; 2696 my ($self) = @_;
2199 2697
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2698 glTranslate 0.375, 0.375;
2202 2699
2203 my ($w, $h) = @$self{qw(w h)}; 2700 my ($w, $h) = @$self{qw(w h)};
2204 2701
2205 glColor 1, 0.8, 0.4; 2702 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2713 glVertex 0 , $h;
2217 glVertex $w, $h; 2714 glVertex $w, $h;
2218 glVertex $w, 0; 2715 glVertex $w, 0;
2219 glEnd; 2716 glEnd;
2220 2717
2221 glPopMatrix; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2222 2719
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2225} 2721}
2226 2722
2227############################################################################# 2723#############################################################################
2228 2724
2725package CFClient::UI::Face;
2726
2727our @ISA = CFClient::UI::Base::;
2728
2729use CFClient::OpenGL;
2730
2731sub new {
2732 my $class = shift;
2733
2734 my $self = $class->SUPER::new (
2735 aspect => 1,
2736 can_events => 0,
2737 @_,
2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2755}
2756
2757sub size_request {
2758 (32, 8)
2759}
2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2769sub _draw {
2770 my ($self) = @_;
2771
2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784
2785 if ($tex) {
2786 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D;
2791 }
2792}
2793
2794sub DESTROY {
2795 my ($self) = @_;
2796
2797 $self->{timer}->cancel
2798 if $self->{timer};
2799
2800 $self->SUPER::DESTROY;
2801}
2802
2803#############################################################################
2804
2805package CFClient::UI::Menu;
2806
2807our @ISA = CFClient::UI::FancyFrame::;
2808
2809use CFClient::OpenGL;
2810
2811sub new {
2812 my $class = shift;
2813
2814 my $self = $class->SUPER::new (
2815 items => [],
2816 z => 100,
2817 @_,
2818 );
2819
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821
2822 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item;
2824
2825 # handle various types of items, only text for now
2826 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label
2828 can_hover => 1,
2829 can_events => 1,
2830 text => $widget;
2831 }
2832
2833 $self->{item}{$widget} = $item;
2834
2835 $self->{vbox}->add ($widget);
2836 }
2837
2838 $self
2839}
2840
2841# popup given the event (must be a mouse button down event currently)
2842sub popup {
2843 my ($self, $ev) = @_;
2844
2845 $self->_emit ("popdown");
2846
2847 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self;
2849 $self->{button} = $ev->{button};
2850
2851 $self->show;
2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853}
2854
2855sub mouse_motion {
2856 my ($self, $ev, $x, $y) = @_;
2857
2858 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER};
2861}
2862
2863sub button_up {
2864 my ($self, $ev, $x, $y) = @_;
2865
2866 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB;
2868 $self->hide;
2869
2870 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover};
2872 }
2873}
2874
2875#############################################################################
2876
2877package CFClient::UI::Statusbox;
2878
2879our @ISA = CFClient::UI::VBox::;
2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2890sub reorder {
2891 my ($self) = @_;
2892 my $NOW = time;
2893
2894 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 }
2897
2898 my @widgets;
2899
2900 my @items = sort {
2901 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} };
2904
2905 my $count = 10 + 1;
2906 for my $item (@items) {
2907 last unless --$count;
2908
2909 push @widgets, $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2915 for ($short) {
2916 s/^\s+//;
2917 s/\s+/ /g;
2918 }
2919
2920 new CFClient::UI::Label
2921 markup => $short,
2922 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2928 can_events => 1,
2929 can_hover => 1
2930 };
2931 }
2932
2933 $self->clear;
2934 $self->SUPER::add (reverse @widgets);
2935}
2936
2937sub add {
2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2944
2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2946
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948
2949 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) {
2951 $item->{count}++;
2952 } else {
2953 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text;
2955 }
2956 $item->{id} = ++$self->{id};
2957 $item->{timeout} = $timeout;
2958 delete $item->{label};
2959 } else {
2960 $self->{item}{$group} = {
2961 id => ++$self->{id},
2962 text => $text,
2963 timeout => $timeout,
2964 tooltip => $text,
2965 fg => [0.8, 0.8, 0.8, 0.8],
2966 pri => 0,
2967 count => 1,
2968 %arg,
2969 };
2970 }
2971
2972 $self->reorder;
2973}
2974
2975sub reconfigure {
2976 my ($self) = @_;
2977
2978 delete $_->{label}
2979 for values %{ $self->{item} || {} };
2980
2981 $self->reorder;
2982 $self->SUPER::reconfigure;
2983}
2984
2985#############################################################################
2986
2987package CFClient::UI::Inventory;
2988
2989our @ISA = CFClient::UI::ScrolledWindow::;
2990
2991sub new {
2992 my $class = shift;
2993
2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_,
2997 );
2998
2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3148
3149 $self->clear_command_list;
3150 $self->{recording} = 0;
3151 $self->{rec_btn}->set_text ("start recording");
3152
3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
3171
3172sub update_binding_widgets {
3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
2229package CFClient::UI::Root; 3278package CFClient::UI::Root;
2230 3279
2231our @ISA = CFClient::UI::Container::; 3280our @ISA = CFClient::UI::Container::;
2232 3281
2233use CFClient::OpenGL; 3282use CFClient::OpenGL;
2234 3283
2235sub check_size { 3284sub new {
2236 my ($self) = @_; 3285 my $class = shift;
2237 3286
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2239} 3295}
2240 3296
2241sub size_request { 3297sub size_request {
2242 ($::WIDTH, $::HEIGHT) 3298 my ($self) = @_;
2243}
2244 3299
2245sub configure { 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
3315}
3316
3317sub size_allocate {
2246 my ($self, $x, $y, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2247 3319
2248 $self->SUPER::configure ($x, $y, $w, $h);
2249
2250 for my $child (@{$self->{children}}) { 3320 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3322
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3323 $X = $child->{force_x} if exists $child->{force_x};
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3324 $Y = $child->{force_y} if exists $child->{force_y};
3325
3326 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h};
3328
2255 $child->configure ($X, $Y, $W,$H); 3329 $child->configure ($X, $Y, $W, $H);
2256 } 3330 }
2257} 3331}
2258 3332
2259sub _topleft { 3333sub coord2local {
2260 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2261 3335
2262 ($x, $y) 3336 ($x, $y)
2263} 3337}
2264 3338
3339sub coord2global {
3340 my ($self, $x, $y) = @_;
3341
3342 ($x, $y)
3343}
3344
2265sub update { 3345sub update {
2266 my ($self) = @_; 3346 my ($self) = @_;
2267 3347
2268 $self->check_size; 3348 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3349}
2271 3350
2272sub add { 3351sub add {
2273 my ($self, $child) = @_; 3352 my ($self, @children) = @_;
2274 3353
2275 # integerize window positions 3354 $_->{is_toplevel} = 1
2276 $child->{x} = int $child->{x}; 3355 for @children;
2277 $child->{y} = int $child->{y};
2278 3356
2279 $self->SUPER::add ($child); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2280} 3373}
2281 3374
2282sub on_refresh { 3375sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2284 3377
2285 $self->{refresh_hook}{$id} = $cb; 3378 $self->{refresh_hook}{$id} = $cb;
2286} 3379}
2287 3380
3381sub on_post_alloc {
3382 my ($self, $id, $cb) = @_;
3383
3384 $self->{post_alloc_hook}{$id} = $cb;
3385}
3386
2288sub draw { 3387sub draw {
2289 my ($self) = @_; 3388 my ($self) = @_;
2290 3389
2291 while (my $rcb = delete $self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3391 $_->()
3392 for values %{delete $self->{refresh_hook}};
2293 } 3393 }
3394
3395 if ($self->{realloc}) {
3396 my %queue;
3397 my @queue;
3398 my $widget;
3399
3400 outer:
3401 while () {
3402 if (my $realloc = delete $self->{realloc}) {
3403 for $widget (values %$realloc) {
3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
3410 }
3411
3412 while () {
3413 @queue or last outer;
3414
3415 $widget = pop @{ $queue[-1] || [] }
3416 and last;
3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
3433 $widget->{req_w} = $w;
3434 $widget->{req_h} = $h;
3435
3436 $self->{size_alloc}{$widget+0} = $widget;
3437
3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
3445 }
3446
3447 delete $self->{realloc}{$widget+0};
3448 }
3449 }
3450
3451 while (my $size_alloc = delete $self->{size_alloc}) {
3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3459
3460 $w = 0 if $w < 0;
3461 $h = 0 if $h < 0;
3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3470 $widget->{w} = $w;
3471 $widget->{h} = $h;
3472
3473 $widget->emit (size_allocate => $w, $h);
3474 }
3475 }
3476 }
3477
3478 while ($self->{post_alloc_hook}) {
3479 $_->()
3480 for values %{delete $self->{post_alloc_hook}};
3481 }
3482
2294 3483
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2298 3487
2299 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3489 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3492 glLoadIdentity;
2304 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
2305 $self->_draw; 3501 $self->_draw;
2306} 3502}
2307 3503
2308############################################################################# 3504#############################################################################
2309 3505
2310package CFClient::UI; 3506package CFClient::UI;
2311 3507
2312$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3510
23151 35111
2316 3512

Diff Legend

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