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

Diff Legend

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