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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

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