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.173 by root, Tue Apr 25 10:30:48 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
241sub children { 375sub children {
376 # nop
242} 377}
243 378
244# call when resoltuion changes etc. 379sub visible_children {
245sub reconfigure { 380 $_[0]->children
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 381}
253 382
254sub set_max_size { 383sub set_max_size {
255 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
256 385
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 388}
260 389
261# return top left coordinates 390sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
264 392
265 $self->{parent} 393 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 394 $tooltip =~ s/\s+$//;
267 395
268 $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 }
269} 404}
270 405
271# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
272sub coord2local { 407sub coord2local {
273 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
274 409
275 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 411}
278 412
279# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
280sub coord2global { 414sub coord2global {
281 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
282 416
283 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 418}
286 419
287sub focus_in { 420sub focus_in {
288 my ($self) = @_; 421 my ($self) = @_;
289 422
290 return if $FOCUS == $self; 423 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
292 425
293 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
294 427
295 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
296 429
297 $focus->update if $focus; 430 $focus->update if $focus;
298 $FOCUS->update; 431 $FOCUS->update;
299} 432}
300 433
… …
303 436
304 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
305 438
306 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
307 440
308 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
309 442
310 $focus->update if $focus; #? 443 $focus->update if $focus; #?
311}
312 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
313sub mouse_motion { } 449sub mouse_motion { 0 }
314sub button_up { } 450sub button_up { 0 }
315sub key_down { } 451sub key_down { 0 }
316sub key_up { } 452sub key_up { 0 }
317 453
318sub button_down { 454sub button_down {
319 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
320 456
321 $self->focus_in; 457 $self->focus_in;
322}
323 458
324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
328sub 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
329 535
330sub draw { 536sub draw {
331 my ($self) = @_; 537 my ($self) = @_;
332 538
333 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);
334 550
335 glPushMatrix; 551 glPushMatrix;
336 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
337 $self->_draw; 553 $self->_draw;
338 glPopMatrix; 554 glPopMatrix;
… …
350 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
351 glEnd; 567 glEnd;
352 glDisable GL_BLEND; 568 glDisable GL_BLEND;
353 } 569 }
354 570
355 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
356 glPushMatrix; 572 glPushMatrix;
357 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 576 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
364 glEnd; 580 glEnd;
365 glPopMatrix; 581 glPopMatrix;
366 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;
367 } 583 }
368} 584}
369 585
370sub _draw { 586sub _draw {
371 my ($self) = @_; 587 my ($self) = @_;
372 588
373 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
374} 590}
375 591
376sub find_widget {
377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
385 ()
386}
387
388sub set_parent {
389 my ($self, $parent) = @_;
390
391 Scalar::Util::weaken ($self->{parent} = $parent);
392}
393
394sub check_size {
395 my ($self) = @_;
396
397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 592sub DESTROY {
440 my ($self) = @_; 593 my ($self) = @_;
441 594
595 delete $WIDGET{$self+0};
442 #$self->deactivate; 596 #$self->deactivate;
443} 597}
444 598
445############################################################################# 599#############################################################################
446 600
… …
455 my $class = shift; 609 my $class = shift;
456 610
457 # range [value, low, high, page] 611 # range [value, low, high, page]
458 612
459 $class->SUPER::new ( 613 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
462 @_ 616 @_
463 ) 617 )
464} 618}
465 619
466sub _draw { 620sub _draw {
467 my ($self) = @_; 621 my ($self) = @_;
468 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
470 629
471 glEnable GL_BLEND; 630 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
474 633
475 glBegin GL_QUADS; 634 glBegin GL_QUADS;
476 glVertex 0 , 0; 635 glVertex 0 , 0;
477 glVertex 0 , $h; 636 glVertex 0 , $h;
478 glVertex $w, $h; 637 glVertex $w, $h;
479 glVertex $w, 0; 638 glVertex $w, 0;
480 glEnd; 639 glEnd;
481 640
482 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
483} 643}
484 644
485############################################################################# 645#############################################################################
486 646
487package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
494} 654}
495 655
496sub size_request { 656sub size_request {
497 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
498} 660}
499 661
500sub draw { } 662sub draw { }
501 663
502############################################################################# 664#############################################################################
… …
506our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
507 669
508sub new { 670sub new {
509 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
510 672
511 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
512 674
513 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
514 children => [], 676 children => [],
515 can_events => 0, 677 can_events => 0,
516 %arg, 678 %arg,
517 ); 679 );
680
518 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
519 683
520 $self 684 $self
521} 685}
522 686
523sub add { 687sub add {
524 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
525 689
526 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
527 692
528 use sort 'stable'; 693 use sort 'stable';
529 694
530 $self->{children} = [ 695 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
533 ]; 698 ];
534 699
535 $child->check_size; 700 $self->realloc;
536} 701}
537 702
538sub children { 703sub children {
539 @{ $_[0]{children} } 704 @{ $_[0]{children} }
540} 705}
… …
545 delete $child->{parent}; 710 delete $child->{parent};
546 $child->hide; 711 $child->hide;
547 712
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 714
550 $self->check_size; 715 $self->realloc;
551 $self->update;
552} 716}
553 717
554sub clear { 718sub clear {
555 my ($self) = @_; 719 my ($self) = @_;
556 720
… …
559 723
560 for (@$children) { 724 for (@$children) {
561 delete $_->{parent}; 725 delete $_->{parent};
562 $_->hide; 726 $_->hide;
563 } 727 }
728
729 $self->realloc;
564} 730}
565 731
566sub find_widget { 732sub find_widget {
567 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
568 734
569 $x -= $self->{x}; 735 $x -= $self->{x};
570 $y -= $self->{y}; 736 $y -= $self->{y};
571 737
572 my $res; 738 my $res;
573 739
574 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
575 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
576 and return $res; 742 and return $res;
577 } 743 }
578 744
579 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
628 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
629} 795}
630 796
631############################################################################# 797#############################################################################
632 798
799# back-buffered drawing area
800
633package CFClient::UI::Window; 801package CFClient::UI::Window;
634 802
635our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
636 804
637use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
643} 811}
644 812
645sub update { 813sub update {
646 my ($self) = @_; 814 my ($self) = @_;
647 815
648 # we want to do this delayed... 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 817 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 818}
662 819
663sub size_allocate { 820sub size_allocate {
664 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
665 822
666 $self->child->configure (0, 0, $w, $h); 823 $self->SUPER::size_allocate ($w, $h);
824 $self->update;
825}
667 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
668 $self->render_chld; 847 $self->_render;
848 };
669} 849}
670 850
671sub _draw { 851sub _draw {
672 my ($self) = @_; 852 my ($self) = @_;
673 853
674 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
675 855
676 my $tex = $self->{texture} 856 my $tex = $self->{texture}
677 or return; 857 or return;
678 858
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
682 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;
683 862
684 $tex->draw_quad (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 864
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
688} 866}
689 867
690############################################################################# 868#############################################################################
691 869
692package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
693 871
694our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 873
722sub new { 874sub new {
723 my $class = shift; 875 my $class = shift;
724 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
725 my $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 977 vp => (new CFClient::UI::ViewPort expand => 1),
727 border_bg => [1, 1, 1, 1], 978 slider => $slider,
728 border => 0.8, 979 %arg,
729 @_
730 ); 980 );
731 981
982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
984
732 $self 985 $self
733} 986}
734 987
735sub _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 {
736 my ($self) = @_; 1005 my ($self, $w, $h) = @_;
737 1006
738 my ($w, $h) = ($self->{w}, $self->{h}); 1007 $self->SUPER::size_allocate ($w, $h);
739 1008
740 glEnable GL_BLEND; 1009 my $child = $self->{vp}->child;
741 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]);
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744
745# glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752
753
754 $self->child->draw;
755 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D;
757} 1011}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
758 1015
759############################################################################# 1016#############################################################################
760 1017
761package CFClient::UI::FancyFrame; 1018package CFClient::UI::Frame;
762 1019
763our @ISA = CFClient::UI::Bin::; 1020our @ISA = CFClient::UI::Bin::;
764 1021
765use CFClient::OpenGL; 1022use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770 1023
771sub new { 1024sub new {
772 my $class = shift; 1025 my $class = shift;
773 1026
774 # 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};
775 1076
776 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1080 border => 0.6,
780 can_events => 1, 1081 can_events => 1,
781 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
782 ); 1085 );
783 1086
784 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
785 align => 0, 1088 align => 0,
786 valign => 1, 1089 valign => 1,
787 text => $self->{title}, 1090 text => $title,
788 fontsize => 1; 1091 fontsize => $self->{border}
1092 if defined $title;
789 1093
790 $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};
791} 1102}
792 1103
793sub border { 1104sub border {
794 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
795} 1106}
796 1107
797sub size_request { 1108sub size_request {
798 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
799 1113
800 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
801 1115
802 ( 1116 (
803 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
806} 1120}
807 1121
808sub size_allocate { 1122sub size_allocate {
809 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
810 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
811 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
813 1135
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
815 if $self->{title};
816
817 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
818} 1137}
819 1138
820sub button_down { 1139sub button_down {
821 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
822 1141
1142 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1143 my $border = $self->border;
824 1144
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1145 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1146 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1147
1148 if ($lr & $td) {
1149 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1150 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1151 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1152
1153 my $mx = $x < $border;
1154 my $my = $y < $border;
1155
831 $self->{motion} = sub { 1156 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
833 1158
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1159 my $dx = $ev->{x} - $ox;
1160 my $dy = $ev->{y} - $oy;
835 1161
836 $self->{user_w} = $bw + $x - $ox; 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
838 $self->check_size; 1164
1165 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
839 }; 1167 };
840 1168
841 } elsif ($x >= 0 && $x < $self->{w} 1169 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
846 1172
847 $self->{motion} = sub { 1173 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
849 1175
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
851 1177
852 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
853 $self->update;
854 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
855 } 1184 1
856} 1185}
857 1186
858sub button_up { 1187sub button_up {
859 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
860 1189
861 delete $self->{motion}; 1190 !!delete $self->{motion}
862} 1191}
863 1192
864sub mouse_motion { 1193sub mouse_motion {
865 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
866 1195
867 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
868} 1199}
869 1200
870sub _draw { 1201sub _draw {
871 my ($self) = @_; 1202 my ($self) = @_;
872 1203
1204 my $child = $self->{children}[0];
1205
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
875 1208
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1211
881 my $border = $self->border; 1212 my $border = $self->border;
882 1213
883 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1219
889 my $bg = $tex[0]; 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1221 glColor @{ $self->{bg} };
890 1222
891 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1224 # solve this better(?)
893 my $rep_y = $ch / $bg->{h}; 1225 $bg->{s} = $cw / $bg->{w};
894 1226 $bg->{t} = $ch / $bg->{h};
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1228 }
901 1229
902 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1231
905 $self->{title}->draw if $self->{title};
906 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
907} 1238}
908 1239
909############################################################################# 1240#############################################################################
910 1241
911package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
919sub new { 1250sub new {
920 my $class = shift; 1251 my $class = shift;
921 1252
922 $class->SUPER::new ( 1253 $class->SUPER::new (
923 col_expand => [], 1254 col_expand => [],
924 @_ 1255 @_,
925 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
926} 1261}
927 1262
928sub add { 1263sub add {
929 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
930 1265
931 $child->set_parent ($self); 1266 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
933 1268
934 $child->check_size; 1269 $self->realloc;
935} 1270}
936 1271
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# 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?
942sub clear { 1273sub clear {
943 my ($self) = @_; 1274 my ($self) = @_;
944 1275
945 my @children = $self->children; 1276 my @children = $self->children;
946 delete $self->{children}; 1277 delete $self->{children};
… …
948 for (@children) { 1279 for (@children) {
949 delete $_->{parent}; 1280 delete $_->{parent};
950 $_->hide; 1281 $_->hide;
951 } 1282 }
952 1283
953 $self->update; 1284 $self->realloc;
954} 1285}
955 1286
956sub get_wh { 1287sub get_wh {
957 my ($self) = @_; 1288 my ($self) = @_;
958 1289
… …
989sub size_allocate { 1320sub size_allocate {
990 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
991 1322
992 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
993 1324
994 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
996 1327
997 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
998 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1054 } 1385 }
1055} 1386}
1056 1387
1057############################################################################# 1388#############################################################################
1058 1389
1059package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1060
1061# TODO: wrap into common Box base class
1062 1391
1063our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1064 1393
1065sub size_request { 1394sub size_request {
1066 my ($self) = @_; 1395 my ($self) = @_;
1067 1396
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1069 1398 ? (
1070 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1071 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1072 (List::Util::max map $_->[1], @alloc), 1401 )
1073 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1074} 1406}
1075 1407
1076sub size_allocate { 1408sub size_allocate {
1077 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1078 1410
1079 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1080
1081 my $children = $self->{children}; 1412 my $children = $self->{children};
1082 1413
1083 my @h = map $_->{req_w}, @$children; 1414 my @req;
1084 1415
1085 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1086 1417 @req = ($space / (@$children || 1)) x @$children;
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } 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 {
1091 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1092 $exp ||= 1;
1093 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1094 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 } 1432 }
1101 } 1433 }
1102 1434
1103 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1104 1436
1105 my $y = 0; 1437 my $pos = 0;
1106 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1109 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1110 1441
1111 $y += $h; 1442 $pos += $alloc;
1112 } 1443 }
1113 1444
1114 1 1445 1
1115} 1446}
1116 1447
1117############################################################################# 1448#############################################################################
1118 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
1119package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1120 1466
1121# TODO: wrap into common Box base class
1122
1123our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1124 1468
1125sub size_request { 1469sub new {
1126 my ($self) = @_; 1470 my $class = shift;
1127 1471
1128 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1129 1473 vertical => 1,
1130 ( 1474 @_,
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1475 )
1134} 1476}
1135 1477
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1478#############################################################################
1174 1479
1175package CFClient::UI::Label; 1480package CFClient::UI::Label;
1176 1481
1177our @ISA = CFClient::UI::Base::; 1482our @ISA = CFClient::UI::DrawBG::;
1178 1483
1179use CFClient::OpenGL; 1484use CFClient::OpenGL;
1180 1485
1181sub new { 1486sub new {
1182 my ($class, %arg) = @_; 1487 my ($class, %arg) = @_;
1183 1488
1184 my $self = $class->SUPER::new ( 1489 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1490 fg => [1, 1, 1],
1491 #bg => none
1492 #active_bg => none
1186 #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),
1187 fontsize => 1, 1499 fontsize => 1,
1188 text => "",
1189 align => -1, 1500 align => -1,
1190 valign => -1, 1501 valign => -1,
1191 padding => 2, 1502 padding_x => 2,
1192 layout => new CFClient::Layout, 1503 padding_y => 2,
1193 can_events => 0, 1504 can_events => 0,
1194 %arg 1505 %arg
1195 ); 1506 );
1196 1507
1197 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1509 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1510 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1511 $self->{template} = $layout;
1201 } 1512 }
1202 1513
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1514 if (exists $self->{markup}) {
1204 $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 }
1205 1519
1206 $self 1520 $self
1207} 1521}
1208 1522
1209sub escape { 1523sub escape($) {
1210 local $_ = $_[1]; 1524 local $_ = $_[0];
1211 1525
1212 s/&/&amp;/g; 1526 s/&/&amp;/g;
1213 s/>/&gt;/g; 1527 s/>/&gt;/g;
1214 s/</&lt;/g; 1528 s/</&lt;/g;
1215 1529
1216 $_[1] 1530 $_
1217} 1531}
1218 1532
1219sub update { 1533sub update {
1220 my ($self) = @_; 1534 my ($self) = @_;
1221 1535
1222 delete $self->{texture}; 1536 delete $self->{texture};
1223 $self->SUPER::update; 1537 $self->SUPER::update;
1224} 1538}
1225 1539
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1540sub set_text {
1233 my ($self, $text) = @_; 1541 my ($self, $text) = @_;
1234 1542
1235 return if $self->{text} eq "T$text"; 1543 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1237 1545
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1239 1548
1240 delete $self->{texture}; 1549 $self->realloc;
1241 $self->update; 1550 $self->update;
1242 $self->check_size;
1243} 1551}
1244 1552
1245sub set_markup { 1553sub set_markup {
1246 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1247 1555
1248 return if $self->{text} eq "M$markup"; 1556 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1557 $self->{text} = "M$markup";
1250 1558
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1252 1563
1253 delete $self->{texture}; 1564 $self->realloc;
1254 $self->update; 1565 $self->update;
1255 $self->check_size;
1256} 1566}
1257 1567
1258sub size_request { 1568sub size_request {
1259 my ($self) = @_; 1569 my ($self) = @_;
1260 1570
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1576
1265 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1266 1578
1267 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1272 1584
1273 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1275 } 1587 }
1276 1588
1277 ( 1589 ($w, $h)
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281} 1590}
1282 1591
1283sub size_allocate { 1592sub size_allocate {
1284 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1285 1594
1595 delete $self->{ox};
1596
1286 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1287} 1599}
1288 1600
1289sub set_fontsize { 1601sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1291 1603
1292 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1605 delete $self->{texture};
1294 $self->check_size; 1606
1295 $self->update; 1607 $self->realloc;
1296} 1608}
1297 1609
1298sub _draw { 1610sub _draw {
1299 my ($self) = @_; 1611 my ($self) = @_;
1300 1612
1613 $self->SUPER::_draw; # draw background, if applicable
1614
1301 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622
1305 new_from_layout CFClient::Texture $self->{layout} 1623 new_from_layout CFClient::Texture $self->{layout}
1306 }; 1624 };
1307 1625
1308 glEnable GL_BLEND; 1626 unless (exists $self->{ox}) {
1309 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
1310 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1638
1639 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1640 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $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 }
1328 1645
1329 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1647}
1332 1648
1333############################################################################# 1649#############################################################################
1334 1650
1335package CFClient::UI::EntryBase; 1651package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1349 can_hover => 1, 1665 can_hover => 1,
1350 can_focus => 1, 1666 can_focus => 1,
1351 valign => 0, 1667 valign => 0,
1352 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1353 @_ 1670 @_
1354 ) 1671 )
1355} 1672}
1356 1673
1357sub _set_text { 1674sub _set_text {
… …
1359 1676
1360 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1361 1678
1362 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1363 1680
1364 delete $self->{texture};
1365
1366 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1367 $self->{text} = $text; 1682 $self->{text} = $text;
1368 1683
1369 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1371 1686
1372 $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;
1373} 1698}
1374 1699
1375sub get_text { 1700sub get_text {
1376 $_[0]{text} 1701 $_[0]{text}
1377} 1702}
… …
1380 my ($self) = @_; 1705 my ($self) = @_;
1381 1706
1382 my ($w, $h) = $self->SUPER::size_request; 1707 my ($w, $h) = $self->SUPER::size_request;
1383 1708
1384 ($w + 1, $h) # add 1 for cursor 1709 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1710}
1400 1711
1401sub key_down { 1712sub key_down {
1402 my ($self, $ev) = @_; 1713 my ($self, $ev) = @_;
1403 1714
… …
1405 my $sym = $ev->{sym}; 1716 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1717 my $uni = $ev->{unicode};
1407 1718
1408 my $text = $self->get_text; 1719 my $text = $self->get_text;
1409 1720
1410 if ($sym == 8) { 1721 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1723 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1724 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1725 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1726 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1727 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1728 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1729 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1730 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1731 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1733 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1734 $self->_emit ('escape');
1424 } elsif ($uni) { 1735 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1736 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else {
1738 return 0;
1426 } 1739 }
1427 1740
1428 $self->_set_text ($text); 1741 $self->_set_text ($text);
1429 $self->update; 1742
1743 $self->realloc;
1744
1745 1
1430} 1746}
1431 1747
1432sub focus_in { 1748sub focus_in {
1433 my ($self) = @_; 1749 my ($self) = @_;
1434 1750
… …
1449 utf8::encode $text; 1765 utf8::encode $text;
1450 $self->{cursor} = length substr $text, 0, $idx; 1766 $self->{cursor} = length substr $text, 0, $idx;
1451 1767
1452 $self->_set_text ($self->{text}); 1768 $self->_set_text ($self->{text});
1453 $self->update; 1769 $self->update;
1770
1771 1
1454} 1772}
1455 1773
1456sub mouse_motion { 1774sub mouse_motion {
1457 my ($self, $ev, $x, $y) = @_; 1775 my ($self, $ev, $x, $y) = @_;
1458# 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
1459} 1779}
1460 1780
1461sub _draw { 1781sub _draw {
1462 my ($self) = @_; 1782 my ($self) = @_;
1463 1783
… …
1514 if ($sym == 13) { 1834 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1835 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1836 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1837 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1838 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1839 $self->_emit (activate => $txt);
1520 $self->update; 1840 $self->update;
1521 1841
1522 } elsif ($sym == CFClient::SDLK_UP) { 1842 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1843 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1844 $self->{history_saveback} = $self->get_text;
… …
1540 } else { 1860 } else {
1541 $self->set_text ($self->{history_saveback}); 1861 $self->set_text ($self->{history_saveback});
1542 } 1862 }
1543 1863
1544 } else { 1864 } else {
1545 $self->SUPER::key_down ($ev); 1865 return $self->SUPER::key_down ($ev)
1866 }
1867
1546 } 1868 1
1547
1548} 1869}
1549 1870
1550############################################################################# 1871#############################################################################
1551 1872
1552package CFClient::UI::Button; 1873package CFClient::UI::Button;
… …
1561 1882
1562sub new { 1883sub new {
1563 my $class = shift; 1884 my $class = shift;
1564 1885
1565 $class->SUPER::new ( 1886 $class->SUPER::new (
1566 padding => 4, 1887 padding_x => 4,
1888 padding_y => 4,
1567 fg => [1, 1, 1], 1889 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1890 active_fg => [0, 0, 1],
1570 can_hover => 1, 1891 can_hover => 1,
1571 align => 0, 1892 align => 0,
1572 valign => 0, 1893 valign => 0,
1573 can_events => 1, 1894 can_events => 1,
1574 @_ 1895 @_
1575 ) 1896 )
1576} 1897}
1577 1898
1899sub activate { }
1900
1578sub button_up { 1901sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1902 my ($self, $ev, $x, $y) = @_;
1580 1903
1904 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1905 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1906 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate"); 1907
1584 } 1908 1
1585} 1909}
1586 1910
1587sub _draw { 1911sub _draw {
1588 my ($self) = @_; 1912 my ($self) = @_;
1589 1913
… …
1591 1915
1592 if ($GRAB == $self) { 1916 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1917 $self->{fg} = $self->{active_fg};
1594 } 1918 }
1595 1919
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1922 glColor 0, 0, 0, 1;
1601 1923
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1925
1604 glDisable GL_TEXTURE_2D; 1926 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1927
1607 $self->SUPER::_draw; 1928 $self->SUPER::_draw;
1608} 1929}
1609 1930
1610############################################################################# 1931#############################################################################
… …
1621 1942
1622sub new { 1943sub new {
1623 my $class = shift; 1944 my $class = shift;
1624 1945
1625 $class->SUPER::new ( 1946 $class->SUPER::new (
1626 padding => 2, 1947 padding_x => 2,
1948 padding_y => 2,
1627 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1628 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],
1629 state => 0, 1953 state => 0,
1630 can_hover => 1, 1954 can_hover => 1,
1631 @_ 1955 @_
1632 ) 1956 )
1633} 1957}
1634 1958
1635sub size_request { 1959sub size_request {
1636 my ($self) = @_; 1960 my ($self) = @_;
1637 1961
1638 ($self->{padding} * 2 + 6) x 2 1962 (6) x 2
1639} 1963}
1640 1964
1641sub button_down { 1965sub button_down {
1642 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1643 1967
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1646 $self->{state} = !$self->{state}; 1970 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1971 $self->_emit (changed => $self->{state});
1972 } else {
1973 return 0
1974 }
1975
1648 } 1976 1
1649} 1977}
1650 1978
1651sub _draw { 1979sub _draw {
1652 my ($self) = @_; 1980 my ($self) = @_;
1653 1981
1654 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1655 1983
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1657 1985
1658 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;
1659 1989
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1990 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1991
1662 glEnable GL_BLEND; 1992 my $tex = $self->{state} ? $tex[1] : $tex[0];
1993
1663 glEnable GL_TEXTURE_2D; 1994 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1995 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1996 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1997}
1673 1998
1674############################################################################# 1999#############################################################################
1675 2000
1676package CFClient::UI::Image; 2001package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 2044 glTranslate 0, -$self->{w}, 0;
1720 2045
1721 ($w, $h) = ($h, $w); 2046 ($w, $h) = ($h, $w);
1722 } 2047 }
1723 2048
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 2049 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 2051
1729 $tex->draw_quad (0, 0, $w, $h); 2052 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 2053
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 2054 glDisable GL_TEXTURE_2D;
1733} 2055}
1734 2056
1735############################################################################# 2057#############################################################################
1736 2058
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2247 qw(s1_slider.png s1_slider_bg.png);
1926 2248
1927sub new { 2249sub new {
1928 my $class = shift; 2250 my $class = shift;
1929 2251
1930 # range [value, low, high, page] 2252 # range [value, low, high, page, unit]
1931 2253
1932 # TODO: 0-width page 2254 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2255 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2256 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2257 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2262 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2263 min_w => $::WIDTH / 80,
1940 req_h => 20, 2264 min_h => $::WIDTH / 80,
1941 vertical => 0, 2265 vertical => 0,
1942 can_hover => 1, 2266 can_hover => 1,
1943 inner_pad => 5, 2267 inner_pad => 0.02,
1944 @_ 2268 @_
1945 ); 2269 );
1946 2270
2271 $self->set_value ($self->{range}[0]);
2272 $self->update;
2273
1947 $self 2274 $self
1948} 2275}
1949 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
1950sub size_request { 2311sub size_request {
1951 my ($self) = @_; 2312 my ($self) = @_;
1952 2313
1953 my $w = $self->{req_w}; 2314 ($self->{req_w}, $self->{req_h})
1954 my $h = $self->{req_h};
1955
1956 $self->{vertical} ? ($h, $w) : ($w, $h)
1957} 2315}
1958 2316
1959sub button_down { 2317sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1961 2319
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2324 $self->mouse_motion ($ev, $x, $y)
1964} 2325}
1965 2326
1966sub mouse_motion { 2327sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
1968 2329
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2359 my $range = ($hi - $page - $lo) || 1e-100;
1971 2360
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2361 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2362
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2363 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2364 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2365
1977 $x -= $inner_pad_px; # substract the padding 2366 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2367 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2368
1983 $self->emit (changed => $x); 2369 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2370 $self->{knob_w} = $knob_w;
1985 } 2371 }
1986}
1987
1988# the inner_* stuff is for generating a padding for the slider handle,
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994}
1995
1996sub _draw {
1997 my ($self) = @_;
1998 2372
1999 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2000 2374
2001 my ($w, $h) = @$self{qw(w h)}; 2375 glScale $self->{w}, $self->{h};
2002 2376
2003 if ($self->{vertical}) { 2377 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2378 # draw a vertical slider like a rotated horizontal slider
2005 2379
2380 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2381 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2382 }
2011 2383
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2384 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2385 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2386
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2387 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2389
2038 # draw background 2390 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2391 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2392
2041 # draw handle 2393 # draw handle
2042 $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);
2043 2395
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2396 glDisable GL_TEXTURE_2D;
2046} 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 (@_) }
2047 2439
2048############################################################################# 2440#############################################################################
2049 2441
2050package CFClient::UI::TextView; 2442package CFClient::UI::TextView;
2051 2443
… …
2060 fontsize => 1, 2452 fontsize => 1,
2061 can_events => 0, 2453 can_events => 0,
2062 #font => default_font 2454 #font => default_font
2063 @_, 2455 @_,
2064 2456
2065 layout => (new CFClient::Layout), 2457 layout => (new CFClient::Layout 1),
2066 par => [], 2458 par => [],
2067 height => 0, 2459 height => 0,
2068 children => [ 2460 children => [
2069 (new CFClient::UI::Empty expand => 1), 2461 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2462 (new CFClient::UI::Slider vertical => 1),
2071 ], 2463 ],
2072 ); 2464 );
2073 2465
2074 $self->{children}[1]->connect (changed => sub { 2466 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2467
2078 $self 2468 $self
2079} 2469}
2080 2470
2081sub set_fontsize { 2471sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2472 my ($self, $fontsize) = @_;
2083 2473
2084 $self->{fontsize} = $fontsize; 2474 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2475 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2476}
2106 2477
2107sub size_allocate { 2478sub size_allocate {
2108 my ($self, $w, $h) = @_; 2479 my ($self, $w, $h) = @_;
2109 2480
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2485 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2486
2116 $self->reflow; 2487 $self->reflow;
2117} 2488}
2118 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
2119sub add_paragraph { 2524sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2525 my ($self, $color, $text, $indent) = @_;
2121 2526
2122 #TODO: intelligently "reformat" paragraph 2527 for my $line (split /\n/, $text) {
2123 2528 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2529 $self->{height} += $h;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2531 }
2127 2532
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $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]);
2131 $self->{children}[1]->update;
2132} 2534}
2133 2535
2134sub update { 2536sub update {
2135 my ($self) = @_; 2537 my ($self) = @_;
2136 2538
… …
2138 2540
2139 return unless $self->{h} > 0; 2541 return unless $self->{h} > 0;
2140 2542
2141 delete $self->{texture}; 2543 delete $self->{texture};
2142 2544
2143 $ROOT->on_refresh ($self, sub { 2545 $ROOT->on_post_alloc ($self, sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547
2144 if (delete $self->{need_reflow}) { 2548 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2549 my $height = 0;
2146 2550
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2148 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 }
2149 2566
2150 $self->{height} = $height; 2567 $self->{height} = $height;
2151 2568
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2570
2154 delete $self->{texture}; 2571 delete $self->{texture};
2155 } 2572 }
2156 2573
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2575 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2576 glClear GL_COLOR_BUFFER_BIT;
2160 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
2161 glEnable GL_BLEND; 2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2592
2177 for my $par (@{$self->{par}}) { 2593 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2594 my $h = $par->[1];
2179 2595
2180 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]);
2181 $layout->set_text ($par->[2]); 2599 $layout->set_markup ($par->[4]);
2182 2600
2183 glColor @{ $par->[1] }; 2601 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2602
2185 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;
2186 } 2605 }
2187 2606
2188 $y += $h; 2607 $y += $h;
2189 } 2608 }
2190 2609
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2610 glDisable GL_BLEND;
2193 }; 2611 };
2194 }); 2612 });
2195} 2613}
2196 2614
2197sub _draw { 2615sub _draw {
2198 my ($self) = @_; 2616 my ($self) = @_;
2199 2617
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2620 glColor 1, 1, 1, 1;
2204 $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});
2205 glDisable GL_TEXTURE_2D; 2622 glDisable GL_TEXTURE_2D;
2206 }
2207 2623
2208 $self->{children}[1]->draw; 2624 $self->{children}[1]->draw;
2209 2625
2210} 2626}
2211 2627
… …
2259 2675
2260sub new { 2676sub new {
2261 my $class = shift; 2677 my $class = shift;
2262 2678
2263 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2264 state => 0, 2680 state => 0,
2265 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2266 @_ 2682 @_
2267 ); 2683 );
2268 2684
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 2685 $self
2275} 2686}
2276 2687
2277sub toggle_flopper { 2688sub toggle_flopper {
2278 my ($self) = @_; 2689 my ($self) = @_;
2279 2690
2280 # TODO: use animation 2691 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 2692}
2292 2693
2293############################################################################# 2694#############################################################################
2294 2695
2295package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2305 @_, 2706 @_,
2306 can_events => 0, 2707 can_events => 0,
2307 ) 2708 )
2308} 2709}
2309 2710
2310sub set_markup { 2711sub set_tooltip_from {
2311 my ($self, $text) = @_; 2712 my ($self, $widget) = @_;
2312 2713
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2714 my $tooltip = $widget->{tooltip};
2314 $self->{label}->set_markup ($text); 2715
2315 $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 );
2316} 2731}
2317 2732
2318sub size_request { 2733sub size_request {
2319 my ($self) = @_; 2734 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2735
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2737
2325 ($w + 4, $h + 4) 2738 ($w + 4, $h + 4)
2326} 2739}
… …
2329 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2330 2743
2331 $self->SUPER::size_allocate ($w - 4, $h - 4); 2744 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332} 2745}
2333 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
2334sub _draw { 2765sub _draw {
2335 my ($self) = @_; 2766 my ($self) = @_;
2336 2767
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2768 glTranslate 0.375, 0.375;
2339 2769
2340 my ($w, $h) = @$self{qw(w h)}; 2770 my ($w, $h) = @$self{qw(w h)};
2341 2771
2342 glColor 1, 0.8, 0.4; 2772 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2783 glVertex 0 , $h;
2354 glVertex $w, $h; 2784 glVertex $w, $h;
2355 glVertex $w, 0; 2785 glVertex $w, 0;
2356 glEnd; 2786 glEnd;
2357 2787
2358 glPopMatrix; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2359 2789
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2362} 2791}
2363 2792
2364############################################################################# 2793#############################################################################
2365 2794
… …
2370use CFClient::OpenGL; 2799use CFClient::OpenGL;
2371 2800
2372sub new { 2801sub new {
2373 my $class = shift; 2802 my $class = shift;
2374 2803
2375 $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2376 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2377 @_, 2807 @_,
2378 ) 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
2379} 2825}
2380 2826
2381sub size_request { 2827sub size_request {
2382 (32, 8) 2828 (32, 8)
2383} 2829}
2384 2830
2831sub update {
2832 my ($self) = @_;
2833
2834 return unless $self->{visible};
2835
2836 $self->SUPER::update;
2837}
2838
2385sub draw { 2839sub _draw {
2386 my ($self) = @_; 2840 my ($self) = @_;
2387 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
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2854
2390 if ($tex) { 2855 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2856 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2858 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2860 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2861 }
2862}
2863
2864sub DESTROY {
2865 my ($self) = @_;
2866
2867 $self->{timer}->cancel
2868 if $self->{timer};
2869
2870 $self->SUPER::DESTROY;
2400} 2871}
2401 2872
2402############################################################################# 2873#############################################################################
2403 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
2404package CFClient::UI::Root; 3474package CFClient::UI::Root;
2405 3475
2406our @ISA = CFClient::UI::Container::; 3476our @ISA = CFClient::UI::Container::;
2407 3477
2408use CFClient::OpenGL; 3478use CFClient::OpenGL;
2409 3479
2410sub check_size { 3480sub new {
2411 my ($self) = @_; 3481 my $class = shift;
2412 3482
2413 $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
2414} 3491}
2415 3492
2416sub size_request { 3493sub size_request {
2417 ($::WIDTH, $::HEIGHT) 3494 my ($self) = @_;
2418}
2419 3495
2420sub 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 {
2421 my ($self, $x, $y, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
2422 3515
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) { 3516 for my $child ($self->children) {
2426 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)};
2427 3518
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3519 $X = $child->{force_x} if exists $child->{force_x};
2429 $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
2430 $child->configure ($X, $Y, $W,$H); 3525 $child->configure ($X, $Y, $W, $H);
2431 } 3526 }
2432} 3527}
2433 3528
2434sub _topleft { 3529sub coord2local {
2435 my ($self, $x, $y) = @_; 3530 my ($self, $x, $y) = @_;
2436 3531
2437 ($x, $y) 3532 ($x, $y)
2438} 3533}
2439 3534
3535sub coord2global {
3536 my ($self, $x, $y) = @_;
3537
3538 ($x, $y)
3539}
3540
2440sub update { 3541sub update {
2441 my ($self) = @_; 3542 my ($self) = @_;
2442 3543
2443 $self->check_size; 3544 $::WANT_REFRESH++;
2444 ::refresh ();
2445} 3545}
2446 3546
2447sub add { 3547sub add {
2448 my ($self, $child) = @_; 3548 my ($self, @children) = @_;
2449 3549
2450 # integerize window positions 3550 $_->{is_toplevel} = 1
2451 $child->{x} = int $child->{x}; 3551 for @children;
2452 $child->{y} = int $child->{y};
2453 3552
2454 $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 }
2455} 3569}
2456 3570
2457sub on_refresh { 3571sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3572 my ($self, $id, $cb) = @_;
2459 3573
2460 $self->{refresh_hook}{$id} = $cb; 3574 $self->{refresh_hook}{$id} = $cb;
2461} 3575}
2462 3576
3577sub on_post_alloc {
3578 my ($self, $id, $cb) = @_;
3579
3580 $self->{post_alloc_hook}{$id} = $cb;
3581}
3582
2463sub draw { 3583sub draw {
2464 my ($self) = @_; 3584 my ($self) = @_;
2465 3585
2466 while (my $rcb = delete $self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3587 $_->()
3588 for values %{delete $self->{refresh_hook}};
2468 } 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
2469 3679
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
2473 3683
2474 glMatrixMode GL_PROJECTION; 3684 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3685 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3688 glLoadIdentity;
2479 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
2480 $self->_draw; 3697 $self->_draw;
2481} 3698}
2482 3699
2483############################################################################# 3700#############################################################################
2484 3701
2485package CFClient::UI; 3702package CFClient::UI;
2486 3703
2487$ROOT = new CFClient::UI::Root; 3704$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3705$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3706
24901 37071
2491 3708

Diff Legend

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