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.170 by root, Mon Apr 24 11:45:17 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->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 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
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 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
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 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};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 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
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
375sub children {
376}
377
241sub set_max_size { 378sub set_max_size {
242 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
243 380
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 383}
247 384
248# return top left coordinates 385sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
251 387
252 $self->{parent} 388 $tooltip =~ s/^\s+//;
253 or Carp::confess "no parent widget in _topleft\n";#d# 389 $tooltip =~ s/\s+$//;
254 390
255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
256} 399}
257 400
258# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
259sub coord2local { 402sub coord2local {
260 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
261 404
262 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 406}
265 407
266# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
267sub coord2global { 409sub coord2global {
268 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
269 411
270 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 413}
273 414
274sub focus_in { 415sub focus_in {
275 my ($self) = @_; 416 my ($self) = @_;
276 417
277 return if $FOCUS == $self; 418 return if $FOCUS == $self;
278 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
279 420
280 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
281 422
282 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
283 424
284 $focus->update if $focus; 425 $focus->update if $focus;
285 $FOCUS->update; 426 $FOCUS->update;
286} 427}
287 428
… …
290 431
291 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
292 433
293 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
294 435
295 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
296 437
297 $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;
298} 442}
299 443
300sub mouse_motion { } 444sub mouse_motion { }
301sub button_up { } 445sub button_up { }
302sub key_down { } 446sub key_down { }
303sub key_up { } 447sub key_up { }
304 448
305sub button_down { 449sub button_down {
306 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
307 451
308 $self->focus_in; 452 $self->focus_in;
309} 453}
310 454
311sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
312sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
313sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
314sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
315sub 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
316 528
317sub draw { 529sub draw {
318 my ($self) = @_; 530 my ($self) = @_;
319 531
320 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);
321 543
322 glPushMatrix; 544 glPushMatrix;
323 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
324 $self->_draw; 546 $self->_draw;
325 glPopMatrix; 547 glPopMatrix;
… …
337 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
338 glEnd; 560 glEnd;
339 glDisable GL_BLEND; 561 glDisable GL_BLEND;
340 } 562 }
341 563
342 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
343 glPushMatrix; 565 glPushMatrix;
344 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0; 569 glVertex 0 , 0;
348 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
349 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
350 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
351 glEnd; 573 glEnd;
352 glPopMatrix; 574 glPopMatrix;
353 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;
354 } 576 }
355} 577}
356 578
357sub _draw { 579sub _draw {
358 my ($self) = @_; 580 my ($self) = @_;
359 581
360 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
361} 583}
362 584
363sub find_widget {
364 my ($self, $x, $y) = @_;
365
366 return () unless $self->{can_events};
367
368 return $self
369 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
370 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
371
372 ()
373}
374
375sub set_parent {
376 my ($self, $parent) = @_;
377
378 Scalar::Util::weaken ($self->{parent} = $parent);
379}
380
381sub check_size {
382 my ($self) = @_;
383
384 $self->{parent}
385 or return 1;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405}
406
407sub update {
408 my ($self) = @_;
409
410 $self->{parent}->update
411 if $self->{parent};
412}
413
414sub connect {
415 my ($self, $signal, $cb) = @_;
416
417 push @{ $self->{signal_cb}{$signal} }, $cb;
418}
419
420sub emit {
421 my ($self, $signal, @args) = @_;
422
423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
424}
425
426sub DESTROY { 585sub DESTROY {
427 my ($self) = @_; 586 my ($self) = @_;
428 587
588 delete $WIDGET{$self+0};
429 #$self->deactivate; 589 #$self->deactivate;
430} 590}
431 591
432############################################################################# 592#############################################################################
433 593
… …
442 my $class = shift; 602 my $class = shift;
443 603
444 # range [value, low, high, page] 604 # range [value, low, high, page]
445 605
446 $class->SUPER::new ( 606 $class->SUPER::new (
447 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
448 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
449 @_ 609 @_
450 ) 610 )
451} 611}
452 612
453sub _draw { 613sub _draw {
454 my ($self) = @_; 614 my ($self) = @_;
455 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
456 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
457 622
458 glEnable GL_BLEND; 623 glEnable GL_BLEND;
459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
461 626
462 glBegin GL_QUADS; 627 glBegin GL_QUADS;
463 glVertex 0 , 0; 628 glVertex 0 , 0;
464 glVertex 0 , $h; 629 glVertex 0 , $h;
465 glVertex $w, $h; 630 glVertex $w, $h;
466 glVertex $w, 0; 631 glVertex $w, 0;
467 glEnd; 632 glEnd;
468 633
469 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
470} 636}
471 637
472############################################################################# 638#############################################################################
473 639
474package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
479 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
480 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
481} 647}
482 648
483sub size_request { 649sub size_request {
484 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
485} 653}
486 654
487sub draw { } 655sub draw { }
488 656
489############################################################################# 657#############################################################################
… …
506 674
507 $self 675 $self
508} 676}
509 677
510sub add { 678sub add {
511 my ($self, $child) = @_; 679 my ($self, @widgets) = @_;
512 680
513 $child->set_parent ($self); 681 $_->set_parent ($self)
682 for @widgets;
514 683
515 use sort 'stable'; 684 use sort 'stable';
516 685
517 $self->{children} = [ 686 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 688 @{$self->{children}}, @widgets
520 ]; 689 ];
521 690
522 $child->check_size; 691 $self->realloc;
692}
693
694sub children {
695 @{ $_[0]{children} }
523} 696}
524 697
525sub remove { 698sub remove {
526 my ($self, $child) = @_; 699 my ($self, $child) = @_;
527 700
528 delete $child->{parent}; 701 delete $child->{parent};
529 $child->hide; 702 $child->hide;
530 703
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 705
533 $self->check_size; 706 $self->realloc;
534 $self->update;
535} 707}
536 708
537sub clear { 709sub clear {
538 my ($self) = @_; 710 my ($self) = @_;
539 711
… …
542 714
543 for (@$children) { 715 for (@$children) {
544 delete $_->{parent}; 716 delete $_->{parent};
545 $_->hide; 717 $_->hide;
546 } 718 }
719
720 $self->realloc;
547} 721}
548 722
549sub find_widget { 723sub find_widget {
550 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
551 725
… …
626} 800}
627 801
628sub update { 802sub update {
629 my ($self) = @_; 803 my ($self) = @_;
630 804
631 # we want to do this delayed... 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 806 $self->SUPER::update;
634}
635
636sub render_chld {
637 my ($self) = @_;
638
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1;
641 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw;
643 };
644} 807}
645 808
646sub size_allocate { 809sub size_allocate {
647 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
648 811
649 $self->child->configure (0, 0, $w, $h); 812 $self->SUPER::size_allocate ($w, $h);
813 $self->update;
814}
650 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
651 $self->render_chld; 836 $self->_render;
837 };
652} 838}
653 839
654sub _draw { 840sub _draw {
655 my ($self) = @_; 841 my ($self) = @_;
656 842
657 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
658 844
659 my $tex = $self->{texture} 845 my $tex = $self->{texture}
660 or return; 846 or return;
661 847
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
665 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;
666 851
667 $tex->draw_quad (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 853
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
671} 855}
672 856
673############################################################################# 857#############################################################################
674 858
675package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
676 860
677our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
678
679sub new { die }
680
681sub size_request {
682 my ($self) = @_;
683
684 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
686
687 @$self{qw(child_w child_h)}
688}
689
690sub _draw {
691 my ($self) = @_;
692
693 $self->{children}[1]->draw;
694}
695
696
697#############################################################################
698
699package CFClient::UI::Frame;
700
701our @ISA = CFClient::UI::Bin::;
702
703use CFClient::OpenGL;
704 862
705sub new { 863sub new {
706 my $class = shift; 864 my $class = shift;
707 865
708 my $self = $class->SUPER::new ( 866 $class->SUPER::new (
709 bg => [1, 1, 1, 1], 867 scroll_x => 0,
710 border_bg => [1, 1, 1, 1], 868 scroll_y => 1,
711 border => 0.8,
712 @_ 869 @_,
713 ); 870 )
714
715 $self
716} 871}
717 872
718sub _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 {
719 my ($self) = @_; 885 my ($self, $w, $h) = @_;
720 886
721 my ($w, $h) = ($self->{w}, $self->{h}); 887 my $child = $self->child;
722 888
723 glEnable GL_BLEND; 889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
725 glEnable GL_TEXTURE_2D;
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 891
728# glBegin GL_QUADS; 892 $self->child->configure (0, 0, $w, $h);
729# glColor 0, 0, 0, 0; 893 $self->update;
730# glVertex 0 , 0; 894}
731# glVertex 0 , $h;
732# glVertex $w, $h;
733# glVertex $w, 0;
734# glEnd;
735 895
896sub set_offset {
897 my ($self, $x, $y) = @_;
736 898
737 $self->child->draw; 899 $self->{view_x} = int $x;
738 glDisable GL_BLEND; 900 $self->{view_y} = int $y;
739 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;
740} 942}
741 943
742############################################################################# 944#############################################################################
743 945
744package CFClient::UI::FancyFrame; 946package CFClient::UI::ScrolledWindow;
745 947
746our @ISA = CFClient::UI::Bin::; 948our @ISA = CFClient::UI::HBox::;
747
748use CFClient::OpenGL;
749
750my @tex =
751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
752 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
753 949
754sub new { 950sub new {
755 my $class = shift; 951 my $class = shift;
756 952
757 # 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;
758 1056
759 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
762 border => 0.8, 1060 border => 0.6,
763 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
764 @_ 1064 @_
765 ); 1065 );
766 1066
767 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 1068 align => 0,
769 valign => 1, 1069 valign => 1,
770 text => $self->{title}, 1070 text => $self->{title},
771 fontsize => 1; 1071 fontsize => $self->{border};
772 1072
773 $self 1073 $self
774} 1074}
775 1075
776sub border { 1076sub border {
… …
792 my ($self, $w, $h) = @_; 1092 my ($self, $w, $h) = @_;
793 1093
794 $h -= List::Util::max 0, $self->border * 2; 1094 $h -= List::Util::max 0, $self->border * 2;
795 $w -= List::Util::max 0, $self->border * 2; 1095 $w -= List::Util::max 0, $self->border * 2;
796 1096
797 $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)
798 if $self->{title}; 1098 if $self->{title};
799 1099
800 $self->child->configure ($self->border, $self->border, $w, $h); 1100 $self->child->configure ($self->border, $self->border, $w, $h);
801} 1101}
802 1102
803sub button_down { 1103sub button_down {
804 my ($self, $ev, $x, $y) = @_; 1104 my ($self, $ev, $x, $y) = @_;
805 1105
1106 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 1107 my $border = $self->border;
807 1108
808 if ($x < $self->{w} && $x >= $self->{w} - $border 1109 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 1110 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 1111
1112 if ($lr & $td) {
1113 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 1115 my ($bw, $bh) = ($self->{w}, $self->{h});
813 1116
1117 my $mx = $x < $border;
1118 my $my = $y < $border;
1119
814 $self->{motion} = sub { 1120 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
816 1122
817 ($x, $y) = ($ev->{x}, $ev->{y}); 1123 my $dx = $ev->{x} - $ox;
1124 my $dy = $ev->{y} - $oy;
818 1125
819 $self->{user_w} = $bw + $x - $ox; 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
821 $self->check_size; 1128
1129 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
822 }; 1131 };
823 1132
824 } elsif ($x >= 0 && $x < $self->{w} 1133 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
829 1136
830 $self->{motion} = sub { 1137 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
832 1139
833 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
834 1141
835 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
836 $self->update;
837 }; 1143 };
838 } 1144 }
839} 1145}
840 1146
841sub button_up { 1147sub button_up {
… …
854 my ($self) = @_; 1160 my ($self) = @_;
855 1161
856 my ($w, $h ) = ($self->{w}, $self->{h}); 1162 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 1164
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1165 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 1167
864 my $border = $self->border; 1168 my $border = $self->border;
865 1169
866 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
871 1175
872 my $bg = $tex[0]; 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1177 glColor @{ $self->{bg} };
873 1178
874 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1180 # solve this better(?)
876 my $rep_y = $ch / $bg->{h}; 1181 $bg->{s} = $cw / $bg->{w};
877 1182 $bg->{t} = $ch / $bg->{h};
878 glColor @{ $self->{bg} };
879
880 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 }
884 1185
885 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 1187
888 $self->{title}->draw if $self->{title}; 1188 $self->{title}->draw if $self->{title};
1189
889 $self->child->draw; 1190 $self->child->draw;
890} 1191}
891 1192
892############################################################################# 1193#############################################################################
893 1194
… …
902sub new { 1203sub new {
903 my $class = shift; 1204 my $class = shift;
904 1205
905 $class->SUPER::new ( 1206 $class->SUPER::new (
906 col_expand => [], 1207 col_expand => [],
907 @_ 1208 @_,
908 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
909} 1214}
910 1215
911sub add { 1216sub add {
912 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
913 1218
914 $child->set_parent ($self); 1219 $child->set_parent ($self);
915 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
916 1221
917 $child->check_size; 1222 $self->realloc;
918} 1223}
919 1224
920# 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?
921sub clear { 1226sub clear {
922 my ($self) = @_; 1227 my ($self) = @_;
923 1228
924 my $children = delete $self->{children}; 1229 my @children = $self->children;
1230 delete $self->{children};
925 1231
926 for (grep $_, map @$_, grep $_, @$children) { 1232 for (@children) {
927 delete $_->{parent}; 1233 delete $_->{parent};
928 $_->hide; 1234 $_->hide;
929 } 1235 }
930 1236
931 $self->update; 1237 $self->realloc;
932} 1238}
933 1239
934sub get_wh { 1240sub get_wh {
935 my ($self) = @_; 1241 my ($self) = @_;
936 1242
… …
967sub size_allocate { 1273sub size_allocate {
968 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
969 1275
970 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
971 1277
972 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
973 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
974 1280
975 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
976 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
977 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
978 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1032 } 1338 }
1033} 1339}
1034 1340
1035############################################################################# 1341#############################################################################
1036 1342
1037package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1038
1039# TODO: wrap into common Box base class
1040 1344
1041our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1042 1346
1043sub size_request { 1347sub size_request {
1044 my ($self) = @_; 1348 my ($self) = @_;
1045 1349
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1047 1351 ? (
1048 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1049 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1050 (List::Util::max map $_->[1], @alloc), 1354 )
1051 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1052} 1359}
1053 1360
1054sub size_allocate { 1361sub size_allocate {
1055 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1056 1363
1057 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1058
1059 my $children = $self->{children}; 1365 my $children = $self->{children};
1060 1366
1061 my @h = map $_->{req_w}, @$children; 1367 my @req;
1062 1368
1063 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1064 1370 @req = ($space / (@$children || 1)) x @$children;
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } 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 {
1069 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1070 $exp ||= 1;
1071 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1072 for (0 .. $#$children) { 1384 for 0 .. $#$children;
1073 my $child = $children->[$_];
1074
1075 my $alloc_h = $h[$_];
1076 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1077 $h[$_] = $alloc_h;
1078 } 1385 }
1079 } 1386 }
1080 1387
1081 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1082 1389
1083 my $y = 0; 1390 my $pos = 0;
1084 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1085 my $child = $children->[$_];
1086 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1087 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1088 1394
1089 $y += $h; 1395 $pos += $alloc;
1090 } 1396 }
1091 1397
1092 1 1398 1
1093} 1399}
1094 1400
1095############################################################################# 1401#############################################################################
1096 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
1097package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1098 1419
1099# TODO: wrap into common Box base class
1100
1101our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1102 1421
1103sub size_request { 1422sub new {
1104 my ($self) = @_; 1423 my $class = shift;
1105 1424
1106 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1107 1426 vertical => 1,
1108 ( 1427 @_,
1109 (List::Util::max map $_->[0], @alloc),
1110 (List::Util::sum map $_->[1], @alloc),
1111 ) 1428 )
1112} 1429}
1113 1430
1114sub size_allocate {
1115 my ($self, $w, $h) = @_;
1116
1117 my $children = $self->{children};
1118
1119 my @h = map $_->{req_h}, @$children;
1120
1121 my $req_h = List::Util::sum @h;
1122
1123 if ($req_h > $h) {
1124 # ah well, not enough space
1125 $_ *= $h / $req_h for @h;
1126 } else {
1127 my $exp = List::Util::sum map $_->{expand}, @$children;
1128 $exp ||= 1;
1129
1130 for (0 .. $#$children) {
1131 my $child = $children->[$_];
1132
1133 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1134 }
1135 }
1136
1137 CFClient::UI::harmonize \@h;
1138
1139 my $y = 0;
1140 for (0 .. $#$children) {
1141 my $child = $children->[$_];
1142 my $h = $h[$_];
1143 $child->configure (0, $y, $w, $h);
1144
1145 $y += $h;
1146 }
1147
1148 1
1149}
1150
1151############################################################################# 1431#############################################################################
1152 1432
1153package CFClient::UI::Label; 1433package CFClient::UI::Label;
1154 1434
1155our @ISA = CFClient::UI::Base::; 1435our @ISA = CFClient::UI::DrawBG::;
1156 1436
1157use CFClient::OpenGL; 1437use CFClient::OpenGL;
1158 1438
1159sub new { 1439sub new {
1160 my ($class, %arg) = @_; 1440 my ($class, %arg) = @_;
1161 1441
1162 my $self = $class->SUPER::new ( 1442 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1444 #bg => none
1445 #active_bg => none
1164 #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),
1165 fontsize => 1, 1452 fontsize => 1,
1166 text => "",
1167 align => -1, 1453 align => -1,
1168 valign => -1, 1454 valign => -1,
1169 padding => 2, 1455 padding_x => 2,
1170 layout => new CFClient::Layout, 1456 padding_y => 2,
1171 can_events => 0, 1457 can_events => 0,
1172 %arg 1458 %arg
1173 ); 1459 );
1174 1460
1175 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1462 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1463 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1464 $self->{template} = $layout;
1179 } 1465 }
1180 1466
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1467 if (exists $self->{markup}) {
1182 $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 }
1183 1472
1184 $self 1473 $self
1185} 1474}
1186 1475
1187sub escape { 1476sub escape($) {
1188 local $_ = $_[1]; 1477 local $_ = $_[0];
1189 1478
1190 s/&/&amp;/g; 1479 s/&/&amp;/g;
1191 s/>/&gt;/g; 1480 s/>/&gt;/g;
1192 s/</&lt;/g; 1481 s/</&lt;/g;
1193 1482
1194 $_[1] 1483 $_
1484}
1485
1486sub update {
1487 my ($self) = @_;
1488
1489 delete $self->{texture};
1490 $self->SUPER::update;
1195} 1491}
1196 1492
1197sub set_text { 1493sub set_text {
1198 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1199 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;
1200 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1201 1501
1202 delete $self->{texture}; 1502 $self->realloc;
1203 $self->check_size;
1204 $self->update; 1503 $self->update;
1205} 1504}
1206 1505
1207sub set_markup { 1506sub set_markup {
1208 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1209 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;
1210 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1211 1516
1212 delete $self->{texture}; 1517 $self->realloc;
1213 $self->check_size;
1214 $self->update; 1518 $self->update;
1215} 1519}
1216 1520
1217sub size_request { 1521sub size_request {
1218 my ($self) = @_; 1522 my ($self) = @_;
1219 1523
1220 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $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});
1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223 1529
1224 my ($w, $h) = $self->{layout}->size; 1530 my ($w, $h) = $self->{layout}->size;
1225 1531
1226 if (exists $self->{template}) { 1532 if (exists $self->{template}) {
… …
1231 1537
1232 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1233 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1234 } 1540 }
1235 1541
1236 ( 1542 ($w, $h)
1237 $w + $self->{padding} * 2,
1238 $h + $self->{padding} * 2,
1239 )
1240} 1543}
1241 1544
1242sub size_allocate { 1545sub size_allocate {
1243 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1244 1547
1245 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1246} 1550}
1247 1551
1248sub set_fontsize { 1552sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1250 1554
1251 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1556 delete $self->{texture};
1253 $self->check_size; 1557
1254 $self->update; 1558 $self->realloc;
1255} 1559}
1256 1560
1257sub _draw { 1561sub _draw {
1258 my ($self) = @_; 1562 my ($self) = @_;
1259 1563
1564 $self->SUPER::_draw; # draw background, if applicable
1565
1260 my $tex = $self->{texture} ||= do { 1566 my $tex = $self->{texture} ||= do {
1567 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1568 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573
1264 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
1265 }; 1585 };
1266 1586
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1587 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1589
1590 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1591 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $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 }
1287 1596
1288 glDisable GL_TEXTURE_2D; 1597 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1598}
1291 1599
1292############################################################################# 1600#############################################################################
1293 1601
1294package CFClient::UI::EntryBase; 1602package CFClient::UI::EntryBase;
… …
1307 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1308 can_hover => 1, 1616 can_hover => 1,
1309 can_focus => 1, 1617 can_focus => 1,
1310 valign => 0, 1618 valign => 0,
1311 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1312 @_ 1621 @_
1313 ) 1622 )
1314} 1623}
1315 1624
1316sub _set_text { 1625sub _set_text {
… …
1326 $self->{text} = $text; 1635 $self->{text} = $text;
1327 1636
1328 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1329 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1330 1639
1331 $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;
1332} 1650}
1333 1651
1334sub get_text { 1652sub get_text {
1335 $_[0]{text} 1653 $_[0]{text}
1336} 1654}
… …
1339 my ($self) = @_; 1657 my ($self) = @_;
1340 1658
1341 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1342 1660
1343 ($w + 1, $h) # add 1 for cursor 1661 ($w + 1, $h) # add 1 for cursor
1344}
1345
1346sub size_allocate {
1347 my ($self, $w, $h) = @_;
1348
1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
1358} 1662}
1359 1663
1360sub key_down { 1664sub key_down {
1361 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1362 1666
… …
1364 my $sym = $ev->{sym}; 1668 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1669 my $uni = $ev->{unicode};
1366 1670
1367 my $text = $self->get_text; 1671 my $text = $self->get_text;
1368 1672
1369 if ($sym == 8) { 1673 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1674 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1675 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1676 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1677 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1678 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1679 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1680 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1685 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1686 $self->_emit ('escape');
1383 } elsif ($uni) { 1687 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1689 }
1386 1690
1387 $self->_set_text ($text); 1691 $self->_set_text ($text);
1388 $self->update; 1692
1693 $self->realloc;
1389} 1694}
1390 1695
1391sub focus_in { 1696sub focus_in {
1392 my ($self) = @_; 1697 my ($self) = @_;
1393 1698
… …
1473 if ($sym == 13) { 1778 if ($sym == 13) {
1474 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1475 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1478 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1479 $self->update; 1784 $self->update;
1480 1785
1481 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1520 1825
1521sub new { 1826sub new {
1522 my $class = shift; 1827 my $class = shift;
1523 1828
1524 $class->SUPER::new ( 1829 $class->SUPER::new (
1525 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1526 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1527 bg => [1, 1, 1, 0.2],
1528 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1529 can_hover => 1, 1834 can_hover => 1,
1530 align => 0, 1835 align => 0,
1531 valign => 0, 1836 valign => 0,
1532 can_events => 1, 1837 can_events => 1,
1533 @_ 1838 @_
1534 ) 1839 )
1535} 1840}
1536 1841
1842sub activate { }
1843
1537sub button_up { 1844sub button_up {
1538 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1539 1846
1847 $self->emit ("activate")
1540 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1541 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1542 $self->emit ("activate");
1543 }
1544} 1850}
1545 1851
1546sub _draw { 1852sub _draw {
1547 my ($self) = @_; 1853 my ($self) = @_;
1548 1854
… …
1550 1856
1551 if ($GRAB == $self) { 1857 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1858 $self->{fg} = $self->{active_fg};
1553 } 1859 }
1554 1860
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1861 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1863 glColor 0, 0, 0, 1;
1560 1864
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1865 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1866
1563 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1868
1566 $self->SUPER::_draw; 1869 $self->SUPER::_draw;
1567} 1870}
1568 1871
1569############################################################################# 1872#############################################################################
… …
1580 1883
1581sub new { 1884sub new {
1582 my $class = shift; 1885 my $class = shift;
1583 1886
1584 $class->SUPER::new ( 1887 $class->SUPER::new (
1585 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1586 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1587 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],
1588 state => 0, 1894 state => 0,
1589 can_hover => 1, 1895 can_hover => 1,
1590 @_ 1896 @_
1591 ) 1897 )
1592} 1898}
1593 1899
1594sub size_request { 1900sub size_request {
1595 my ($self) = @_; 1901 my ($self) = @_;
1596 1902
1597 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1598} 1904}
1599 1905
1600sub button_down { 1906sub button_down {
1601 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1602 1908
1603 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1604 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1605 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1606 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1607 } 1913 }
1608} 1914}
1609 1915
1610sub _draw { 1916sub _draw {
1611 my ($self) = @_; 1917 my ($self) = @_;
1612 1918
1613 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1614 1920
1615 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1616 1922
1617 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;
1618 1926
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1928
1621 glEnable GL_BLEND; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1930
1622 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1932 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1933 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1934}
1632 1935
1633############################################################################# 1936#############################################################################
1634 1937
1635package CFClient::UI::Image; 1938package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1981 glTranslate 0, -$self->{w}, 0;
1679 1982
1680 ($w, $h) = ($h, $w); 1983 ($w, $h) = ($h, $w);
1681 } 1984 }
1682 1985
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1986 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1988
1688 $tex->draw_quad (0, 0, $w, $h); 1989 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1990
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1692} 1992}
1693 1993
1694############################################################################# 1994#############################################################################
1695 1995
… …
1743} 2043}
1744 2044
1745sub set_max { 2045sub set_max {
1746 my ($self, $max) = @_; 2046 my ($self, $max) = @_;
1747 2047
2048 return if $self->{max_val} == $max;
2049
1748 $self->{max_val} = $max; 2050 $self->{max_val} = $max;
2051 $self->update;
1749} 2052}
1750 2053
1751sub set_value { 2054sub set_value {
1752 my ($self, $val, $max) = @_; 2055 my ($self, $val, $max) = @_;
1753 2056
1754 $self->set_max ($max) 2057 $self->set_max ($max)
1755 if defined $max; 2058 if defined $max;
1756 2059
1757 $max = $self->{max_val}; 2060 return if $self->{val} == $val;
2061
1758 $self->{val} = $val; 2062 $self->{val} = $val;
1759
1760 $self->update; 2063 $self->update;
1761} 2064}
1762 2065
1763sub _draw { 2066sub _draw {
1764 my ($self) = @_; 2067 my ($self) = @_;
… …
1827 2130
1828sub new { 2131sub new {
1829 my ($class, %arg) = @_; 2132 my ($class, %arg) = @_;
1830 2133
1831 my $self = $class->SUPER::new ( 2134 my $self = $class->SUPER::new (
1832 tooltip => $arg{type}, 2135 tooltip => $arg{type},
1833 can_hover => 1, 2136 can_hover => 1,
2137 can_events => 1,
1834 %arg, 2138 %arg,
1835 ); 2139 );
1836 2140
1837 $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");
1838 $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);
… …
1846 2150
1847 $self->{value}->set_fontsize ($fsize); 2151 $self->{value}->set_fontsize ($fsize);
1848 $self->{max} ->set_fontsize ($fsize); 2152 $self->{max} ->set_fontsize ($fsize);
1849} 2153}
1850 2154
2155sub set_max {
2156 my ($self, $max) = @_;
2157
2158 $self->{gauge}->set_max ($max);
2159 $self->{max}->set_text ($max);
2160}
2161
1851sub set_value { 2162sub set_value {
1852 my ($self, $val, $max) = @_; 2163 my ($self, $val, $max) = @_;
1853 2164
1854 $self->set_max ($max) 2165 $self->set_max ($max)
1855 if defined $max; 2166 if defined $max;
1856 2167
1857 $self->{gauge}->set_value ($val, $max); 2168 $self->{gauge}->set_value ($val, $max);
1858 $self->{value}->set_text ($val); 2169 $self->{value}->set_text ($val);
1859}
1860
1861sub set_max {
1862 my ($self, $max) = @_;
1863
1864 $self->{gauge}->set_max ($max);
1865 $self->{max}->set_text ($max);
1866} 2170}
1867 2171
1868############################################################################# 2172#############################################################################
1869 2173
1870package CFClient::UI::Slider; 2174package CFClient::UI::Slider;
… …
1880 qw(s1_slider.png s1_slider_bg.png); 2184 qw(s1_slider.png s1_slider_bg.png);
1881 2185
1882sub new { 2186sub new {
1883 my $class = shift; 2187 my $class = shift;
1884 2188
1885 # range [value, low, high, page] 2189 # range [value, low, high, page, unit]
1886 2190
1887 # TODO: 0-width page 2191 # TODO: 0-width page
1888 # TODO: req_w/h are wrong with vertical 2192 # TODO: req_w/h are wrong with vertical
1889 # TODO: calculations are off 2193 # TODO: calculations are off
1890 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
1891 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
1892 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],
1893 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
1894 req_w => 20, 2200 min_w => $::WIDTH / 80,
1895 req_h => 20, 2201 min_h => $::WIDTH / 80,
1896 vertical => 0, 2202 vertical => 0,
1897 can_hover => 1, 2203 can_hover => 1,
1898 inner_pad => 5, 2204 inner_pad => 0.02,
1899 @_ 2205 @_
1900 ); 2206 );
1901 2207
2208 $self->set_value ($self->{range}[0]);
2209 $self->update;
2210
1902 $self 2211 $self
1903} 2212}
1904 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
1905sub size_request { 2248sub size_request {
1906 my ($self) = @_; 2249 my ($self) = @_;
1907 2250
1908 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
1909 my $h = $self->{req_h};
1910
1911 $self->{vertical} ? ($h, $w) : ($w, $h)
1912} 2252}
1913 2253
1914sub button_down { 2254sub button_down {
1915 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
1916 2256
1917 $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
1918 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
1919} 2262}
1920 2263
1921sub mouse_motion { 2264sub mouse_motion {
1922 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
1923 2266
1924 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
1925 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
1926 2286
1927 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1928 2288
1929 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2289 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1930 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1931 2291
1932 $x -= $inner_pad_px; # substract the padding 2292 $value = ($value - $lo) / $range;
1933 $x = $x * ($hi - $lo) / $inner_w + $lo; 2293 $value = $value * $self->{scale} + $self->{offset};
1934 $x = $lo if $x < $lo;
1935 $x = $hi - $page if $x > $hi - $page;
1936 $self->{range}[0] = $x;
1937 2294
1938 $self->emit (changed => $x); 2295 $self->{knob_x} = $value - $knob_w * 0.5;
1939 $self->update; 2296 $self->{knob_w} = $knob_w;
1940 } 2297 });
1941}
1942 2298
1943# the inner_* stuff is for generating a padding for the slider handle, 2299 $self->SUPER::update;
1944# so that the handle doesn't leave the texture. This calculation isn't 100%
1945# correct propably, but it does the job for now
1946sub _calc_inner_pad_px {
1947 my ($self, $w) = @_;
1948 ($w / 100) * $self->{inner_pad} # % to pixels
1949} 2300}
1950 2301
1951sub _draw { 2302sub _draw {
1952 my ($self) = @_; 2303 my ($self) = @_;
1953 2304
1954 $self->SUPER::_draw (); 2305 $self->SUPER::_draw ();
1955 2306
1956 my ($w, $h) = @$self{qw(w h)}; 2307 glScale $self->{w}, $self->{h};
1957 2308
1958 if ($self->{vertical}) { 2309 if ($self->{vertical}) {
1959 # draw a vertical slider like a rotated horizontal slider 2310 # draw a vertical slider like a rotated horizontal slider
1960 2311
2312 glTranslate 1, 0, 0;
1961 glRotate 90, 0, 0, 1; 2313 glRotate 90, 0, 0, 1;
1962 glTranslate 0, -$self->{w}, 0;
1963
1964 ($w, $h) = ($h, $w);
1965 } 2314 }
1966 2315
1967 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2316 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1968 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2317 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1969 2318
1970 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971
1972 $hi = $value + 1 if $lo == $hi;
1973
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976
1977 $page = int $page * $inner_w / ($hi - $lo);
1978 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1979
1980 $w -= $page;
1981 $page &= ~1;
1982 glTranslate $page * 0.5, 0, 0;
1983 $page ||= 2;
1984
1985 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1986 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1987
1988 glEnable GL_BLEND;
1989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1990 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
1991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1992 2321
1993 # draw background 2322 # draw background
1994 $tex[1]->draw_quad (0, 0, $w, $h); 2323 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1995 2324
1996 # draw handle 2325 # draw handle
1997 $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);
1998 2327
1999 glDisable GL_BLEND;
2000 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2001} 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 (@_) }
2002 2371
2003############################################################################# 2372#############################################################################
2004 2373
2005package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2006 2375
… …
2015 fontsize => 1, 2384 fontsize => 1,
2016 can_events => 0, 2385 can_events => 0,
2017 #font => default_font 2386 #font => default_font
2018 @_, 2387 @_,
2019 2388
2020 layout => (new CFClient::Layout), 2389 layout => (new CFClient::Layout 1),
2021 par => [], 2390 par => [],
2022 height => 0, 2391 height => 0,
2023 children => [ 2392 children => [
2024 (new CFClient::UI::Empty expand => 1), 2393 (new CFClient::UI::Empty expand => 1),
2025 (new CFClient::UI::Slider vertical => 1), 2394 (new CFClient::UI::Slider vertical => 1),
2026 ], 2395 ],
2027 ); 2396 );
2028 2397
2029 $self->{children}[1]->connect (changed => sub { 2398 $self->{children}[1]->connect (changed => sub { $self->update });
2030 $self->update;
2031 });
2032 2399
2033 $self 2400 $self
2034} 2401}
2035 2402
2036sub set_fontsize { 2403sub set_fontsize {
2037 my ($self, $fontsize) = @_; 2404 my ($self, $fontsize) = @_;
2038 2405
2039 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2040 $self->reflow; 2407 $self->reflow;
2041}
2042
2043sub text_height {
2044 my ($self, $text) = @_;
2045
2046 my $layout = $self->{layout};
2047
2048 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049 $layout->set_width ($self->{w});
2050 $layout->set_text ($text);
2051
2052 ($layout->size)[1]
2053}
2054
2055sub reflow {
2056 my ($self) = @_;
2057
2058 $self->{need_reflow}++;
2059 $self->update;
2060} 2408}
2061 2409
2062sub size_allocate { 2410sub size_allocate {
2063 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2064 2412
… …
2069 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2070 2418
2071 $self->reflow; 2419 $self->reflow;
2072} 2420}
2073 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
2074sub add_paragraph { 2456sub add_paragraph {
2075 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2076 2458
2077 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2078 2460 my ($w, $h) = $self->text_size ($line);
2079 my $height = $self->text_height ($text);
2080
2081 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2082 2464
2083 push @{$self->{par}}, [$height, $color, $text];
2084
2085 $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]);
2086 $self->{children}[1]->update;
2087} 2466}
2088 2467
2089sub update { 2468sub update {
2090 my ($self) = @_; 2469 my ($self) = @_;
2091 2470
… …
2093 2472
2094 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2095 2474
2096 delete $self->{texture}; 2475 delete $self->{texture};
2097 2476
2098 $ROOT->on_refresh ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2099 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2100 my $height = 0; 2481 my $height = 0;
2101 2482
2102 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2103 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 }
2104 2498
2105 $self->{height} = $height; 2499 $self->{height} = $height;
2106 2500
2107 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2108 2502
2109 delete $self->{texture}; 2503 delete $self->{texture};
2110 } 2504 }
2111 2505
2112 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2113 glClearColor 0, 0, 0, 1; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2114 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2115 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
2116 glEnable GL_BLEND; 2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2117 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2118 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120
2121 my $top = int $self->{children}[1]{range}[0];
2122
2123 my $y0 = $top;
2124 my $y1 = $top + $self->{h};
2125
2126 my $y = 0;
2127
2128 my $layout = $self->{layout};
2129
2130 $layout->set_font ($self->{font}) if $self->{font};
2131 2524
2132 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2133 my $h = $par->[0]; 2526 my $h = $par->[1];
2134 2527
2135 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]);
2136 $layout->set_text ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2137 2532
2138 glColor @{ $par->[1] }; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2139 my ($W, $H) = $layout->size; 2534
2140 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;
2141 } 2537 }
2142 2538
2143 $y += $h; 2539 $y += $h;
2144 } 2540 }
2145 2541
2146 glDisable GL_TEXTURE_2D;
2147 glDisable GL_BLEND; 2542 glDisable GL_BLEND;
2148 }; 2543 };
2149 }); 2544 });
2150} 2545}
2151 2546
2152sub _draw { 2547sub _draw {
2153 my ($self) = @_; 2548 my ($self) = @_;
2154 2549
2155 if ($self->{texture}) {
2156 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
2157 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;
2158 $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});
2159 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
2160 }
2161 2555
2162 $self->{children}[1]->draw; 2556 $self->{children}[1]->draw;
2163 2557
2164} 2558}
2165 2559
… …
2213 2607
2214sub new { 2608sub new {
2215 my $class = shift; 2609 my $class = shift;
2216 2610
2217 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2218 state => 0, 2612 state => 0,
2219 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2220 @_ 2614 @_
2221 ); 2615 );
2222 2616
2223 if ($self->{state}) {
2224 $self->{state} = 0;
2225 $self->toggle_flopper;
2226 }
2227
2228 $self 2617 $self
2229} 2618}
2230 2619
2231sub toggle_flopper { 2620sub toggle_flopper {
2232 my ($self) = @_; 2621 my ($self) = @_;
2233 2622
2234 # TODO: use animation 2623 $self->{other}->toggle_visibility;
2235 if ($self->{state} = !$self->{state}) {
2236 $CFClient::UI::ROOT->add ($self->{other});
2237 $self->{other}->move ($self->coord2global (0, $self->{h}));
2238 $self->emit ("open");
2239 } else {
2240 $CFClient::UI::ROOT->remove ($self->{other});
2241 $self->emit ("close");
2242 }
2243
2244 $self->emit (changed => $self->{state});
2245} 2624}
2246 2625
2247############################################################################# 2626#############################################################################
2248 2627
2249package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2259 @_, 2638 @_,
2260 can_events => 0, 2639 can_events => 0,
2261 ) 2640 )
2262} 2641}
2263 2642
2264sub set_markup { 2643sub set_tooltip_from {
2265 my ($self, $text) = @_; 2644 my ($self, $widget) = @_;
2266 2645
2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2646 my $tooltip = $widget->{tooltip};
2268 $self->{label}->set_markup ($text); 2647
2269 $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 );
2270} 2663}
2271 2664
2272sub size_request { 2665sub size_request {
2273 my ($self) = @_; 2666 my ($self) = @_;
2274
2275 $self->child->set_max_size ($::WIDTH * 0.3);
2276 2667
2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278 2669
2279 ($w + 4, $h + 4) 2670 ($w + 4, $h + 4)
2280} 2671}
… …
2283 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2284 2675
2285 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2286} 2677}
2287 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
2288sub _draw { 2697sub _draw {
2289 my ($self) = @_; 2698 my ($self) = @_;
2290 2699
2291 glPushMatrix;
2292 glTranslate 0.375, 0.375; 2700 glTranslate 0.375, 0.375;
2293 2701
2294 my ($w, $h) = @$self{qw(w h)}; 2702 my ($w, $h) = @$self{qw(w h)};
2295 2703
2296 glColor 1, 0.8, 0.4; 2704 glColor 1, 0.8, 0.4;
… …
2307 glVertex 0 , $h; 2715 glVertex 0 , $h;
2308 glVertex $w, $h; 2716 glVertex $w, $h;
2309 glVertex $w, 0; 2717 glVertex $w, 0;
2310 glEnd; 2718 glEnd;
2311 2719
2312 glPopMatrix; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2313 2721
2314 glTranslate 2, 2;
2315 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2316} 2723}
2317 2724
2318############################################################################# 2725#############################################################################
2319 2726
… …
2324use CFClient::OpenGL; 2731use CFClient::OpenGL;
2325 2732
2326sub new { 2733sub new {
2327 my $class = shift; 2734 my $class = shift;
2328 2735
2329 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2330 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2331 @_, 2739 @_,
2332 ) 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
2333} 2757}
2334 2758
2335sub size_request { 2759sub size_request {
2336 (32, 8) 2760 (32, 8)
2337} 2761}
2338 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2339sub draw { 2771sub _draw {
2340 my ($self) = @_; 2772 my ($self) = @_;
2341 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
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2343 2786
2344 if ($tex) { 2787 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 } 2793 }
2794}
2795
2796sub DESTROY {
2797 my ($self) = @_;
2798
2799 $self->{timer}->cancel
2800 if $self->{timer};
2801
2802 $self->SUPER::DESTROY;
2354} 2803}
2355 2804
2356############################################################################# 2805#############################################################################
2357 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
2358package CFClient::UI::Root; 3280package CFClient::UI::Root;
2359 3281
2360our @ISA = CFClient::UI::Container::; 3282our @ISA = CFClient::UI::Container::;
2361 3283
2362use CFClient::OpenGL; 3284use CFClient::OpenGL;
2363 3285
2364sub check_size { 3286sub new {
2365 my ($self) = @_; 3287 my $class = shift;
2366 3288
2367 $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
2368} 3297}
2369 3298
2370sub size_request { 3299sub size_request {
2371 ($::WIDTH, $::HEIGHT) 3300 my ($self) = @_;
2372}
2373 3301
2374sub 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 {
2375 my ($self, $x, $y, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2376 3321
2377 $self->SUPER::configure ($x, $y, $w, $h);
2378
2379 for my $child (@{$self->{children}}) { 3322 for my $child ($self->children) {
2380 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)};
2381 3324
2382 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3325 $X = $child->{force_x} if exists $child->{force_x};
2383 $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
2384 $child->configure ($X, $Y, $W,$H); 3331 $child->configure ($X, $Y, $W, $H);
2385 } 3332 }
2386} 3333}
2387 3334
2388sub _topleft { 3335sub coord2local {
2389 my ($self, $x, $y) = @_; 3336 my ($self, $x, $y) = @_;
2390 3337
2391 ($x, $y) 3338 ($x, $y)
2392} 3339}
2393 3340
3341sub coord2global {
3342 my ($self, $x, $y) = @_;
3343
3344 ($x, $y)
3345}
3346
2394sub update { 3347sub update {
2395 my ($self) = @_; 3348 my ($self) = @_;
2396 3349
2397 $self->check_size; 3350 $::WANT_REFRESH++;
2398 ::refresh ();
2399} 3351}
2400 3352
2401sub add { 3353sub add {
2402 my ($self, $child) = @_; 3354 my ($self, @children) = @_;
2403 3355
2404 # integerize window positions 3356 $_->{is_toplevel} = 1
2405 $child->{x} = int $child->{x}; 3357 for @children;
2406 $child->{y} = int $child->{y};
2407 3358
2408 $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 }
2409} 3375}
2410 3376
2411sub on_refresh { 3377sub on_refresh {
2412 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2413 3379
2414 $self->{refresh_hook}{$id} = $cb; 3380 $self->{refresh_hook}{$id} = $cb;
2415} 3381}
2416 3382
3383sub on_post_alloc {
3384 my ($self, $id, $cb) = @_;
3385
3386 $self->{post_alloc_hook}{$id} = $cb;
3387}
3388
2417sub draw { 3389sub draw {
2418 my ($self) = @_; 3390 my ($self) = @_;
2419 3391
2420 while (my $rcb = delete $self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2421 $_->() for values %$rcb; 3393 $_->()
3394 for values %{delete $self->{refresh_hook}};
2422 } 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
2423 3485
2424 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2425 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2426 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
2427 3489
2428 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
2429 glLoadIdentity; 3491 glLoadIdentity;
2430 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2431 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
2432 glLoadIdentity; 3494 glLoadIdentity;
2433 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
2434 $self->_draw; 3503 $self->_draw;
2435} 3504}
2436 3505
2437############################################################################# 3506#############################################################################
2438 3507
2439package CFClient::UI; 3508package CFClient::UI;
2440 3509
2441$ROOT = new CFClient::UI::Root; 3510$ROOT = new CFClient::UI::Root;
2442$TOOLTIP = new CFClient::UI::Tooltip; 3511$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2443 3512
24441 35131
2445 3514

Diff Legend

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