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.186 by root, Mon May 8 20:39:34 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 {
535 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
536 689
537 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
538 692
539 use sort 'stable'; 693 use sort 'stable';
540 694
541 $self->{children} = [ 695 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
544 ]; 698 ];
545 699
546 $child->check_size; 700 $self->realloc;
547 $self->update;
548} 701}
549 702
550sub children { 703sub children {
551 @{ $_[0]{children} } 704 @{ $_[0]{children} }
552} 705}
… …
557 delete $child->{parent}; 710 delete $child->{parent};
558 $child->hide; 711 $child->hide;
559 712
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 714
562 $self->check_size; 715 $self->realloc;
563 $self->update;
564} 716}
565 717
566sub clear { 718sub clear {
567 my ($self) = @_; 719 my ($self) = @_;
568 720
… …
572 for (@$children) { 724 for (@$children) {
573 delete $_->{parent}; 725 delete $_->{parent};
574 $_->hide; 726 $_->hide;
575 } 727 }
576 728
577 $self->check_size; 729 $self->realloc;
578 $self->update;
579} 730}
580 731
581sub find_widget { 732sub find_widget {
582 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
583 734
584 $x -= $self->{x}; 735 $x -= $self->{x};
585 $y -= $self->{y}; 736 $y -= $self->{y};
586 737
587 my $res; 738 my $res;
588 739
589 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
590 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
591 and return $res; 742 and return $res;
592 } 743 }
593 744
594 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
643 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
644} 795}
645 796
646############################################################################# 797#############################################################################
647 798
799# back-buffered drawing area
800
648package CFClient::UI::Window; 801package CFClient::UI::Window;
649 802
650our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
651 804
652use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
658} 811}
659 812
660sub update { 813sub update {
661 my ($self) = @_; 814 my ($self) = @_;
662 815
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 817 $self->SUPER::update;
665} 818}
666 819
667sub size_allocate { 820sub size_allocate {
668 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
… …
670 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
671 $self->update; 824 $self->update;
672} 825}
673 826
674sub _render { 827sub _render {
828 my ($self) = @_;
829
675 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
676} 831}
677 832
678sub render_child { 833sub render_child {
679 my ($self) = @_; 834 my ($self) = @_;
680 835
681 $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 {
682 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
684 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
685 $self->_render; 847 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 848 };
694} 849}
695 850
696sub _draw { 851sub _draw {
697 my ($self) = @_; 852 my ($self) = @_;
698 853
699 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
700 855
701 my $tex = $self->{texture} 856 my $tex = $self->{texture}
702 or return; 857 or return;
703 858
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
709 862
710 $tex->draw_quad (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 864
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
714} 866}
715 867
716############################################################################# 868#############################################################################
717 869
718package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
719 871
720our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
721 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
722sub size_request { 884sub size_request {
723 my ($self) = @_; 885 my ($self) = @_;
724 886
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 888
728 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
729} 893}
730 894
731sub size_allocate { 895sub size_allocate {
732 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 904 $self->update;
735} 905}
736 906
737sub set_offset { 907sub set_offset {
738 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 911 $self->{view_y} = int $y;
742 912
743 $self->update; 913 $self->update;
744} 914}
745 915
746# 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
747sub _topleft { 917sub coord2local {
748 my ($self, $x, $y) = @_; 918 my ($self, $x, $y) = @_;
749 919
750 $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)
751} 930}
752 931
753sub find_widget { 932sub find_widget {
754 my ($self, $x, $y) = @_; 933 my ($self, $x, $y) = @_;
755 934
… …
763} 942}
764 943
765sub _render { 944sub _render {
766 my ($self) = @_; 945 my ($self) = @_;
767 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
768 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
769 951
770 $self->SUPER::_render; 952 $self->SUPER::_render;
771} 953}
772 954
773############################################################################# 955#############################################################################
774 956
775package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
776 958
777our @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;
778 1023
779sub new { 1024sub new {
780 my $class = shift; 1025 my $class = shift;
781 1026
782 my $self;
783
784 my $slider = new CFClient::UI::Slider
785 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
789 },
790 ;
791
792 $self = $class->SUPER::new ( 1027 $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 1028 bg => undef,
794 slider => $slider,
795 @_, 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,
796 ); 1085 );
797 1086
798 $self->{vp}->add ($self->{scrolled});
799 $self->add ($self->{vp});
800 $self->add ($self->{slider});
801
802 $self
803}
804
805#TODO# update range on size_allocate depeneing on child
806# update viewport offset on scroll
807
808#############################################################################
809
810package CFClient::UI::Frame;
811
812our @ISA = CFClient::UI::Bin::;
813
814use CFClient::OpenGL;
815
816sub new {
817 my $class = shift;
818
819 my $self = $class->SUPER::new (
820 bg => [1, 1, 1, 1],
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_
824 );
825
826 $self
827}
828
829sub _draw {
830 my ($self) = @_;
831
832 my ($w, $h) = ($self->{w}, $self->{h});
833
834 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D;
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838
839# glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0;
842# glVertex 0 , $h;
843# glVertex $w, $h;
844# glVertex $w, 0;
845# glEnd;
846
847
848 $self->child->draw;
849 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D;
851}
852
853#############################################################################
854
855package CFClient::UI::FancyFrame;
856
857our @ISA = CFClient::UI::Bin::;
858
859use CFClient::OpenGL;
860
861my @tex =
862 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
863 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
864
865sub new {
866 my $class = shift;
867
868 # TODO: user_x, user_y, overwrite moveto?
869
870 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1],
873 border => 0.6,
874 can_events => 1,
875 @_
876 );
877
878 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
879 align => 0, 1088 align => 0,
880 valign => 1, 1089 valign => 1,
881 text => $self->{title}, 1090 text => $title,
882 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
883 1093
884 $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};
885} 1102}
886 1103
887sub border { 1104sub border {
888 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
889} 1106}
890 1107
891sub size_request { 1108sub size_request {
892 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
893 1113
894 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
895 1115
896 ( 1116 (
897 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
900} 1120}
901 1121
902sub size_allocate { 1122sub size_allocate {
903 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
904 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
905 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
907 1135
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
909 if $self->{title};
910
911 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
912} 1137}
913 1138
914sub button_down { 1139sub button_down {
915 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
916 1141
… …
932 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
933 1158
934 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
936 1161
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
940 $self->check_size;
941 }; 1167 };
942 1168
943 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
945 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
947 $self->{motion} = sub { 1173 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
949 1175
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
951 1177
952 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
953 $self->update;
954 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
955 } 1184 1
956} 1185}
957 1186
958sub button_up { 1187sub button_up {
959 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
960 1189
961 delete $self->{motion}; 1190 !!delete $self->{motion}
962} 1191}
963 1192
964sub mouse_motion { 1193sub mouse_motion {
965 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
966 1195
967 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
968} 1199}
969 1200
970sub _draw { 1201sub _draw {
971 my ($self) = @_; 1202 my ($self) = @_;
972 1203
1204 my $child = $self->{children}[0];
1205
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
975 1208
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1211
981 my $border = $self->border; 1212 my $border = $self->border;
982 1213
983 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1219
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
991 1222
992 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
993 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
994 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
995
996 glColor @{ $self->{bg} };
997
998 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1228 }
1002 1229
1003 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1231
1007 $self->{title}->draw if $self->{title};
1008
1009 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1010} 1238}
1011 1239
1012############################################################################# 1240#############################################################################
1013 1241
1014package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1022sub new { 1250sub new {
1023 my $class = shift; 1251 my $class = shift;
1024 1252
1025 $class->SUPER::new ( 1253 $class->SUPER::new (
1026 col_expand => [], 1254 col_expand => [],
1027 @_ 1255 @_,
1028 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1261}
1030 1262
1031sub add { 1263sub add {
1032 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1033 1265
1034 $child->set_parent ($self); 1266 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1036 1268
1037 $child->check_size; 1269 $self->realloc;
1038} 1270}
1039 1271
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# 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?
1045sub clear { 1273sub clear {
1046 my ($self) = @_; 1274 my ($self) = @_;
1047 1275
1048 my @children = $self->children; 1276 my @children = $self->children;
1049 delete $self->{children}; 1277 delete $self->{children};
… …
1051 for (@children) { 1279 for (@children) {
1052 delete $_->{parent}; 1280 delete $_->{parent};
1053 $_->hide; 1281 $_->hide;
1054 } 1282 }
1055 1283
1056 $self->update; 1284 $self->realloc;
1057} 1285}
1058 1286
1059sub get_wh { 1287sub get_wh {
1060 my ($self) = @_; 1288 my ($self) = @_;
1061 1289
… …
1092sub size_allocate { 1320sub size_allocate {
1093 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1094 1322
1095 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1096 1324
1097 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1099 1327
1100 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1157 } 1385 }
1158} 1386}
1159 1387
1160############################################################################# 1388#############################################################################
1161 1389
1162package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1163
1164# TODO: wrap into common Box base class
1165 1391
1166our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1167 1393
1168sub size_request { 1394sub size_request {
1169 my ($self) = @_; 1395 my ($self) = @_;
1170 1396
1171 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1172 1398 ? (
1173 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1174 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1175 (List::Util::max map $_->[1], @alloc), 1401 )
1176 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1177} 1406}
1178 1407
1179sub size_allocate { 1408sub size_allocate {
1180 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1181 1410
1182 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1183
1184 my $children = $self->{children}; 1412 my $children = $self->{children};
1185 1413
1186 my @h = map $_->{req_w}, @$children; 1414 my @req;
1187 1415
1188 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1189 1417 @req = ($space / (@$children || 1)) x @$children;
1190 if ($req_h > $h) {
1191 # ah well, not enough space
1192 $_ *= $h / $req_h for @h;
1193 } 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 {
1194 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1195 $exp ||= 1;
1196 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1197 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1198 my $child = $children->[$_];
1199
1200 my $alloc_h = $h[$_];
1201 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1202 $h[$_] = $alloc_h;
1203 } 1432 }
1204 } 1433 }
1205 1434
1206 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1207 1436
1208 my $y = 0; 1437 my $pos = 0;
1209 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1210 my $child = $children->[$_];
1211 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1212 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1213 1441
1214 $y += $h; 1442 $pos += $alloc;
1215 } 1443 }
1216 1444
1217 1 1445 1
1218} 1446}
1219 1447
1220############################################################################# 1448#############################################################################
1221 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
1222package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1223 1466
1224# TODO: wrap into common Box base class
1225
1226our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1227 1468
1228sub size_request { 1469sub new {
1229 my ($self) = @_; 1470 my $class = shift;
1230 1471
1231 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1232 1473 vertical => 1,
1233 ( 1474 @_,
1234 (List::Util::max map $_->[0], @alloc),
1235 (List::Util::sum map $_->[1], @alloc),
1236 ) 1475 )
1237} 1476}
1238 1477
1239sub size_allocate {
1240 my ($self, $w, $h) = @_;
1241
1242 my $children = $self->{children};
1243
1244 my @h = map $_->{req_h}, @$children;
1245
1246 my $req_h = List::Util::sum @h;
1247
1248 if ($req_h > $h) {
1249 # ah well, not enough space
1250 $_ *= $h / $req_h for @h;
1251 } else {
1252 my $exp = List::Util::sum map $_->{expand}, @$children;
1253 $exp ||= 1;
1254
1255 for (0 .. $#$children) {
1256 my $child = $children->[$_];
1257
1258 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1259 }
1260 }
1261
1262 CFClient::UI::harmonize \@h;
1263
1264 my $y = 0;
1265 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_];
1268 $child->configure (0, $y, $w, $h);
1269
1270 $y += $h;
1271 }
1272
1273 1
1274}
1275
1276############################################################################# 1478#############################################################################
1277 1479
1278package CFClient::UI::Label; 1480package CFClient::UI::Label;
1279 1481
1280our @ISA = CFClient::UI::Base::; 1482our @ISA = CFClient::UI::DrawBG::;
1281 1483
1282use CFClient::OpenGL; 1484use CFClient::OpenGL;
1283 1485
1284sub new { 1486sub new {
1285 my ($class, %arg) = @_; 1487 my ($class, %arg) = @_;
1286 1488
1287 my $self = $class->SUPER::new ( 1489 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1490 fg => [1, 1, 1],
1491 #bg => none
1492 #active_bg => none
1289 #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),
1290 fontsize => 1, 1499 fontsize => 1,
1291 text => "",
1292 align => -1, 1500 align => -1,
1293 valign => -1, 1501 valign => -1,
1294 padding => 2, 1502 padding_x => 2,
1295 layout => new CFClient::Layout, 1503 padding_y => 2,
1296 can_events => 0, 1504 can_events => 0,
1297 %arg 1505 %arg
1298 ); 1506 );
1299 1507
1300 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1509 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1510 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1511 $self->{template} = $layout;
1304 } 1512 }
1305 1513
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1514 if (exists $self->{markup}) {
1307 $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 }
1308 1519
1309 $self 1520 $self
1310} 1521}
1311 1522
1312sub escape { 1523sub escape($) {
1313 local $_ = $_[1]; 1524 local $_ = $_[0];
1314 1525
1315 s/&/&amp;/g; 1526 s/&/&amp;/g;
1316 s/>/&gt;/g; 1527 s/>/&gt;/g;
1317 s/</&lt;/g; 1528 s/</&lt;/g;
1318 1529
1319 $_[1] 1530 $_
1320} 1531}
1321 1532
1322sub update { 1533sub update {
1323 my ($self) = @_; 1534 my ($self) = @_;
1324 1535
… …
1330 my ($self, $text) = @_; 1541 my ($self, $text) = @_;
1331 1542
1332 return if $self->{text} eq "T$text"; 1543 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1334 1545
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1336 1548
1337 delete $self->{texture}; 1549 $self->realloc;
1338 $self->update; 1550 $self->update;
1339 $self->check_size;
1340} 1551}
1341 1552
1342sub set_markup { 1553sub set_markup {
1343 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1344 1555
1345 return if $self->{text} eq "M$markup"; 1556 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1557 $self->{text} = "M$markup";
1347 1558
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1349 1563
1350 delete $self->{texture}; 1564 $self->realloc;
1351 $self->update; 1565 $self->update;
1352 $self->check_size;
1353} 1566}
1354 1567
1355sub size_request { 1568sub size_request {
1356 my ($self) = @_; 1569 my ($self) = @_;
1357 1570
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1576
1362 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1363 1578
1364 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1369 1584
1370 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1371 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1372 } 1587 }
1373 1588
1374 ( 1589 ($w, $h)
1375 $w + $self->{padding} * 2,
1376 $h + $self->{padding} * 2,
1377 )
1378} 1590}
1379 1591
1380sub size_allocate { 1592sub size_allocate {
1381 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1382 1594
1595 delete $self->{ox};
1596
1383 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1384} 1599}
1385 1600
1386sub set_fontsize { 1601sub set_fontsize {
1387 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1388 1603
1389 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1390 delete $self->{texture}; 1605 delete $self->{texture};
1391 1606
1392 $self->update; 1607 $self->realloc;
1393 $self->check_size;
1394} 1608}
1395 1609
1396sub _draw { 1610sub _draw {
1397 my ($self) = @_; 1611 my ($self) = @_;
1398 1612
1613 $self->SUPER::_draw; # draw background, if applicable
1614
1399 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622
1403 new_from_layout CFClient::Texture $self->{layout} 1623 new_from_layout CFClient::Texture $self->{layout}
1404 }; 1624 };
1405 1625
1406 glEnable GL_BLEND; 1626 unless (exists $self->{ox}) {
1407 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
1408 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1638
1639 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1640 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1645
1427 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1647}
1430 1648
1431############################################################################# 1649#############################################################################
1432 1650
1433package CFClient::UI::EntryBase; 1651package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1447 can_hover => 1, 1665 can_hover => 1,
1448 can_focus => 1, 1666 can_focus => 1,
1449 valign => 0, 1667 valign => 0,
1450 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1451 @_ 1670 @_
1452 ) 1671 )
1453} 1672}
1454 1673
1455sub _set_text { 1674sub _set_text {
… …
1465 $self->{text} = $text; 1684 $self->{text} = $text;
1466 1685
1467 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1469 1688
1470 $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;
1471} 1699}
1472 1700
1473sub get_text { 1701sub get_text {
1474 $_[0]{text} 1702 $_[0]{text}
1475} 1703}
… …
1478 my ($self) = @_; 1706 my ($self) = @_;
1479 1707
1480 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1481 1709
1482 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text {
1492 my ($self, $text) = @_;
1493
1494 $self->{cursor} = length $text;
1495 $self->_set_text ($text);
1496 $self->update;
1497} 1711}
1498 1712
1499sub key_down { 1713sub key_down {
1500 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1501 1715
… …
1503 my $sym = $ev->{sym}; 1717 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1718 my $uni = $ev->{unicode};
1505 1719
1506 my $text = $self->get_text; 1720 my $text = $self->get_text;
1507 1721
1508 if ($sym == 8) { 1722 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1724 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1725 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1726 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1727 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1728 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1729 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1734 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1735 $self->_emit ('escape');
1522 } elsif ($uni) { 1736 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1524 } 1740 }
1525 1741
1526 $self->_set_text ($text); 1742 $self->_set_text ($text);
1527 $self->update; 1743
1744 $self->realloc;
1745
1746 1
1528} 1747}
1529 1748
1530sub focus_in { 1749sub focus_in {
1531 my ($self) = @_; 1750 my ($self) = @_;
1532 1751
… …
1547 utf8::encode $text; 1766 utf8::encode $text;
1548 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1549 1768
1550 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1551 $self->update; 1770 $self->update;
1771
1772 1
1552} 1773}
1553 1774
1554sub mouse_motion { 1775sub mouse_motion {
1555 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1556# 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
1557} 1780}
1558 1781
1559sub _draw { 1782sub _draw {
1560 my ($self) = @_; 1783 my ($self) = @_;
1561 1784
… …
1612 if ($sym == 13) { 1835 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1618 $self->update; 1841 $self->update;
1619 1842
1620 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1638 } else { 1861 } else {
1639 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1640 } 1863 }
1641 1864
1642 } else { 1865 } else {
1643 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1644 } 1869 1
1645
1646} 1870}
1647 1871
1648############################################################################# 1872#############################################################################
1649 1873
1650package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1659 1883
1660sub new { 1884sub new {
1661 my $class = shift; 1885 my $class = shift;
1662 1886
1663 $class->SUPER::new ( 1887 $class->SUPER::new (
1664 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1665 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1668 can_hover => 1, 1892 can_hover => 1,
1669 align => 0, 1893 align => 0,
1670 valign => 0, 1894 valign => 0,
1671 can_events => 1, 1895 can_events => 1,
1672 @_ 1896 @_
1673 ) 1897 )
1674} 1898}
1675 1899
1900sub activate { }
1901
1676sub button_up { 1902sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1678 1904
1905 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate"); 1908
1682 } 1909 1
1683} 1910}
1684 1911
1685sub _draw { 1912sub _draw {
1686 my ($self) = @_; 1913 my ($self) = @_;
1687 1914
… …
1689 1916
1690 if ($GRAB == $self) { 1917 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1692 } 1919 }
1693 1920
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1921 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1923 glColor 0, 0, 0, 1;
1699 1924
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1925 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1926
1702 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1928
1705 $self->SUPER::_draw; 1929 $self->SUPER::_draw;
1706} 1930}
1707 1931
1708############################################################################# 1932#############################################################################
… …
1719 1943
1720sub new { 1944sub new {
1721 my $class = shift; 1945 my $class = shift;
1722 1946
1723 $class->SUPER::new ( 1947 $class->SUPER::new (
1724 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1725 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1954 state => 0,
1728 can_hover => 1, 1955 can_hover => 1,
1729 @_ 1956 @_
1730 ) 1957 )
1731} 1958}
1732 1959
1733sub size_request { 1960sub size_request {
1734 my ($self) = @_; 1961 my ($self) = @_;
1735 1962
1736 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1737} 1964}
1738 1965
1739sub button_down { 1966sub button_down {
1740 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1741 1968
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1744 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1746 } 1977 1
1747} 1978}
1748 1979
1749sub _draw { 1980sub _draw {
1750 my ($self) = @_; 1981 my ($self) = @_;
1751 1982
1752 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1753 1984
1754 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1755 1986
1756 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;
1757 1990
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1992
1760 glEnable GL_BLEND; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1994
1761 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1996 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1997 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1998}
1771 1999
1772############################################################################# 2000#############################################################################
1773 2001
1774package CFClient::UI::Image; 2002package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 2045 glTranslate 0, -$self->{w}, 0;
1818 2046
1819 ($w, $h) = ($h, $w); 2047 ($w, $h) = ($h, $w);
1820 } 2048 }
1821 2049
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 2050 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2051 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 2052
1827 $tex->draw_quad (0, 0, $w, $h); 2053 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 2054
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 2055 glDisable GL_TEXTURE_2D;
1831} 2056}
1832 2057
1833############################################################################# 2058#############################################################################
1834 2059
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2248 qw(s1_slider.png s1_slider_bg.png);
2024 2249
2025sub new { 2250sub new {
2026 my $class = shift; 2251 my $class = shift;
2027 2252
2028 # range [value, low, high, page] 2253 # range [value, low, high, page, unit]
2029 2254
2030 # TODO: 0-width page 2255 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2256 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2257 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2258 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2263 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2039 vertical => 0, 2266 vertical => 0,
2040 can_hover => 1, 2267 can_hover => 1,
2041 inner_pad => 5, 2268 inner_pad => 0.02,
2042 @_ 2269 @_
2043 ); 2270 );
2044 2271
2272 $self->set_value ($self->{range}[0]);
2273 $self->update;
2274
2045 $self 2275 $self
2046} 2276}
2047 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
2048sub size_request { 2312sub size_request {
2049 my ($self) = @_; 2313 my ($self) = @_;
2050 2314
2051 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2052 my $h = $self->{req_h};
2053
2054 $self->{vertical} ? ($h, $w) : ($w, $h)
2055} 2316}
2056 2317
2057sub button_down { 2318sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2059 2320
2060 $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
2061 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2062} 2326}
2063 2327
2064sub mouse_motion { 2328sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2066 2330
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2360 my $range = ($hi - $page - $lo) || 1e-100;
2069 2361
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2362 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2363
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2364 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2365 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2366
2075 $x -= $inner_pad_px; # substract the padding 2367 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2368 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2369
2081 $self->emit (changed => $x); 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2371 $self->{knob_w} = $knob_w;
2083 } 2372 }
2084}
2085
2086# the inner_* stuff is for generating a padding for the slider handle,
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092}
2093
2094sub _draw {
2095 my ($self) = @_;
2096 2373
2097 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2098 2375
2099 my ($w, $h) = @$self{qw(w h)}; 2376 glScale $self->{w}, $self->{h};
2100 2377
2101 if ($self->{vertical}) { 2378 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2379 # draw a vertical slider like a rotated horizontal slider
2103 2380
2381 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2382 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2383 }
2109 2384
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2385 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2386 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2387
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2388 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2390
2136 # draw background 2391 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2392 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2393
2139 # draw handle 2394 # draw handle
2140 $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);
2141 2396
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
2144} 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 (@_) }
2145 2440
2146############################################################################# 2441#############################################################################
2147 2442
2148package CFClient::UI::TextView; 2443package CFClient::UI::TextView;
2149 2444
… …
2158 fontsize => 1, 2453 fontsize => 1,
2159 can_events => 0, 2454 can_events => 0,
2160 #font => default_font 2455 #font => default_font
2161 @_, 2456 @_,
2162 2457
2163 layout => (new CFClient::Layout), 2458 layout => (new CFClient::Layout 1),
2164 par => [], 2459 par => [],
2165 height => 0, 2460 height => 0,
2166 children => [ 2461 children => [
2167 (new CFClient::UI::Empty expand => 1), 2462 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2463 (new CFClient::UI::Slider vertical => 1),
… …
2179 2474
2180 $self->{fontsize} = $fontsize; 2475 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2476 $self->reflow;
2182} 2477}
2183 2478
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2479sub size_allocate {
2204 my ($self, $w, $h) = @_; 2480 my ($self, $w, $h) = @_;
2205 2481
2206 $self->SUPER::size_allocate ($w, $h); 2482 $self->SUPER::size_allocate ($w, $h);
2207 2483
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2486 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2487
2212 $self->reflow; 2488 $self->reflow;
2213} 2489}
2214 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
2215sub add_paragraph { 2525sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2526 my ($self, $color, $text, $indent) = @_;
2217 2527
2218 #TODO: intelligently "reformat" paragraph 2528 for my $line (split /\n/, $text) {
2219 2529 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2530 $self->{height} += $h;
2531 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2532 }
2223 2533
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $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]);
2227 $self->{children}[1]->update;
2228} 2535}
2229 2536
2230sub update { 2537sub update {
2231 my ($self) = @_; 2538 my ($self) = @_;
2232 2539
… …
2234 2541
2235 return unless $self->{h} > 0; 2542 return unless $self->{h} > 0;
2236 2543
2237 delete $self->{texture}; 2544 delete $self->{texture};
2238 2545
2239 $ROOT->on_refresh ($self, sub { 2546 $ROOT->on_post_alloc ($self, sub {
2547 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2548
2240 if (delete $self->{need_reflow}) { 2549 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2550 my $height = 0;
2242 2551
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2552 my $layout = $self->{layout};
2553
2554 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2555
2244 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 }
2245 2567
2246 $self->{height} = $height; 2568 $self->{height} = $height;
2247 2569
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2570 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2571
2250 delete $self->{texture}; 2572 delete $self->{texture};
2251 } 2573 }
2252 2574
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2576 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2577 glClear GL_COLOR_BUFFER_BIT;
2256 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
2257 glEnable GL_BLEND; 2590 glEnable GL_BLEND;
2591 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2592 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2593
2273 for my $par (@{$self->{par}}) { 2594 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2595 my $h = $par->[1];
2275 2596
2276 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]);
2277 $layout->set_text ($par->[2]); 2600 $layout->set_markup ($par->[4]);
2278 2601
2279 glColor @{ $par->[1] }; 2602 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2603
2281 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;
2282 } 2606 }
2283 2607
2284 $y += $h; 2608 $y += $h;
2285 } 2609 }
2286 2610
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2611 glDisable GL_BLEND;
2289 }; 2612 };
2290 }); 2613 });
2291} 2614}
2292 2615
2293sub _draw { 2616sub _draw {
2294 my ($self) = @_; 2617 my ($self) = @_;
2295 2618
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2619 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2621 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2624
2305 $self->{children}[1]->draw; 2625 $self->{children}[1]->draw;
2306 2626
2307} 2627}
2308 2628
… …
2356 2676
2357sub new { 2677sub new {
2358 my $class = shift; 2678 my $class = shift;
2359 2679
2360 my $self = $class->SUPER::new ( 2680 my $self = $class->SUPER::new (
2361 state => 0, 2681 state => 0,
2362 connect_activate => \&toggle_flopper, 2682 on_activate => \&toggle_flopper,
2363 @_ 2683 @_
2364 ); 2684 );
2365 2685
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2686 $self
2372} 2687}
2373 2688
2374sub toggle_flopper { 2689sub toggle_flopper {
2375 my ($self) = @_; 2690 my ($self) = @_;
2376 2691
2377 # TODO: use animation 2692 $self->{other}->toggle_visibility;
2378 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open");
2382 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close");
2385 }
2386
2387 $self->emit (changed => $self->{state});
2388} 2693}
2389 2694
2390############################################################################# 2695#############################################################################
2391 2696
2392package CFClient::UI::Tooltip; 2697package CFClient::UI::Tooltip;
… …
2402 @_, 2707 @_,
2403 can_events => 0, 2708 can_events => 0,
2404 ) 2709 )
2405} 2710}
2406 2711
2407sub set_markup { 2712sub set_tooltip_from {
2408 my ($self, $text) = @_; 2713 my ($self, $widget) = @_;
2409 2714
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2715 my $tooltip = $widget->{tooltip};
2411 $self->{label}->set_markup ($text); 2716
2412 $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 );
2413} 2732}
2414 2733
2415sub size_request { 2734sub size_request {
2416 my ($self) = @_; 2735 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2736
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2737 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2738
2422 ($w + 4, $h + 4) 2739 ($w + 4, $h + 4)
2423} 2740}
… …
2426 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2427 2744
2428 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2429} 2746}
2430 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
2431sub _draw { 2766sub _draw {
2432 my ($self) = @_; 2767 my ($self) = @_;
2433 2768
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2769 glTranslate 0.375, 0.375;
2436 2770
2437 my ($w, $h) = @$self{qw(w h)}; 2771 my ($w, $h) = @$self{qw(w h)};
2438 2772
2439 glColor 1, 0.8, 0.4; 2773 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2784 glVertex 0 , $h;
2451 glVertex $w, $h; 2785 glVertex $w, $h;
2452 glVertex $w, 0; 2786 glVertex $w, 0;
2453 glEnd; 2787 glEnd;
2454 2788
2455 glPopMatrix; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2456 2790
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2459} 2792}
2460 2793
2461############################################################################# 2794#############################################################################
2462 2795
… …
2467use CFClient::OpenGL; 2800use CFClient::OpenGL;
2468 2801
2469sub new { 2802sub new {
2470 my $class = shift; 2803 my $class = shift;
2471 2804
2472 $class->SUPER::new ( 2805 my $self = $class->SUPER::new (
2473 aspect => 1, 2806 aspect => 1,
2807 can_events => 0,
2474 @_, 2808 @_,
2475 ) 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
2476} 2826}
2477 2827
2478sub size_request { 2828sub size_request {
2479 (32, 8) 2829 (32, 8)
2480} 2830}
2481 2831
2832sub update {
2833 my ($self) = @_;
2834
2835 return unless $self->{visible};
2836
2837 $self->SUPER::update;
2838}
2839
2482sub _draw { 2840sub _draw {
2483 my ($self) = @_; 2841 my ($self) = @_;
2484 2842
2485 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2854 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2855
2488 # TODO animation
2489 if ($tex) { 2856 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2857 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2859 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2860 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2861 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2862 }
2863}
2864
2865sub DESTROY {
2866 my ($self) = @_;
2867
2868 $self->{timer}->cancel
2869 if $self->{timer};
2870
2871 $self->SUPER::DESTROY;
2499} 2872}
2500 2873
2501############################################################################# 2874#############################################################################
2502 2875
2503package CFClient::UI::InventoryItem; 2876package CFClient::UI::Buttonbar;
2504 2877
2505our @ISA = CFClient::UI::HBox::; 2878our @ISA = CFClient::UI::HBox::;
2506 2879
2507sub new { 2880# TODO: should actualyl wrap buttons and other goodies.
2508 my $class = shift;
2509
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new (
2520 can_hover => 1,
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_,
2575 );
2576
2577 $self
2578}
2579
2580sub set_items {
2581 my ($self, $items) = @_;
2582
2583 $self->{scrolled}->clear;
2584 return unless $items;
2585
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2587
2588 $self->{real_items} = \@items;
2589
2590 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2596 }
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605 2881
2606############################################################################# 2882#############################################################################
2607 2883
2608package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2609 2885
… …
2643 2919
2644# 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)
2645sub popup { 2921sub popup {
2646 my ($self, $ev) = @_; 2922 my ($self, $ev) = @_;
2647 2923
2648 $self->emit ("popdown"); 2924 $self->_emit ("popdown");
2649 2925
2650 # maybe save $GRAB? must be careful about events... 2926 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2927 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2928 $self->{button} = $ev->{button};
2653 2929
2654 $self->show; 2930 $self->show;
2655 $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);
2656} 2932}
2657 2933
2658sub mouse_motion { 2934sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2660 2936
2661 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2664} 2942}
2665 2943
2666sub button_up { 2944sub button_up {
2667 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2668 2946
2669 if ($ev->{button} == $self->{button}) { 2947 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2948 undef $GRAB;
2671 $self->hide; 2949 $self->hide;
2672 2950
2673 $self->emit ("popdown"); 2951 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2675 } 2957 1
2676} 2958}
2677 2959
2678############################################################################# 2960#############################################################################
2679 2961
2680package CFClient::UI::Root; 2962package CFClient::UI::Multiplexer;
2681 2963
2682our @ISA = CFClient::UI::Container::; 2964our @ISA = CFClient::UI::Container::;
2683 2965
2684use CFClient::OpenGL; 2966sub new {
2967 my $class = shift;
2685 2968
2686sub 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 {
2687 my ($self) = @_; 2980 my ($self, @widgets) = @_;
2688 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;
2689 $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}
2690} 3005}
2691 3006
2692sub size_request { 3007sub size_request {
2693 my ($self) = @_; 3008 my ($self) = @_;
2694 3009
2695 ($self->{w}, $self->{h}) 3010 $self->{current}->size_request
2696} 3011}
2697 3012
2698sub size_allocate { 3013sub size_allocate {
2699 my ($self, $w, $h) = @_; 3014 my ($self, $w, $h) = @_;
2700 3015
2701 my $old_w = $self->{old_w}; 3016 $self->{current}->configure (0, 0, $w, $h);
2702 my $old_h = $self->{old_h}; 3017}
2703 3018
2704 if ($old_w && $old_h) { 3019sub _draw {
2705 for my $child ($self->children) { 3020 my ($self) = @_;
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w; 3021
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w; 3022 $self->{current}->draw;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w}; 3023}
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w}; 3024
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h; 3025#############################################################################
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h; 3026
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 3027package CFClient::UI::Notebook;
2713 $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;
2714 } 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 };
2715 } 3163 }
2716 3164
2717 $self->{old_w} = $w; 3165 $self->reorder;
2718 $self->{old_h} = $h;
2719} 3166}
2720 3167
2721sub 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 {
2722 my ($self, $x, $y, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725 3516
2726 for my $child ($self->children) { 3517 for my $child ($self->children) {
2727 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)};
2728 3519
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3520 $X = $child->{force_x} if exists $child->{force_x};
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 3526 $child->configure ($X, $Y, $W, $H);
2732 } 3527 }
2733} 3528}
2734 3529
2735sub _topleft { 3530sub coord2local {
2736 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2737 3532
2738 ($x, $y) 3533 ($x, $y)
2739} 3534}
2740 3535
3536sub coord2global {
3537 my ($self, $x, $y) = @_;
3538
3539 ($x, $y)
3540}
3541
2741sub update { 3542sub update {
2742 my ($self) = @_; 3543 my ($self) = @_;
2743 3544
2744 $self->check_size; 3545 $::WANT_REFRESH++;
2745 ::refresh ();
2746} 3546}
2747 3547
2748sub add { 3548sub add {
2749 my ($self, $child) = @_; 3549 my ($self, @children) = @_;
2750 3550
2751 # integerize window positions 3551 $_->{is_toplevel} = 1
2752 $child->{x} = int $child->{x}; 3552 for @children;
2753 $child->{y} = int $child->{y};
2754 3553
2755 $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 }
2756} 3570}
2757 3571
2758sub on_refresh { 3572sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3573 my ($self, $id, $cb) = @_;
2760 3574
2761 $self->{refresh_hook}{$id} = $cb; 3575 $self->{refresh_hook}{$id} = $cb;
2762} 3576}
2763 3577
3578sub on_post_alloc {
3579 my ($self, $id, $cb) = @_;
3580
3581 $self->{post_alloc_hook}{$id} = $cb;
3582}
3583
2764sub draw { 3584sub draw {
2765 my ($self) = @_; 3585 my ($self) = @_;
2766 3586
2767 while (my $rcb = delete $self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3588 $_->()
3589 for values %{delete $self->{refresh_hook}};
2769 } 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
2770 3680
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
2774 3684
2775 glMatrixMode GL_PROJECTION; 3685 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3686 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3689 glLoadIdentity;
2780 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
2781 $self->_draw; 3698 $self->_draw;
2782} 3699}
2783 3700
2784############################################################################# 3701#############################################################################
2785 3702
2786package CFClient::UI; 3703package CFClient::UI;
2787 3704
2788$ROOT = new CFClient::UI::Root; 3705$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3706$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3707
27911 37081
2792 3709

Diff Legend

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