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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

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

Diff Legend

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