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

Diff Legend

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