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

Diff Legend

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