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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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