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

Diff Legend

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