ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
241sub children { 375sub children {
242} 376}
243 377
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size { 378sub set_max_size {
255 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
256 380
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 383}
260 384
261# return top left coordinates 385sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
264 387
265 $self->{parent} 388 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 389 $tooltip =~ s/\s+$//;
267 390
268 $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 }
269} 399}
270 400
271# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
272sub coord2local { 402sub coord2local {
273 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
274 404
275 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 406}
278 407
279# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
280sub coord2global { 409sub coord2global {
281 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
282 411
283 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 413}
286 414
287sub focus_in { 415sub focus_in {
288 my ($self) = @_; 416 my ($self) = @_;
289 417
290 return if $FOCUS == $self; 418 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
292 420
293 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
294 422
295 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
296 424
297 $focus->update if $focus; 425 $focus->update if $focus;
298 $FOCUS->update; 426 $FOCUS->update;
299} 427}
300 428
… …
303 431
304 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
305 433
306 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
307 435
308 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
309 437
310 $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;
311} 442}
312 443
313sub mouse_motion { } 444sub mouse_motion { }
314sub button_up { } 445sub button_up { }
315sub key_down { } 446sub key_down { }
316sub key_up { } 447sub key_up { }
317 448
318sub button_down { 449sub button_down {
319 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
320 451
321 $self->focus_in; 452 $self->focus_in;
322} 453}
323 454
324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
328sub 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
329 528
330sub draw { 529sub draw {
331 my ($self) = @_; 530 my ($self) = @_;
332 531
333 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);
334 543
335 glPushMatrix; 544 glPushMatrix;
336 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
337 $self->_draw; 546 $self->_draw;
338 glPopMatrix; 547 glPopMatrix;
… …
350 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
351 glEnd; 560 glEnd;
352 glDisable GL_BLEND; 561 glDisable GL_BLEND;
353 } 562 }
354 563
355 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
356 glPushMatrix; 565 glPushMatrix;
357 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 569 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
364 glEnd; 573 glEnd;
365 glPopMatrix; 574 glPopMatrix;
366 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;
367 } 576 }
368} 577}
369 578
370sub _draw { 579sub _draw {
371 my ($self) = @_; 580 my ($self) = @_;
372 581
373 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
374} 583}
375 584
376sub find_widget {
377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
385 ()
386}
387
388sub set_parent {
389 my ($self, $parent) = @_;
390
391 Scalar::Util::weaken ($self->{parent} = $parent);
392}
393
394sub check_size {
395 my ($self) = @_;
396
397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 585sub DESTROY {
440 my ($self) = @_; 586 my ($self) = @_;
441 587
588 delete $WIDGET{$self+0};
442 #$self->deactivate; 589 #$self->deactivate;
443} 590}
444 591
445############################################################################# 592#############################################################################
446 593
… …
455 my $class = shift; 602 my $class = shift;
456 603
457 # range [value, low, high, page] 604 # range [value, low, high, page]
458 605
459 $class->SUPER::new ( 606 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
462 @_ 609 @_
463 ) 610 )
464} 611}
465 612
466sub _draw { 613sub _draw {
467 my ($self) = @_; 614 my ($self) = @_;
468 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
470 622
471 glEnable GL_BLEND; 623 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
474 626
475 glBegin GL_QUADS; 627 glBegin GL_QUADS;
476 glVertex 0 , 0; 628 glVertex 0 , 0;
477 glVertex 0 , $h; 629 glVertex 0 , $h;
478 glVertex $w, $h; 630 glVertex $w, $h;
479 glVertex $w, 0; 631 glVertex $w, 0;
480 glEnd; 632 glEnd;
481 633
482 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
483} 636}
484 637
485############################################################################# 638#############################################################################
486 639
487package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
494} 647}
495 648
496sub size_request { 649sub size_request {
497 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
498} 653}
499 654
500sub draw { } 655sub draw { }
501 656
502############################################################################# 657#############################################################################
… …
519 674
520 $self 675 $self
521} 676}
522 677
523sub add { 678sub add {
524 my ($self, $child) = @_; 679 my ($self, @widgets) = @_;
525 680
526 $child->set_parent ($self); 681 $_->set_parent ($self)
682 for @widgets;
527 683
528 use sort 'stable'; 684 use sort 'stable';
529 685
530 $self->{children} = [ 686 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 688 @{$self->{children}}, @widgets
533 ]; 689 ];
534 690
535 $child->check_size; 691 $self->realloc;
536} 692}
537 693
538sub children { 694sub children {
539 @{ $_[0]{children} } 695 @{ $_[0]{children} }
540} 696}
… …
545 delete $child->{parent}; 701 delete $child->{parent};
546 $child->hide; 702 $child->hide;
547 703
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 705
550 $self->check_size; 706 $self->realloc;
551 $self->update;
552} 707}
553 708
554sub clear { 709sub clear {
555 my ($self) = @_; 710 my ($self) = @_;
556 711
… …
559 714
560 for (@$children) { 715 for (@$children) {
561 delete $_->{parent}; 716 delete $_->{parent};
562 $_->hide; 717 $_->hide;
563 } 718 }
719
720 $self->realloc;
564} 721}
565 722
566sub find_widget { 723sub find_widget {
567 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
568 725
… …
643} 800}
644 801
645sub update { 802sub update {
646 my ($self) = @_; 803 my ($self) = @_;
647 804
648 # we want to do this delayed... 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 806 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 807}
662 808
663sub size_allocate { 809sub size_allocate {
664 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
665 811
666 $self->child->configure (0, 0, $w, $h); 812 $self->SUPER::size_allocate ($w, $h);
813 $self->update;
814}
667 815
816sub _render {
817 my ($self) = @_;
818
819 $self->{children}[0]->draw;
820}
821
822sub render_child {
823 my ($self) = @_;
824
825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
826 glClearColor 0, 0, 0, 0;
827 glClear GL_COLOR_BUFFER_BIT;
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
668 $self->render_chld; 836 $self->_render;
837 };
669} 838}
670 839
671sub _draw { 840sub _draw {
672 my ($self) = @_; 841 my ($self) = @_;
673 842
674 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
675 844
676 my $tex = $self->{texture} 845 my $tex = $self->{texture}
677 or return; 846 or return;
678 847
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1;
683 851
684 $tex->draw_quad (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 853
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
688} 855}
689 856
690############################################################################# 857#############################################################################
691 858
692package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
693 860
694our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 862
722sub new { 863sub new {
723 my $class = shift; 864 my $class = shift;
724 865
725 my $self = $class->SUPER::new ( 866 $class->SUPER::new (
726 bg => [1, 1, 1, 1], 867 scroll_x => 0,
727 border_bg => [1, 1, 1, 1], 868 scroll_y => 1,
728 border => 0.8,
729 @_ 869 @_,
730 ); 870 )
731
732 $self
733} 871}
734 872
735sub _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 {
736 my ($self) = @_; 885 my ($self, $w, $h) = @_;
737 886
738 my ($w, $h) = ($self->{w}, $self->{h}); 887 my $child = $self->child;
739 888
740 glEnable GL_BLEND; 889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 891
745# glBegin GL_QUADS; 892 $self->child->configure (0, 0, $w, $h);
746# glColor 0, 0, 0, 0; 893 $self->update;
747# glVertex 0 , 0; 894}
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752 895
896sub set_offset {
897 my ($self, $x, $y) = @_;
753 898
754 $self->child->draw; 899 $self->{view_x} = int $x;
755 glDisable GL_BLEND; 900 $self->{view_y} = int $y;
756 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;
757} 942}
758 943
759############################################################################# 944#############################################################################
760 945
761package CFClient::UI::FancyFrame; 946package CFClient::UI::ScrolledWindow;
762 947
763our @ISA = CFClient::UI::Bin::; 948our @ISA = CFClient::UI::HBox::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770 949
771sub new { 950sub new {
772 my $class = shift; 951 my $class = shift;
773 952
774 # 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};
775 1058
776 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1062 border => 0.6,
780 can_events => 1, 1063 can_events => 1,
781 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
782 ); 1067 );
783 1068
784 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
785 align => 0, 1070 align => 0,
786 valign => 1, 1071 valign => 1,
787 text => $self->{title}, 1072 text => $title,
788 fontsize => 1; 1073 fontsize => $self->{border}
1074 if defined $title;
789 1075
790 $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};
791} 1084}
792 1085
793sub border { 1086sub border {
794 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
795} 1088}
796 1089
797sub size_request { 1090sub size_request {
798 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
799 1095
800 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
801 1097
802 ( 1098 (
803 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
806} 1102}
807 1103
808sub size_allocate { 1104sub size_allocate {
809 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
810 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
811 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
813 1117
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
815 if $self->{title};
816
817 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
818} 1119}
819 1120
820sub button_down { 1121sub button_down {
821 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
822 1123
1124 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1125 my $border = $self->border;
824 1126
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1127 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1128 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1129
1130 if ($lr & $td) {
1131 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1133 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1134
1135 my $mx = $x < $border;
1136 my $my = $y < $border;
1137
831 $self->{motion} = sub { 1138 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
833 1140
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1141 my $dx = $ev->{x} - $ox;
1142 my $dy = $ev->{y} - $oy;
835 1143
836 $self->{user_w} = $bw + $x - $ox; 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
838 $self->check_size; 1146
1147 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
839 }; 1149 };
840 1150
841 } elsif ($x >= 0 && $x < $self->{w} 1151 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
846 1154
847 $self->{motion} = sub { 1155 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
849 1157
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
851 1159
852 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
853 $self->update;
854 }; 1161 };
855 } 1162 }
856} 1163}
857 1164
858sub button_up { 1165sub button_up {
… …
868} 1175}
869 1176
870sub _draw { 1177sub _draw {
871 my ($self) = @_; 1178 my ($self) = @_;
872 1179
1180 my $child = $self->{children}[0];
1181
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
875 1184
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1187
881 my $border = $self->border; 1188 my $border = $self->border;
882 1189
883 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1195
889 my $bg = $tex[0]; 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1197 glColor @{ $self->{bg} };
890 1198
891 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1200 # solve this better(?)
893 my $rep_y = $ch / $bg->{h}; 1201 $bg->{s} = $cw / $bg->{w};
894 1202 $bg->{t} = $ch / $bg->{h};
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1204 }
901 1205
902 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1207
905 $self->{title}->draw if $self->{title};
906 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
907} 1214}
908 1215
909############################################################################# 1216#############################################################################
910 1217
911package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
919sub new { 1226sub new {
920 my $class = shift; 1227 my $class = shift;
921 1228
922 $class->SUPER::new ( 1229 $class->SUPER::new (
923 col_expand => [], 1230 col_expand => [],
924 @_ 1231 @_,
925 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
926} 1237}
927 1238
928sub add { 1239sub add {
929 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
930 1241
931 $child->set_parent ($self); 1242 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
933 1244
934 $child->check_size; 1245 $self->realloc;
935} 1246}
936 1247
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# 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?
942sub clear { 1249sub clear {
943 my ($self) = @_; 1250 my ($self) = @_;
944 1251
945 my @children = $self->children; 1252 my @children = $self->children;
946 delete $self->{children}; 1253 delete $self->{children};
… …
948 for (@children) { 1255 for (@children) {
949 delete $_->{parent}; 1256 delete $_->{parent};
950 $_->hide; 1257 $_->hide;
951 } 1258 }
952 1259
953 $self->update; 1260 $self->realloc;
954} 1261}
955 1262
956sub get_wh { 1263sub get_wh {
957 my ($self) = @_; 1264 my ($self) = @_;
958 1265
… …
989sub size_allocate { 1296sub size_allocate {
990 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
991 1298
992 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
993 1300
994 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
996 1303
997 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
998 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1054 } 1361 }
1055} 1362}
1056 1363
1057############################################################################# 1364#############################################################################
1058 1365
1059package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1060
1061# TODO: wrap into common Box base class
1062 1367
1063our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1064 1369
1065sub size_request { 1370sub size_request {
1066 my ($self) = @_; 1371 my ($self) = @_;
1067 1372
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1069 1374 ? (
1070 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1071 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1072 (List::Util::max map $_->[1], @alloc), 1377 )
1073 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1074} 1382}
1075 1383
1076sub size_allocate { 1384sub size_allocate {
1077 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1078 1386
1079 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1080
1081 my $children = $self->{children}; 1388 my $children = $self->{children};
1082 1389
1083 my @h = map $_->{req_w}, @$children; 1390 my @req;
1084 1391
1085 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1086 1393 @req = ($space / (@$children || 1)) x @$children;
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } else { 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 {
1091 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1092 $exp ||= 1;
1093 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1094 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 } 1408 }
1101 } 1409 }
1102 1410
1103 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1104 1412
1105 my $y = 0; 1413 my $pos = 0;
1106 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1109 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1110 1417
1111 $y += $h; 1418 $pos += $alloc;
1112 } 1419 }
1113 1420
1114 1 1421 1
1115} 1422}
1116 1423
1117############################################################################# 1424#############################################################################
1118 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
1119package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1120 1442
1121# TODO: wrap into common Box base class
1122
1123our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1124 1444
1125sub size_request { 1445sub new {
1126 my ($self) = @_; 1446 my $class = shift;
1127 1447
1128 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1129 1449 vertical => 1,
1130 ( 1450 @_,
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1451 )
1134} 1452}
1135 1453
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1454#############################################################################
1174 1455
1175package CFClient::UI::Label; 1456package CFClient::UI::Label;
1176 1457
1177our @ISA = CFClient::UI::Base::; 1458our @ISA = CFClient::UI::DrawBG::;
1178 1459
1179use CFClient::OpenGL; 1460use CFClient::OpenGL;
1180 1461
1181sub new { 1462sub new {
1182 my ($class, %arg) = @_; 1463 my ($class, %arg) = @_;
1183 1464
1184 my $self = $class->SUPER::new ( 1465 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1466 fg => [1, 1, 1],
1467 #bg => none
1468 #active_bg => none
1186 #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),
1187 fontsize => 1, 1475 fontsize => 1,
1188 text => "",
1189 align => -1, 1476 align => -1,
1190 valign => -1, 1477 valign => -1,
1191 padding => 2, 1478 padding_x => 2,
1192 layout => new CFClient::Layout, 1479 padding_y => 2,
1193 can_events => 0, 1480 can_events => 0,
1194 %arg 1481 %arg
1195 ); 1482 );
1196 1483
1197 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1485 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1486 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1487 $self->{template} = $layout;
1201 } 1488 }
1202 1489
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1490 if (exists $self->{markup}) {
1204 $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 }
1205 1495
1206 $self 1496 $self
1207} 1497}
1208 1498
1209sub escape { 1499sub escape($) {
1210 local $_ = $_[1]; 1500 local $_ = $_[0];
1211 1501
1212 s/&/&amp;/g; 1502 s/&/&amp;/g;
1213 s/>/&gt;/g; 1503 s/>/&gt;/g;
1214 s/</&lt;/g; 1504 s/</&lt;/g;
1215 1505
1216 $_[1] 1506 $_
1217} 1507}
1218 1508
1219sub update { 1509sub update {
1220 my ($self) = @_; 1510 my ($self) = @_;
1221 1511
1222 delete $self->{texture}; 1512 delete $self->{texture};
1223 $self->SUPER::update; 1513 $self->SUPER::update;
1224} 1514}
1225 1515
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1516sub set_text {
1233 my ($self, $text) = @_; 1517 my ($self, $text) = @_;
1234 1518
1235 return if $self->{text} eq "T$text"; 1519 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1237 1521
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1239 1524
1240 delete $self->{texture}; 1525 $self->realloc;
1241 $self->update; 1526 $self->update;
1242 $self->check_size;
1243} 1527}
1244 1528
1245sub set_markup { 1529sub set_markup {
1246 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1247 1531
1248 return if $self->{text} eq "M$markup"; 1532 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1533 $self->{text} = "M$markup";
1250 1534
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1252 1539
1253 delete $self->{texture}; 1540 $self->realloc;
1254 $self->update; 1541 $self->update;
1255 $self->check_size;
1256} 1542}
1257 1543
1258sub size_request { 1544sub size_request {
1259 my ($self) = @_; 1545 my ($self) = @_;
1260 1546
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1552
1265 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1266 1554
1267 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
… …
1272 1560
1273 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1275 } 1563 }
1276 1564
1277 ( 1565 ($w, $h)
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281} 1566}
1282 1567
1283sub size_allocate { 1568sub size_allocate {
1284 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1285 1570
1571 delete $self->{ox};
1572
1286 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1287} 1575}
1288 1576
1289sub set_fontsize { 1577sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1291 1579
1292 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1581 delete $self->{texture};
1294 $self->check_size; 1582
1295 $self->update; 1583 $self->realloc;
1296} 1584}
1297 1585
1298sub _draw { 1586sub _draw {
1299 my ($self) = @_; 1587 my ($self) = @_;
1300 1588
1589 $self->SUPER::_draw; # draw background, if applicable
1590
1301 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598
1305 new_from_layout CFClient::Texture $self->{layout} 1599 new_from_layout CFClient::Texture $self->{layout}
1306 }; 1600 };
1307 1601
1308 glEnable GL_BLEND; 1602 unless (exists $self->{ox}) {
1309 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
1310 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1614
1615 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1616 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1328 1621
1329 glDisable GL_TEXTURE_2D; 1622 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1623}
1332 1624
1333############################################################################# 1625#############################################################################
1334 1626
1335package CFClient::UI::EntryBase; 1627package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1349 can_hover => 1, 1641 can_hover => 1,
1350 can_focus => 1, 1642 can_focus => 1,
1351 valign => 0, 1643 valign => 0,
1352 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1353 @_ 1646 @_
1354 ) 1647 )
1355} 1648}
1356 1649
1357sub _set_text { 1650sub _set_text {
… …
1367 $self->{text} = $text; 1660 $self->{text} = $text;
1368 1661
1369 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1371 1664
1372 $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;
1373} 1675}
1374 1676
1375sub get_text { 1677sub get_text {
1376 $_[0]{text} 1678 $_[0]{text}
1377} 1679}
… …
1380 my ($self) = @_; 1682 my ($self) = @_;
1381 1683
1382 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1383 1685
1384 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1687}
1400 1688
1401sub key_down { 1689sub key_down {
1402 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1403 1691
… …
1405 my $sym = $ev->{sym}; 1693 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1694 my $uni = $ev->{unicode};
1407 1695
1408 my $text = $self->get_text; 1696 my $text = $self->get_text;
1409 1697
1410 if ($sym == 8) { 1698 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1700 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1701 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1702 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1703 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1704 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1705 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1710 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1711 $self->_emit ('escape');
1424 } elsif ($uni) { 1712 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1714 }
1427 1715
1428 $self->_set_text ($text); 1716 $self->_set_text ($text);
1429 $self->update; 1717
1718 $self->realloc;
1430} 1719}
1431 1720
1432sub focus_in { 1721sub focus_in {
1433 my ($self) = @_; 1722 my ($self) = @_;
1434 1723
… …
1514 if ($sym == 13) { 1803 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1520 $self->update; 1809 $self->update;
1521 1810
1522 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1561 1850
1562sub new { 1851sub new {
1563 my $class = shift; 1852 my $class = shift;
1564 1853
1565 $class->SUPER::new ( 1854 $class->SUPER::new (
1566 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1567 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1570 can_hover => 1, 1859 can_hover => 1,
1571 align => 0, 1860 align => 0,
1572 valign => 0, 1861 valign => 0,
1573 can_events => 1, 1862 can_events => 1,
1574 @_ 1863 @_
1575 ) 1864 )
1576} 1865}
1577 1866
1867sub activate { }
1868
1578sub button_up { 1869sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1580 1871
1872 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1875}
1586 1876
1587sub _draw { 1877sub _draw {
1588 my ($self) = @_; 1878 my ($self) = @_;
1589 1879
… …
1591 1881
1592 if ($GRAB == $self) { 1882 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1883 $self->{fg} = $self->{active_fg};
1594 } 1884 }
1595 1885
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1886 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1888 glColor 0, 0, 0, 1;
1601 1889
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1891
1604 glDisable GL_TEXTURE_2D; 1892 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1893
1607 $self->SUPER::_draw; 1894 $self->SUPER::_draw;
1608} 1895}
1609 1896
1610############################################################################# 1897#############################################################################
… …
1621 1908
1622sub new { 1909sub new {
1623 my $class = shift; 1910 my $class = shift;
1624 1911
1625 $class->SUPER::new ( 1912 $class->SUPER::new (
1626 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1627 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1628 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],
1629 state => 0, 1919 state => 0,
1630 can_hover => 1, 1920 can_hover => 1,
1631 @_ 1921 @_
1632 ) 1922 )
1633} 1923}
1634 1924
1635sub size_request { 1925sub size_request {
1636 my ($self) = @_; 1926 my ($self) = @_;
1637 1927
1638 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1639} 1929}
1640 1930
1641sub button_down { 1931sub button_down {
1642 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1643 1933
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1646 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1648 } 1938 }
1649} 1939}
1650 1940
1651sub _draw { 1941sub _draw {
1652 my ($self) = @_; 1942 my ($self) = @_;
1653 1943
1654 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1655 1945
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1657 1947
1658 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;
1659 1951
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1953
1662 glEnable GL_BLEND; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1955
1663 glEnable GL_TEXTURE_2D; 1956 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1957 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1959}
1673 1960
1674############################################################################# 1961#############################################################################
1675 1962
1676package CFClient::UI::Image; 1963package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 2006 glTranslate 0, -$self->{w}, 0;
1720 2007
1721 ($w, $h) = ($h, $w); 2008 ($w, $h) = ($h, $w);
1722 } 2009 }
1723 2010
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 2011 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 2013
1729 $tex->draw_quad (0, 0, $w, $h); 2014 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 2015
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 2016 glDisable GL_TEXTURE_2D;
1733} 2017}
1734 2018
1735############################################################################# 2019#############################################################################
1736 2020
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2209 qw(s1_slider.png s1_slider_bg.png);
1926 2210
1927sub new { 2211sub new {
1928 my $class = shift; 2212 my $class = shift;
1929 2213
1930 # range [value, low, high, page] 2214 # range [value, low, high, page, unit]
1931 2215
1932 # TODO: 0-width page 2216 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2217 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2218 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2225 min_w => $::WIDTH / 80,
1940 req_h => 20, 2226 min_h => $::WIDTH / 80,
1941 vertical => 0, 2227 vertical => 0,
1942 can_hover => 1, 2228 can_hover => 1,
1943 inner_pad => 5, 2229 inner_pad => 0.02,
1944 @_ 2230 @_
1945 ); 2231 );
1946 2232
2233 $self->set_value ($self->{range}[0]);
2234 $self->update;
2235
1947 $self 2236 $self
1948} 2237}
1949 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
1950sub size_request { 2273sub size_request {
1951 my ($self) = @_; 2274 my ($self) = @_;
1952 2275
1953 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
1954 my $h = $self->{req_h};
1955
1956 $self->{vertical} ? ($h, $w) : ($w, $h)
1957} 2277}
1958 2278
1959sub button_down { 2279sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
1961 2281
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
1964} 2287}
1965 2288
1966sub mouse_motion { 2289sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
1968 2291
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
1971 2311
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2313
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2316
1977 $x -= $inner_pad_px; # substract the padding 2317 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2318 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2319
1983 $self->emit (changed => $x); 2320 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2321 $self->{knob_w} = $knob_w;
1985 } 2322 });
1986}
1987 2323
1988# the inner_* stuff is for generating a padding for the slider handle, 2324 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2325}
1995 2326
1996sub _draw { 2327sub _draw {
1997 my ($self) = @_; 2328 my ($self) = @_;
1998 2329
1999 $self->SUPER::_draw (); 2330 $self->SUPER::_draw ();
2000 2331
2001 my ($w, $h) = @$self{qw(w h)}; 2332 glScale $self->{w}, $self->{h};
2002 2333
2003 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
2005 2336
2337 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2339 }
2011 2340
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2343
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2344 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2346
2038 # draw background 2347 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2348 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2349
2041 # draw handle 2350 # draw handle
2042 $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);
2043 2352
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2046} 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 (@_) }
2047 2396
2048############################################################################# 2397#############################################################################
2049 2398
2050package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2051 2400
… …
2060 fontsize => 1, 2409 fontsize => 1,
2061 can_events => 0, 2410 can_events => 0,
2062 #font => default_font 2411 #font => default_font
2063 @_, 2412 @_,
2064 2413
2065 layout => (new CFClient::Layout), 2414 layout => (new CFClient::Layout 1),
2066 par => [], 2415 par => [],
2067 height => 0, 2416 height => 0,
2068 children => [ 2417 children => [
2069 (new CFClient::UI::Empty expand => 1), 2418 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2419 (new CFClient::UI::Slider vertical => 1),
2071 ], 2420 ],
2072 ); 2421 );
2073 2422
2074 $self->{children}[1]->connect (changed => sub { 2423 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2424
2078 $self 2425 $self
2079} 2426}
2080 2427
2081sub set_fontsize { 2428sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2429 my ($self, $fontsize) = @_;
2083 2430
2084 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2432 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2433}
2106 2434
2107sub size_allocate { 2435sub size_allocate {
2108 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2109 2437
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2443
2116 $self->reflow; 2444 $self->reflow;
2117} 2445}
2118 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
2119sub add_paragraph { 2481sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2121 2483
2122 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2123 2485 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2127 2489
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $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]);
2131 $self->{children}[1]->update;
2132} 2491}
2133 2492
2134sub update { 2493sub update {
2135 my ($self) = @_; 2494 my ($self) = @_;
2136 2495
… …
2138 2497
2139 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2140 2499
2141 delete $self->{texture}; 2500 delete $self->{texture};
2142 2501
2143 $ROOT->on_refresh ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2144 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2506 my $height = 0;
2146 2507
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2148 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 }
2149 2523
2150 $self->{height} = $height; 2524 $self->{height} = $height;
2151 2525
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2527
2154 delete $self->{texture}; 2528 delete $self->{texture};
2155 } 2529 }
2156 2530
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2160 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
2161 glEnable GL_BLEND; 2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2549
2177 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2551 my $h = $par->[1];
2179 2552
2180 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]);
2181 $layout->set_text ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2182 2557
2183 glColor @{ $par->[1] }; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2559
2185 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;
2186 } 2562 }
2187 2563
2188 $y += $h; 2564 $y += $h;
2189 } 2565 }
2190 2566
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2567 glDisable GL_BLEND;
2193 }; 2568 };
2194 }); 2569 });
2195} 2570}
2196 2571
2197sub _draw { 2572sub _draw {
2198 my ($self) = @_; 2573 my ($self) = @_;
2199 2574
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2204 $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});
2205 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2206 }
2207 2580
2208 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2209 2582
2210} 2583}
2211 2584
… …
2259 2632
2260sub new { 2633sub new {
2261 my $class = shift; 2634 my $class = shift;
2262 2635
2263 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2264 state => 0, 2637 state => 0,
2265 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2266 @_ 2639 @_
2267 ); 2640 );
2268 2641
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 2642 $self
2275} 2643}
2276 2644
2277sub toggle_flopper { 2645sub toggle_flopper {
2278 my ($self) = @_; 2646 my ($self) = @_;
2279 2647
2280 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 2649}
2292 2650
2293############################################################################# 2651#############################################################################
2294 2652
2295package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2305 @_, 2663 @_,
2306 can_events => 0, 2664 can_events => 0,
2307 ) 2665 )
2308} 2666}
2309 2667
2310sub set_markup { 2668sub set_tooltip_from {
2311 my ($self, $text) = @_; 2669 my ($self, $widget) = @_;
2312 2670
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2671 my $tooltip = $widget->{tooltip};
2314 $self->{label}->set_markup ($text); 2672
2315 $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 );
2316} 2688}
2317 2689
2318sub size_request { 2690sub size_request {
2319 my ($self) = @_; 2691 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2692
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2694
2325 ($w + 4, $h + 4) 2695 ($w + 4, $h + 4)
2326} 2696}
… …
2329 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2330 2700
2331 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332} 2702}
2333 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
2334sub _draw { 2722sub _draw {
2335 my ($self) = @_; 2723 my ($self) = @_;
2336 2724
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2725 glTranslate 0.375, 0.375;
2339 2726
2340 my ($w, $h) = @$self{qw(w h)}; 2727 my ($w, $h) = @$self{qw(w h)};
2341 2728
2342 glColor 1, 0.8, 0.4; 2729 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2740 glVertex 0 , $h;
2354 glVertex $w, $h; 2741 glVertex $w, $h;
2355 glVertex $w, 0; 2742 glVertex $w, 0;
2356 glEnd; 2743 glEnd;
2357 2744
2358 glPopMatrix; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2359 2746
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2362} 2748}
2363 2749
2364############################################################################# 2750#############################################################################
2365 2751
… …
2370use CFClient::OpenGL; 2756use CFClient::OpenGL;
2371 2757
2372sub new { 2758sub new {
2373 my $class = shift; 2759 my $class = shift;
2374 2760
2375 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2376 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2377 @_, 2764 @_,
2378 ) 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
2379} 2782}
2380 2783
2381sub size_request { 2784sub size_request {
2382 (32, 8) 2785 (32, 8)
2383} 2786}
2384 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2385sub draw { 2796sub _draw {
2386 my ($self) = @_; 2797 my ($self) = @_;
2387 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
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2811
2390 if ($tex) { 2812 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2818 }
2819}
2820
2821sub DESTROY {
2822 my ($self) = @_;
2823
2824 $self->{timer}->cancel
2825 if $self->{timer};
2826
2827 $self->SUPER::DESTROY;
2400} 2828}
2401 2829
2402############################################################################# 2830#############################################################################
2403 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
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
2404package CFClient::UI::Root; 3310package CFClient::UI::Root;
2405 3311
2406our @ISA = CFClient::UI::Container::; 3312our @ISA = CFClient::UI::Container::;
2407 3313
2408use CFClient::OpenGL; 3314use CFClient::OpenGL;
2409 3315
2410sub check_size { 3316sub new {
2411 my ($self) = @_; 3317 my $class = shift;
2412 3318
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3319 my $self = $class->SUPER::new (
3320 visible => 1,
3321 @_,
3322 );
3323
3324 Scalar::Util::weaken ($self->{root} = $self);
3325
3326 $self
2414} 3327}
2415 3328
2416sub size_request { 3329sub size_request {
2417 ($::WIDTH, $::HEIGHT) 3330 my ($self) = @_;
2418}
2419 3331
2420sub configure { 3332 ($self->{w}, $self->{h})
3333}
3334
3335sub _to_pixel {
3336 my ($coord, $size, $max) = @_;
3337
3338 $coord =
3339 $coord eq "center" ? ($max - $size) * 0.5
3340 : $coord eq "max" ? $max
3341 : $coord;
3342
3343 $coord = 0 if $coord < 0;
3344 $coord = $max - $size if $coord > $max - $size;
3345
3346 int $coord + 0.5
3347}
3348
3349sub size_allocate {
2421 my ($self, $x, $y, $w, $h) = @_; 3350 my ($self, $w, $h) = @_;
2422 3351
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) { 3352 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 3354
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3355 $X = $child->{force_x} if exists $child->{force_x};
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3356 $Y = $child->{force_y} if exists $child->{force_y};
3357
3358 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h};
3360
2430 $child->configure ($X, $Y, $W,$H); 3361 $child->configure ($X, $Y, $W, $H);
2431 } 3362 }
2432} 3363}
2433 3364
2434sub _topleft { 3365sub coord2local {
2435 my ($self, $x, $y) = @_; 3366 my ($self, $x, $y) = @_;
2436 3367
2437 ($x, $y) 3368 ($x, $y)
2438} 3369}
2439 3370
3371sub coord2global {
3372 my ($self, $x, $y) = @_;
3373
3374 ($x, $y)
3375}
3376
2440sub update { 3377sub update {
2441 my ($self) = @_; 3378 my ($self) = @_;
2442 3379
2443 $self->check_size; 3380 $::WANT_REFRESH++;
2444 ::refresh ();
2445} 3381}
2446 3382
2447sub add { 3383sub add {
2448 my ($self, $child) = @_; 3384 my ($self, @children) = @_;
2449 3385
2450 # integerize window positions 3386 $_->{is_toplevel} = 1
2451 $child->{x} = int $child->{x}; 3387 for @children;
2452 $child->{y} = int $child->{y};
2453 3388
2454 $self->SUPER::add ($child); 3389 $self->SUPER::add (@children);
3390}
3391
3392sub remove {
3393 my ($self, @children) = @_;
3394
3395 $self->SUPER::remove (@children);
3396
3397 delete $self->{is_toplevel}
3398 for @children;
3399
3400 while (@children) {
3401 my $w = pop @children;
3402 push @children, $w->children;
3403 $w->set_invisible;
3404 }
2455} 3405}
2456 3406
2457sub on_refresh { 3407sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3408 my ($self, $id, $cb) = @_;
2459 3409
2460 $self->{refresh_hook}{$id} = $cb; 3410 $self->{refresh_hook}{$id} = $cb;
2461} 3411}
2462 3412
3413sub on_post_alloc {
3414 my ($self, $id, $cb) = @_;
3415
3416 $self->{post_alloc_hook}{$id} = $cb;
3417}
3418
2463sub draw { 3419sub draw {
2464 my ($self) = @_; 3420 my ($self) = @_;
2465 3421
2466 while (my $rcb = delete $self->{refresh_hook}) { 3422 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3423 $_->()
3424 for values %{delete $self->{refresh_hook}};
2468 } 3425 }
3426
3427 if ($self->{realloc}) {
3428 my %queue;
3429 my @queue;
3430 my $widget;
3431
3432 outer:
3433 while () {
3434 if (my $realloc = delete $self->{realloc}) {
3435 for $widget (values %$realloc) {
3436 $widget->{visible} or next; # do not resize invisible widgets
3437
3438 $queue{$widget+0}++ and next; # duplicates are common
3439
3440 push @{ $queue[$widget->{visible}] }, $widget;
3441 }
3442 }
3443
3444 while () {
3445 @queue or last outer;
3446
3447 $widget = pop @{ $queue[-1] || [] }
3448 and last;
3449
3450 pop @queue;
3451 }
3452
3453 delete $queue{$widget+0};
3454
3455 my ($w, $h) = $widget->size_request;
3456
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3459
3460 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h};
3462
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3464 || delete $widget->{force_realloc}) {
3465 $widget->{req_w} = $w;
3466 $widget->{req_h} = $h;
3467
3468 $self->{size_alloc}{$widget+0} = $widget;
3469
3470 if (my $parent = $widget->{parent}) {
3471 $self->{realloc}{$parent+0} = $parent
3472 unless $queue{$parent+0};
3473
3474 $parent->{force_size_alloc} = 1;
3475 $self->{size_alloc}{$parent+0} = $parent;
3476 }
3477 }
3478
3479 delete $self->{realloc}{$widget+0};
3480 }
3481 }
3482
3483 while (my $size_alloc = delete $self->{size_alloc}) {
3484 my @queue = sort { $b->{visible} <=> $a->{visible} }
3485 values %$size_alloc;
3486
3487 while () {
3488 my $widget = pop @queue || last;
3489
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491
3492 $w = 0 if $w < 0;
3493 $h = 0 if $h < 0;
3494
3495 $w = int $w + 0.5;
3496 $h = int $h + 0.5;
3497
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3499 $widget->{old_w} = $widget->{w};
3500 $widget->{old_h} = $widget->{h};
3501
3502 $widget->{w} = $w;
3503 $widget->{h} = $h;
3504
3505 $widget->emit (size_allocate => $w, $h);
3506 }
3507 }
3508 }
3509
3510 while ($self->{post_alloc_hook}) {
3511 $_->()
3512 for values %{delete $self->{post_alloc_hook}};
3513 }
3514
2469 3515
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3516 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3518 glClear GL_COLOR_BUFFER_BIT;
2473 3519
2474 glMatrixMode GL_PROJECTION; 3520 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3521 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3523 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3524 glLoadIdentity;
2479 3525
3526 {
3527 package CFClient::UI::Base;
3528
3529 ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h});
3531 }
3532
2480 $self->_draw; 3533 $self->_draw;
2481} 3534}
2482 3535
2483############################################################################# 3536#############################################################################
2484 3537
2485package CFClient::UI; 3538package CFClient::UI;
2486 3539
2487$ROOT = new CFClient::UI::Root; 3540$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3541$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3542
24901 35431
2491 3544

Diff Legend

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