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.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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