ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines