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

Diff Legend

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