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

Diff Legend

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