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

Diff Legend

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