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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

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

Diff Legend

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