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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines