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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines