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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

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

Diff Legend

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