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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines