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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

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

Diff Legend

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