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.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 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) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 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
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 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 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 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};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
236 if $self->{parent}; 314 if $self->{parent};
237} 315}
238 316
239sub move { 317sub move_abs {
240 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
241 319
242 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
245 323
246 $self->update; 324 $self->update;
247} 325}
248 326
249sub set_size { 327sub set_size {
250 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
251 329
252 $self->{user_w} = $w; 330 $self->{force_w} = $w;
253 $self->{user_h} = $h; 331 $self->{force_h} = $h;
254 332
255 $self->check_size; 333 $self->realloc;
256} 334}
257 335
258sub size_request { 336sub size_request {
259 require Carp; 337 require Carp;
260 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
262 340
263sub configure { 341sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
265 343
266 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
269 349
270 # use alignment to adjust x, y 350 # use alignment to adjust x, y
271 351
272 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 354 }
277 355
278 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 357 $self->{x} = $x;
280 $self->{y} = $y; 358 $self->{y} = $y;
281 $self->update; 359 $self->update;
282 } 360 }
283 361
284 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 369 }
287} 370}
288 371
289sub size_allocate { 372sub size_allocate {
290 # nothing to be done 373 # nothing to be done
291} 374}
292 375
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
301} 382}
302 383
303sub set_max_size { 384sub set_max_size {
304 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
305 386
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
308} 391}
309 392
310sub set_tooltip { 393sub set_tooltip {
311 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
312 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
313 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
314 402
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 406 }
319} 407}
320 408
321# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
322sub coord2local { 410sub coord2local {
… …
338 return if $FOCUS == $self; 426 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
340 428
341 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
342 430
343 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
344 432
345 $focus->update if $focus; 433 $focus->update if $focus;
346 $FOCUS->update; 434 $FOCUS->update;
347} 435}
348 436
… …
351 439
352 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
353 441
354 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
355 443
356 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
357 445
358 $focus->update if $focus; #? 446 $focus->update if $focus; #?
359}
360 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
361sub mouse_motion { } 452sub mouse_motion { 0 }
362sub button_up { } 453sub button_up { 0 }
363sub key_down { } 454sub key_down { 0 }
364sub key_up { } 455sub key_up { 0 }
365 456
366sub button_down { 457sub button_down {
367 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
368 459
369 $self->focus_in; 460 $self->focus_in;
370}
371 461
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
376sub 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
377 538
378sub draw { 539sub draw {
379 my ($self) = @_; 540 my ($self) = @_;
380 541
381 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);
382 553
383 glPushMatrix; 554 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 556
388 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 559 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 561 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 562 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
412 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;
413 glPopMatrix; 580 glPopMatrix;
414 #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;
415 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
416} 586}
417 587
418sub _draw { 588sub _draw {
419 my ($self) = @_; 589 my ($self) = @_;
420 590
421 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 592}
473 593
474sub DESTROY { 594sub DESTROY {
475 my ($self) = @_; 595 my ($self) = @_;
476 596
… …
508 628
509 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
511 631
512 glEnable GL_BLEND; 632 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 634 glColor_premultiply @$color;
515 635
516 glBegin GL_QUADS; 636 glBegin GL_QUADS;
517 glVertex 0 , 0; 637 glVertex 0 , 0;
518 glVertex 0 , $h; 638 glVertex 0 , $h;
519 glVertex $w, $h; 639 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
536} 656}
537 657
538sub size_request { 658sub size_request {
539 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
540} 662}
541 663
542sub draw { } 664sub draw { }
543 665
544############################################################################# 666#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
549 671
550sub new { 672sub new {
551 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
552 674
553 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
554 676
555 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
556 children => [], 678 children => [],
557 can_events => 0, 679 can_events => 0,
558 %arg, 680 %arg,
559 ); 681 );
682
560 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
561 685
562 $self 686 $self
563} 687}
564 688
565sub add { 689sub add {
… …
573 $self->{children} = [ 697 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
576 ]; 700 ];
577 701
578 $self->check_size (1); 702 $self->realloc;
579 $self->update;
580} 703}
581 704
582sub children { 705sub children {
583 @{ $_[0]{children} } 706 @{ $_[0]{children} }
584} 707}
… …
589 delete $child->{parent}; 712 delete $child->{parent};
590 $child->hide; 713 $child->hide;
591 714
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 716
594 $self->check_size; 717 $self->realloc;
595 $self->update;
596} 718}
597 719
598sub clear { 720sub clear {
599 my ($self) = @_; 721 my ($self) = @_;
600 722
… …
604 for (@$children) { 726 for (@$children) {
605 delete $_->{parent}; 727 delete $_->{parent};
606 $_->hide; 728 $_->hide;
607 } 729 }
608 730
609 $self->check_size; 731 $self->realloc;
610 $self->update;
611} 732}
612 733
613sub find_widget { 734sub find_widget {
614 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
615 736
616 $x -= $self->{x}; 737 $x -= $self->{x};
617 $y -= $self->{y}; 738 $y -= $self->{y};
618 739
619 my $res; 740 my $res;
620 741
621 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
623 and return $res; 744 and return $res;
624 } 745 }
625 746
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
676} 797}
677 798
678############################################################################# 799#############################################################################
679 800
801# back-buffered drawing area
802
680package CFClient::UI::Window; 803package CFClient::UI::Window;
681 804
682our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
683 806
684use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 826 $self->update;
704} 827}
705 828
706sub _render { 829sub _render {
830 my ($self) = @_;
831
707 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
708} 833}
709 834
710sub render_child { 835sub render_child {
711 my ($self) = @_; 836 my ($self) = @_;
712 837
713 $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 {
714 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 849 $self->_render;
718 }; 850 };
719} 851}
720 852
721sub _draw { 853sub _draw {
722 my ($self) = @_; 854 my ($self) = @_;
723 855
724 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
725 857
726 my $tex = $self->{texture} 858 my $tex = $self->{texture}
727 or return; 859 or return;
728 860
729 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
732 864
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 866
735 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
736} 868}
… …
739 871
740package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
741 873
742our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
743 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
744sub size_request { 886sub size_request {
745 my ($self) = @_; 887 my ($self) = @_;
746 888
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 890
749 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
750} 895}
751 896
752sub size_allocate { 897sub size_allocate {
753 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
754 899
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
756# $w = $self->{w}; 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
757 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
758 $self->update; 906 $self->update;
759} 907}
760 908
761sub set_offset { 909sub set_offset {
762 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
796} 944}
797 945
798sub _render { 946sub _render {
799 my ($self) = @_; 947 my ($self) = @_;
800 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
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 953
803 $self->SUPER::_render; 954 $self->SUPER::_render;
804} 955}
805 956
… …
808package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
809 960
810our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
811 962
812sub new { 963sub new {
813 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
814 967
815 my $self; 968 my $self;
816 969
817 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
818 vertical => 1, 971 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 973 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
822 }, 975 },
823 ; 976 ;
824 977
825 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 980 slider => $slider,
828 @_, 981 %arg,
829 ); 982 );
830 983
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
834 986
835 $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]);
836} 1013}
837 1014
838#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1016# update viewport offset on scroll
840 1017
… …
860 1037
861 if ($self->{bg}) { 1038 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
863 1040
864 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
867 1044
868 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
869 glVertex 0 , 0; 1046 glVertex 0 , 0;
870 glVertex 0 , $h; 1047 glVertex 0 , $h;
871 glVertex $w, $h; 1048 glVertex $w, $h;
… …
884 1061
885our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
886 1063
887use CFClient::OpenGL; 1064use CFClient::OpenGL;
888 1065
889my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 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);
892 1073
893sub new { 1074sub new {
894 my $class = shift; 1075 my ($class, %arg) = @_;
895 1076
896 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
897 1078
898 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1082 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1083 can_events => 1,
904 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
905 ); 1087 );
906 1088
907 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
908 align => 0, 1090 align => 0,
909 valign => 1, 1091 valign => 1,
910 text => $self->{title}, 1092 text => $title,
911 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
912 1095
913 $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};
914} 1104}
915 1105
916sub border { 1106sub border {
917 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
918} 1108}
919 1109
920sub size_request { 1110sub size_request {
921 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
922 1115
923 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
924 1117
925 ( 1118 (
926 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
929} 1122}
930 1123
931sub size_allocate { 1124sub size_allocate {
932 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
933 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
934 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
936 1137
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
941} 1139}
942 1140
943sub button_down { 1141sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
945 1143
… …
961 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
962 1160
963 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
965 1163
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1168 $self->realloc;
970 }; 1169 };
971 1170
972 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1175 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
978 1177
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
980 1179
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
984 } 1188 1
985} 1189}
986 1190
987sub button_up { 1191sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
989 1193
990 delete $self->{motion}; 1194 !!delete $self->{motion}
991} 1195}
992 1196
993sub mouse_motion { 1197sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
995 1199
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
997} 1203}
998 1204
999sub _draw { 1205sub _draw {
1000 my ($self) = @_; 1206 my ($self) = @_;
1001 1207
1208 my $child = $self->{children}[0];
1209
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1212
1005 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1215
1008 my $border = $self->border; 1216 my $border = $self->border;
1009 1217
1010 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1223
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1018 1226
1019 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1232 }
1030 1233
1031 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1032 1235
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1036} 1242}
1037 1243
1038############################################################################# 1244#############################################################################
1039 1245
1040package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1048sub new { 1254sub new {
1049 my $class = shift; 1255 my $class = shift;
1050 1256
1051 $class->SUPER::new ( 1257 $class->SUPER::new (
1052 col_expand => [], 1258 col_expand => [],
1053 @_ 1259 @_,
1054 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1265}
1056 1266
1057sub add { 1267sub add {
1058 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1059 1269
1060 $child->set_parent ($self); 1270 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1062 1272
1063 $child->check_size; 1273 $self->realloc;
1064} 1274}
1065 1275
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# 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?
1071sub clear { 1277sub clear {
1072 my ($self) = @_; 1278 my ($self) = @_;
1073 1279
1074 my @children = $self->children; 1280 my @children = $self->children;
1075 delete $self->{children}; 1281 delete $self->{children};
… …
1077 for (@children) { 1283 for (@children) {
1078 delete $_->{parent}; 1284 delete $_->{parent};
1079 $_->hide; 1285 $_->hide;
1080 } 1286 }
1081 1287
1082 $self->update; 1288 $self->realloc;
1083} 1289}
1084 1290
1085sub get_wh { 1291sub get_wh {
1086 my ($self) = @_; 1292 my ($self) = @_;
1087 1293
… …
1118sub size_allocate { 1324sub size_allocate {
1119 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1120 1326
1121 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1122 1328
1123 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1125 1331
1126 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1389 }
1184} 1390}
1185 1391
1186############################################################################# 1392#############################################################################
1187 1393
1188package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1395
1192our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1193 1397
1194sub size_request { 1398sub size_request {
1195 my ($self) = @_; 1399 my ($self) = @_;
1196 1400
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1198 1402 ? (
1199 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1405 )
1202 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1203} 1410}
1204 1411
1205sub size_allocate { 1412sub size_allocate {
1206 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1207 1414
1208 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1416 my $children = $self->{children};
1211 1417
1212 my @h = map $_->{req_w}, @$children; 1418 my @req;
1213 1419
1214 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1215 1421 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } 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 {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1436 }
1230 } 1437 }
1231 1438
1232 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1233 1440
1234 my $y = 0; 1441 my $pos = 0;
1235 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1445
1240 $y += $h; 1446 $pos += $alloc;
1241 } 1447 }
1242 1448
1243 1 1449 1
1244} 1450}
1245 1451
1246############################################################################# 1452#############################################################################
1247 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
1248package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1249 1470
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1253 1472
1254sub size_request { 1473sub new {
1255 my ($self) = @_; 1474 my $class = shift;
1256 1475
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1258 1477 vertical => 1,
1259 ( 1478 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1479 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1480}
1303 1481
1304############################################################################# 1482#############################################################################
1305 1483
1306package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1501 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1325 fontsize => 1, 1503 fontsize => 1,
1326 align => -1, 1504 align => -1,
1327 valign => -1, 1505 valign => -1,
1328 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1329 can_events => 0, 1508 can_events => 0,
1330 %arg 1509 %arg
1331 ); 1510 );
1332 1511
1333 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1360 1539
1361 delete $self->{texture}; 1540 delete $self->{texture};
1362 $self->SUPER::update; 1541 $self->SUPER::update;
1363} 1542}
1364 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1365sub set_text { 1551sub set_text {
1366 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1367 1553
1368 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1370 1556
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1373 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1374 $self->update; 1562 $self->update;
1375 $self->check_size;
1376} 1563}
1377 1564
1378sub set_markup { 1565sub set_markup {
1379 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1380 1567
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1572
1386 $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;
1387 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1388 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1389 $self->update; 1578 $self->update;
1390 $self->check_size;
1391} 1579}
1392 1580
1393sub size_request { 1581sub size_request {
1394 my ($self) = @_; 1582 my ($self) = @_;
1395 1583
1584 $self->{size_req} ||= do {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1590
1402 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1403 1592
1404 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1596
1408 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1409 1598
1410 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1412 } 1604 };
1413 1605
1414 ( 1606 @{ $self->{size_req} }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1607}
1419 1608
1420sub size_allocate { 1609sub size_allocate {
1421 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1422 1611
1612 delete $self->{ox};
1613
1423 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1616}
1425 1617
1426sub set_fontsize { 1618sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1428 1620
1429 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1622 delete $self->{texture};
1431 1623
1432 $self->update; 1624 $self->realloc;
1433 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1434} 1633}
1435 1634
1436sub _draw { 1635sub _draw {
1437 my ($self) = @_; 1636 my ($self) = @_;
1438 1637
… …
1444 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1647
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1450 1650
1651 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1454 1655
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1659 };
1461 1660
1462 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1662
1465 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 1670 }
1471 1671
1472 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1473} 1673}
… …
1491 can_hover => 1, 1691 can_hover => 1,
1492 can_focus => 1, 1692 can_focus => 1,
1493 valign => 0, 1693 valign => 0,
1494 can_events => 1, 1694 can_events => 1,
1495 #text => ... 1695 #text => ...
1696 #hidden => "*",
1496 @_ 1697 @_
1497 ) 1698 )
1498} 1699}
1499 1700
1500sub _set_text { 1701sub _set_text {
… …
1502 1703
1503 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1504 1705
1505 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1506 1707
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1709 $self->{text} = $text;
1511 1710
1512 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1514 1714
1515 $self->emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1516} 1719}
1517 1720
1518sub set_text { 1721sub set_text {
1519 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1520 1723
1521 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1725 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 1726}
1526 1727
1527sub get_text { 1728sub get_text {
1528 $_[0]{text} 1729 $_[0]{text}
1529} 1730}
… …
1532 my ($self) = @_; 1733 my ($self) = @_;
1533 1734
1534 my ($w, $h) = $self->SUPER::size_request; 1735 my ($w, $h) = $self->SUPER::size_request;
1535 1736
1536 ($w + 1, $h) # add 1 for cursor 1737 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1738}
1544 1739
1545sub key_down { 1740sub key_down {
1546 my ($self, $ev) = @_; 1741 my ($self, $ev) = @_;
1547 1742
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1757 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1758 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1759 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1761 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1762 $self->_emit ('escape');
1568 } elsif ($uni) { 1763 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1570 } 1767 }
1571 1768
1572 $self->_set_text ($text); 1769 $self->_set_text ($text);
1573 $self->update; 1770
1574 $self->check_size; 1771 $self->realloc;
1772
1773 1
1575} 1774}
1576 1775
1577sub focus_in { 1776sub focus_in {
1578 my ($self) = @_; 1777 my ($self) = @_;
1579 1778
… …
1594 utf8::encode $text; 1793 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1596 1795
1597 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1598 $self->update; 1797 $self->update;
1798
1799 1
1599} 1800}
1600 1801
1601sub mouse_motion { 1802sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1604} 1807}
1605 1808
1606sub _draw { 1809sub _draw {
1607 my ($self) = @_; 1810 my ($self) = @_;
1608 1811
1609 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1610 1813
1611 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1614 } else { 1817 } else {
1615 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1616 } 1819 }
1617 1820
1618 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1824 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1659 if ($sym == 13) { 1862 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1863 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1864 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1865 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1866 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1867 $self->_emit (activate => $txt);
1665 $self->update; 1868 $self->update;
1666 1869
1667 } elsif ($sym == CFClient::SDLK_UP) { 1870 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1871 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1872 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1888 } else {
1686 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1687 } 1890 }
1688 1891
1689 } else { 1892 } else {
1690 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1691 } 1896 1
1692
1693} 1897}
1694 1898
1695############################################################################# 1899#############################################################################
1696 1900
1697package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1706 1910
1707sub new { 1911sub new {
1708 my $class = shift; 1912 my $class = shift;
1709 1913
1710 $class->SUPER::new ( 1914 $class->SUPER::new (
1711 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1712 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1714 can_hover => 1, 1919 can_hover => 1,
1715 align => 0, 1920 align => 0,
1716 valign => 0, 1921 valign => 0,
1717 can_events => 1, 1922 can_events => 1,
1718 @_ 1923 @_
1719 ) 1924 )
1720} 1925}
1721 1926
1927sub activate { }
1928
1722sub button_up { 1929sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1724 1931
1932 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1934 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1935
1728 } 1936 1
1729} 1937}
1730 1938
1731sub _draw { 1939sub _draw {
1732 my ($self) = @_; 1940 my ($self) = @_;
1733 1941
1734 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1943
1740 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1743 1947
… …
1762 1966
1763sub new { 1967sub new {
1764 my $class = shift; 1968 my $class = shift;
1765 1969
1766 $class->SUPER::new ( 1970 $class->SUPER::new (
1767 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1768 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1975 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1976 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1977 state => 0,
… …
1776} 1981}
1777 1982
1778sub size_request { 1983sub size_request {
1779 my ($self) = @_; 1984 my ($self) = @_;
1780 1985
1781 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1782} 1987}
1783 1988
1784sub button_down { 1989sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1786 1991
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1791 } 2000 1
1792} 2001}
1793 2002
1794sub _draw { 2003sub _draw {
1795 my ($self) = @_; 2004 my ($self) = @_;
1796 2005
1797 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1798 2007
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2009
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2013
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2015
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2017
… …
1961 2172
1962 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
1964 2175
1965 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2181
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2070 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2285 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2286 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2287 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2078 vertical => 0, 2290 vertical => 0,
2079 can_hover => 1, 2291 can_hover => 1,
2080 inner_pad => 0.02, 2292 inner_pad => 0.02,
2081 @_ 2293 @_
2082 ); 2294 );
… …
2085 $self->update; 2297 $self->update;
2086 2298
2087 $self 2299 $self
2088} 2300}
2089 2301
2302sub changed { }
2303
2090sub set_range { 2304sub set_range {
2091 my ($self, $range) = @_; 2305 my ($self, $range) = @_;
2092 2306
2093 $self->{range} = $range; 2307 ($range, $self->{range}) = ($self->{range}, $range);
2094 2308
2095 $self->update; 2309 $self->update
2310 if "@$range" ne "@{$self->{range}}";
2096} 2311}
2097 2312
2098sub set_value { 2313sub set_value {
2099 my ($self, $value) = @_; 2314 my ($self, $value) = @_;
2100 2315
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2316 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2317
2103 $hi = $lo + 1 if $hi <= $lo; 2318 $hi = $lo + 1 if $hi <= $lo;
2104 2319
2320 $page = $hi - $lo if $page > $hi - $lo;
2321
2105 $value = $lo if $value < $lo; 2322 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2323 $value = $hi - $page if $value > $hi - $page;
2107 2324
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2325 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2326 if $unit;
2110 2327
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2329
2115 if ($value != $old_value) { 2330 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2331 $self->_emit (changed => $value);
2117 $self->update; 2332 $self->update;
2118 } 2333 }
2119} 2334}
2120 2335
2121sub size_request { 2336sub size_request {
2122 my ($self) = @_; 2337 my ($self) = @_;
2123 2338
2124 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2340}
2129 2341
2130sub button_down { 2342sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2132 2344
2133 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2346
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348
2134 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2135} 2350}
2136 2351
2137sub mouse_motion { 2352sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2139 2354
2140 if ($GRAB == $self) { 2355 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2357
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2359
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2361
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2148 } 2367 1
2149} 2368}
2150 2369
2151sub update { 2370sub update {
2152 my ($self) = @_; 2371 my ($self) = @_;
2153 2372
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2155 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2156 2382
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2384 my $range = ($hi - $page - $lo) || 1e-100;
2158 2385
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2386 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2387
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2388 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2389 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2390
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2391 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2392 $value = $value * $self->{scale} + $self->{offset};
2165 2393
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2395 $self->{knob_w} = $knob_w;
2173 }); 2396 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2397
2181 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2182 2399
2183 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2184 2401
… …
2257 my $class = shift; 2474 my $class = shift;
2258 2475
2259 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
2260 fontsize => 1, 2477 fontsize => 1,
2261 can_events => 0, 2478 can_events => 0,
2479 indent => 0,
2262 #font => default_font 2480 #font => default_font
2263 @_, 2481 @_,
2264 2482
2265 layout => (new CFClient::Layout 1), 2483 layout => (new CFClient::Layout 1),
2266 par => [], 2484 par => [],
… …
2289 $self->SUPER::size_allocate ($w, $h); 2507 $self->SUPER::size_allocate ($w, $h);
2290 2508
2291 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2509 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2511 $self->{layout}->set_width ($self->{children}[0]{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2294 2513
2295 $self->reflow; 2514 $self->reflow;
2296} 2515}
2297 2516
2298sub text_height { 2517sub text_size {
2299 my ($self, $text, $indent) = @_; 2518 my ($self, $text, $indent) = @_;
2300 2519
2301 my $layout = $self->{layout}; 2520 my $layout = $self->{layout};
2302 2521
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2523 $layout->set_width ($self->{children}[0]{w} - $indent);
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2305 $layout->set_markup ($text); 2525 $layout->set_markup ($text);
2306 2526
2307 ($layout->size)[1] 2527 $layout->size
2308} 2528}
2309 2529
2310sub reflow { 2530sub reflow {
2311 my ($self) = @_; 2531 my ($self) = @_;
2312 2532
2313 $self->{need_reflow}++; 2533 $self->{need_reflow}++;
2314 $self->update; 2534 $self->update;
2315} 2535}
2316 2536
2537sub set_offset {
2538 my ($self, $offset) = @_;
2539
2540 # todo: base offset on lines or so, not on pixels
2541 $self->{children}[1]->set_value ($offset);
2542}
2543
2544sub clear {
2545 my ($self) = @_;
2546
2547 $self->{par} = [];
2548 $self->{height} = 0;
2549 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2550}
2551
2317sub add_paragraph { 2552sub add_paragraph {
2318 my ($self, $color, $text, $indent) = @_; 2553 my ($self, $color, $text, $indent) = @_;
2319 2554
2320 #TODO: intelligently "reformat" paragraph
2321
2322 for my $line (split /\n/, $text) { 2555 for my $line (split /\n/, $text) {
2323 my $height = $self->text_height ($line); 2556 my ($w, $h) = $self->text_size ($line);
2324 $self->{height} += $height; 2557 $self->{height} += $h;
2325 push @{$self->{par}}, [$height, $color, $indent, $line]; 2558 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2326 } 2559 }
2327 2560
2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2561 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2329 $self->{children}[1]->update;
2330} 2562}
2331 2563
2332sub update { 2564sub update {
2333 my ($self) = @_; 2565 my ($self) = @_;
2334 2566
… …
2337 return unless $self->{h} > 0; 2569 return unless $self->{h} > 0;
2338 2570
2339 delete $self->{texture}; 2571 delete $self->{texture};
2340 2572
2341 $ROOT->on_post_alloc ($self, sub { 2573 $ROOT->on_post_alloc ($self, sub {
2574 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2575
2342 if (delete $self->{need_reflow}) { 2576 if (delete $self->{need_reflow}) {
2343 my $height = 0; 2577 my $height = 0;
2344 2578
2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2579 my $layout = $self->{layout};
2580
2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2582
2346 for @{$self->{par}}; 2583 for (@{$self->{par}}) {
2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2587 $layout->set_markup ($_->[4]);
2588 my ($w, $h) = $layout->size;
2589 $_->[0] = $w + $_->[3];
2590 $_->[1] = $h;
2591 }
2592
2593 $height += $_->[1];
2594 }
2347 2595
2348 $self->{height} = $height; 2596 $self->{height} = $height;
2349 2597
2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2598 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2351 $self->{children}[1]->update;
2352 2599
2353 delete $self->{texture}; 2600 delete $self->{texture};
2354 } 2601 }
2355 2602
2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2603 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2357 glClearColor 0.5, 0.5, 0.5, 0; 2604 glClearColor 0, 0, 0, 0;
2358 glClear GL_COLOR_BUFFER_BIT; 2605 glClear GL_COLOR_BUFFER_BIT;
2359 2606
2360 my $top = int $self->{children}[1]{range}[0]; 2607 my $top = int $self->{children}[1]{range}[0];
2361 2608
2362 my $y0 = $top; 2609 my $y0 = $top;
2363 my $y1 = $top + $self->{h}; 2610 my $y1 = $top + $H;
2364 2611
2365 my $y = 0; 2612 my $y = 0;
2366 2613
2367 my $layout = $self->{layout}; 2614 my $layout = $self->{layout};
2368 2615
2369 $layout->set_font ($self->{font}) if $self->{font}; 2616 $layout->set_font ($self->{font}) if $self->{font};
2370 2617
2371 glEnable GL_BLEND; 2618 glEnable GL_BLEND;
2619 #TODO# not correct in windows where rgba is forced off
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2620 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373 2621
2374 for my $par (@{$self->{par}}) { 2622 for my $par (@{$self->{par}}) {
2375 my $h = $par->[0]; 2623 my $h = $par->[1];
2376 2624
2377 if ($y0 < $y + $h && $y < $y1) { 2625 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] }); 2626 $layout->set_foreground (@{ $par->[2] });
2379 $layout->set_width ($self->{w} - $par->[2]); 2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 $layout->set_markup ($par->[3]); 2629 $layout->set_markup ($par->[4]);
2381 2630
2382 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2631 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2383 2632
2384 glRasterPos $par->[2], $y - $y0; 2633 glRasterPos $par->[3], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2634 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2386 } 2635 }
2387 2636
2388 $y += $h; 2637 $y += $h;
2389 } 2638 }
… …
2396sub _draw { 2645sub _draw {
2397 my ($self) = @_; 2646 my ($self) = @_;
2398 2647
2399 glEnable GL_TEXTURE_2D; 2648 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2649 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 1, 1, 1, 1; 2650 glColor 0, 0, 0, 1;
2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2651 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2403 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2404 2653
2405 $self->{children}[1]->draw; 2654 $self->{children}[1]->draw;
2406 2655
2407} 2656}
… …
2456 2705
2457sub new { 2706sub new {
2458 my $class = shift; 2707 my $class = shift;
2459 2708
2460 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2461 state => 0, 2710 state => 0,
2462 connect_activate => \&toggle_flopper, 2711 on_activate => \&toggle_flopper,
2463 @_ 2712 @_
2464 ); 2713 );
2465 2714
2466 if ($self->{state}) {
2467 $self->{state} = 0;
2468 $self->toggle_flopper;
2469 }
2470
2471 $self 2715 $self
2472} 2716}
2473 2717
2474sub toggle_flopper { 2718sub toggle_flopper {
2475 my ($self) = @_; 2719 my ($self) = @_;
2476 2720
2477 # TODO: use animation 2721 $self->{other}->toggle_visibility;
2478 if ($self->{state} = !$self->{state}) {
2479 $CFClient::UI::ROOT->add ($self->{other});
2480 $self->{other}->move ($self->coord2global (0, $self->{h}));
2481 $self->emit ("open");
2482 } else {
2483 $CFClient::UI::ROOT->remove ($self->{other});
2484 $self->emit ("close");
2485 }
2486
2487 $self->emit (changed => $self->{state});
2488} 2722}
2489 2723
2490############################################################################# 2724#############################################################################
2491 2725
2492package CFClient::UI::Tooltip; 2726package CFClient::UI::Tooltip;
… …
2505} 2739}
2506 2740
2507sub set_tooltip_from { 2741sub set_tooltip_from {
2508 my ($self, $widget) = @_; 2742 my ($self, $widget) = @_;
2509 2743
2744 my $tooltip = $widget->{tooltip};
2745
2746 if ($ENV{CFPLUS_DEBUG} & 2) {
2747 $tooltip .= "\n\n" . (ref $widget) . "\n"
2748 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2749 . "req $widget->{req_w} $widget->{req_h}\n"
2750 . "visible $widget->{visible}";
2751 }
2752
2510 $self->add (new CFClient::UI::Label 2753 $self->add (new CFClient::UI::Label
2511 markup => $widget->{tooltip}, 2754 markup => $tooltip,
2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2755 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2513 fontsize => 0.8, 2756 fontsize => 0.8,
2514 fg => [0, 0, 0, 1], 2757 fg => [0, 0, 0, 1],
2515 ellipsise => 0, 2758 ellipsise => 0,
2516 font => ($widget->{tooltip_font} || $::FONT_PROP), 2759 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2527 2770
2528sub size_allocate { 2771sub size_allocate {
2529 my ($self, $w, $h) = @_; 2772 my ($self, $w, $h) = @_;
2530 2773
2531 $self->SUPER::size_allocate ($w - 4, $h - 4); 2774 $self->SUPER::size_allocate ($w - 4, $h - 4);
2775}
2776
2777sub visibility_change {
2778 my ($self, $visible) = @_;
2779
2780 return unless $visible;
2781
2782 $self->{root}->on_post_alloc ("move_$self" => sub {
2783 my $widget = $self->{owner}
2784 or return;
2785
2786 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2787
2788 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2789 if $x + $self->{w} > $::WIDTH;
2790
2791 $self->move_abs ($x, $y);
2792 });
2532} 2793}
2533 2794
2534sub _draw { 2795sub _draw {
2535 my ($self) = @_; 2796 my ($self) = @_;
2536 2797
… …
2553 glVertex $w, $h; 2814 glVertex $w, $h;
2554 glVertex $w, 0; 2815 glVertex $w, 0;
2555 glEnd; 2816 glEnd;
2556 2817
2557 glTranslate 2 - 0.375, 2 - 0.375; 2818 glTranslate 2 - 0.375, 2 - 0.375;
2819
2558 $self->SUPER::_draw; 2820 $self->SUPER::_draw;
2559} 2821}
2560 2822
2561############################################################################# 2823#############################################################################
2562 2824
… …
2568 2830
2569sub new { 2831sub new {
2570 my $class = shift; 2832 my $class = shift;
2571 2833
2572 my $self = $class->SUPER::new ( 2834 my $self = $class->SUPER::new (
2573 aspect => 1, 2835 aspect => 1,
2836 can_events => 0,
2574 @_, 2837 @_,
2575 ); 2838 );
2576 2839
2577 if ($self->{anim} && $self->{animspeed}) { 2840 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self); 2841 Scalar::Util::weaken (my $widget = $self);
… …
2604} 2867}
2605 2868
2606sub _draw { 2869sub _draw {
2607 my ($self) = @_; 2870 my ($self) = @_;
2608 2871
2609 return unless $::CONN;#d# manage and cache textures differently 2872 return unless $::CONN;
2610 2873
2611 my $face; 2874 my $face;
2612 2875
2613 if ($self->{frame}) { 2876 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}]; 2877 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2883 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2621 2884
2622 if ($tex) { 2885 if ($tex) {
2623 glEnable GL_TEXTURE_2D; 2886 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2888 glColor 0, 0, 0, 1;
2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2889 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2627 glDisable GL_TEXTURE_2D; 2890 glDisable GL_TEXTURE_2D;
2628 } 2891 }
2629} 2892}
2630 2893
… …
2637 $self->SUPER::DESTROY; 2900 $self->SUPER::DESTROY;
2638} 2901}
2639 2902
2640############################################################################# 2903#############################################################################
2641 2904
2642package CFClient::UI::InventoryItem; 2905package CFClient::UI::Buttonbar;
2643 2906
2644our @ISA = CFClient::UI::HBox::; 2907our @ISA = CFClient::UI::HBox::;
2645 2908
2646sub _item_to_desc { 2909# TODO: should actualyl wrap buttons and other goodies.
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2671
2672sub new {
2673 my $class = shift;
2674
2675 my %args = @_;
2676
2677 my $item = delete $args{item};
2678
2679 my $desc = _item_to_desc ($item);
2680
2681 my $self = $class->SUPER::new (
2682 can_hover => 1,
2683 can_events => 1,
2684 tooltip => ((CFClient::UI::Label::escape $desc)
2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2686 connect_button_down => sub {
2687 my ($self, $ev, $x, $y) = @_;
2688
2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2698 } elsif ($ev->{button} == 1) {
2699 $::CONN->send ("examine $item->{tag}");
2700 } elsif ($ev->{button} == 2) {
2701 $::CONN->send ("apply $item->{tag}");
2702 } elsif ($ev->{button} == 3) {
2703 my @menu_items = (
2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2716 ),
2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2720 }
2721
2722 1
2723 },
2724 %args
2725 );
2726
2727
2728 $self->add (new CFClient::UI::Face
2729 can_events => 0,
2730 face => $item->{face},
2731 anim => $item->{anim},
2732 animspeed => $item->{animspeed},
2733 );
2734
2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2736
2737 $self->{item} = $item;
2738
2739 $self->update_item;
2740
2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2750}
2751
2752#############################################################################
2753
2754package CFClient::UI::Inventory;
2755
2756our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758sub new {
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 for my $item (@items) {
2783 $item->{item} = $item;
2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2794
2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2796}
2797
2798sub size_request {
2799 my ($self) = @_;
2800 ($self->{req_w}, $self->{req_h});
2801}
2802 2910
2803############################################################################# 2911#############################################################################
2804 2912
2805package CFClient::UI::Menu; 2913package CFClient::UI::Menu;
2806 2914
… …
2818 ); 2926 );
2819 2927
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2928 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821 2929
2822 for my $item (@{ $self->{items} }) { 2930 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 2931 my ($widget, $cb, $tooltip) = @$item;
2824 2932
2825 # handle various types of items, only text for now 2933 # handle various types of items, only text for now
2826 if (!ref $widget) { 2934 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label 2935 $widget = new CFClient::UI::Label
2828 can_hover => 1, 2936 can_hover => 1,
2829 can_events => 1, 2937 can_events => 1,
2830 text => $widget; 2938 text => $widget,
2939 tooltip => $tooltip
2831 } 2940 }
2832 2941
2833 $self->{item}{$widget} = $item; 2942 $self->{item}{$widget} = $item;
2834 2943
2835 $self->{vbox}->add ($widget); 2944 $self->{vbox}->add ($widget);
… …
2840 2949
2841# popup given the event (must be a mouse button down event currently) 2950# popup given the event (must be a mouse button down event currently)
2842sub popup { 2951sub popup {
2843 my ($self, $ev) = @_; 2952 my ($self, $ev) = @_;
2844 2953
2845 $self->emit ("popdown"); 2954 $self->_emit ("popdown");
2846 2955
2847 # maybe save $GRAB? must be careful about events... 2956 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 2957 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 2958 $self->{button} = $ev->{button};
2850 2959
2851 $self->show; 2960 $self->show;
2852 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2961 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 2962}
2854 2963
2855sub mouse_motion { 2964sub mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 2965 my ($self, $ev, $x, $y) = @_;
2857 2966
2858 # TODO: should use vbox->find_widget or so 2967 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2968 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 2969 $self->{hover} = $self->{item}{$HOVER};
2970
2971 0
2861} 2972}
2862 2973
2863sub button_up { 2974sub button_up {
2864 my ($self, $ev, $x, $y) = @_; 2975 my ($self, $ev, $x, $y) = @_;
2865 2976
2866 if ($ev->{button} == $self->{button}) { 2977 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 2978 undef $GRAB;
2868 $self->hide; 2979 $self->hide;
2869 2980
2870 $self->emit ("popdown"); 2981 $self->_emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 2982 $self->{hover}[1]->() if $self->{hover};
2983 } else {
2984 return 0
2985 }
2986
2872 } 2987 1
2873} 2988}
2874 2989
2875############################################################################# 2990#############################################################################
2876 2991
2877package CFClient::UI::Statusbox; 2992package CFClient::UI::Multiplexer;
2878 2993
2879our @ISA = CFClient::UI::VBox::; 2994our @ISA = CFClient::UI::Container::;
2880 2995
2881sub new { 2996sub new {
2882 my $class = shift; 2997 my $class = shift;
2883 2998
2884 $class->SUPER::new ( 2999 my $self = $class->SUPER::new (
3000 @_,
3001 );
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005
3006 $self
3007}
3008
3009sub add {
3010 my ($self, @widgets) = @_;
3011
3012 $self->SUPER::add (@widgets);
3013
3014 $self->{current} = $self->{children}[0]
3015 if @{ $self->{children} };
3016}
3017
3018sub set_current_page {
3019 my ($self, $page_or_widget) = @_;
3020
3021 my $widget = ref $page_or_widget
3022 ? $page_or_widget
3023 : $self->{children}[$page_or_widget];
3024
3025 $self->{current} = $widget;
3026 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3027
3028 $self->_emit (page_changed => $self->{current});
3029
3030 $self->realloc;
3031}
3032
3033sub visible_children {
3034 $_[0]{current}
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 $self->{current}->size_request
3041}
3042
3043sub size_allocate {
3044 my ($self, $w, $h) = @_;
3045
3046 $self->{current}->configure (0, 0, $w, $h);
3047}
3048
3049sub _draw {
3050 my ($self) = @_;
3051
3052 $self->{current}->draw;
3053}
3054
3055#############################################################################
3056
3057package CFClient::UI::Notebook;
3058
3059our @ISA = CFClient::UI::VBox::;
3060
3061sub new {
3062 my $class = shift;
3063
3064 my $self = $class->SUPER::new (
3065 buttonbar => (new CFClient::UI::Buttonbar),
3066 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3067 # filter => # will be put between multiplexer and $self
3068 @_,
3069 );
3070
3071 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3072 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3073
3074 $self
3075}
3076
3077sub add {
3078 my ($self, $title, $widget, $tooltip) = @_;
3079
3080 Scalar::Util::weaken $self;
3081
3082 $self->{buttonbar}->add (new CFClient::UI::Button
3083 markup => $title,
3084 tooltip => $tooltip,
3085 on_activate => sub { $self->set_current_page ($widget) },
3086 );
3087
3088 $self->{multiplexer}->add ($widget);
3089}
3090
3091sub set_current_page {
3092 my ($self, $page) = @_;
3093
3094 $self->{multiplexer}->set_current_page ($page);
3095 $self->_emit (page_changed => $self->{multiplexer}{current});
3096}
3097
3098#############################################################################
3099
3100package CFClient::UI::Combobox;
3101
3102use utf8;
3103
3104our @ISA = CFClient::UI::Button::;
3105
3106sub new {
3107 my $class = shift;
3108
3109 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ...
3111 value => undef,
3112 @_,
3113 );
3114
3115 $self->_set_value ($self->{value});
3116
3117 $self
3118}
3119
3120sub button_down {
3121 my ($self, $ev) = @_;
3122
3123 my @menu_items;
3124
3125 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_;
3127
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3129 }
3130
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132}
3133
3134sub _set_value {
3135 my ($self, $value) = @_;
3136
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3138 or return;
3139
3140 $self->{value} = $item->[1];
3141 $self->set_markup ("$item->[0] ⇓");
3142 $self->set_tooltip ($item->[2]);
3143}
3144
3145sub set_value {
3146 my ($self, $value) = @_;
3147
3148 return unless $self->{value} ne $value;
3149
3150 $self->_set_value ($value);
3151 $self->_emit (changed => $value);
3152}
3153
3154#############################################################################
3155
3156package CFClient::UI::Statusbox;
3157
3158our @ISA = CFClient::UI::VBox::;
3159
3160sub new {
3161 my $class = shift;
3162
3163 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3164 fontsize => 0.8,
2886 @_, 3165 @_,
2887 ) 3166 );
3167
3168 Scalar::Util::weaken (my $this = $self);
3169
3170 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3171
3172 $self
2888} 3173}
2889 3174
2890sub reorder { 3175sub reorder {
2891 my ($self) = @_; 3176 my ($self) = @_;
2892 my $NOW = time; 3177 my $NOW = Time::HiRes::time;
3178
3179 # freeze display when hovering over any label
3180 return if $CFClient::UI::TOOLTIP->{owner}
3181 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3182 values %{ $self->{item} };
2893 3183
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3184 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3185 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3186 }
2897 3187
… …
2900 my @items = sort { 3190 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3191 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3192 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3193 } values %{ $self->{item} };
2904 3194
3195 $self->{timer}->interval (1);
3196
2905 my $count = 10 + 1; 3197 my $count = 10 + 1;
2906 for my $item (@items) { 3198 for my $item (@items) {
2907 last unless --$count; 3199 last unless --$count;
2908 3200
2909 push @widgets, $item->{label} ||= do { 3201 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3202 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3203 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3204 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3205 : $item->{text};
2914 3206
… …
2922 tooltip => $item->{tooltip}, 3214 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3215 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3216 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3217 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3218 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3219 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3220 can_events => 1,
2929 can_hover => 1 3221 can_hover => 1
2930 }; 3222 };
3223
3224 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3225 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3226 $label->update;
3227 $label->set_max_size (undef, $label->{req_h} * $diff)
3228 if $diff < 1;
3229 $self->{timer}->interval (1/30);
3230 } else {
3231 $label->{fg}[3] = $item->{fg}[3] || 1;
3232 }
3233
3234 push @widgets, $label;
2931 } 3235 }
2932 3236
2933 $self->clear; 3237 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3238 $self->SUPER::add (reverse @widgets);
2935} 3239}
… …
2938 my ($self, $text, %arg) = @_; 3242 my ($self, $text, %arg) = @_;
2939 3243
2940 $text =~ s/^\s+//; 3244 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3245 $text =~ s/\s+$//;
2942 3246
3247 return unless $text;
3248
2943 my $timeout = time + ((delete $arg{timeout}) || 60); 3249 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2944 3250
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3251 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946 3252
2947 if (my $item = $self->{item}{$group}) { 3253 if (my $item = $self->{item}{$group}) {
2948 if ($item->{text} eq $text) { 3254 if ($item->{text} eq $text) {
… …
2978 3284
2979 $self->reorder; 3285 $self->reorder;
2980 $self->SUPER::reconfigure; 3286 $self->SUPER::reconfigure;
2981} 3287}
2982 3288
3289sub DESTROY {
3290 my ($self) = @_;
3291
3292 $self->{timer}->cancel;
3293
3294 $self->SUPER::DESTROY;
3295}
3296
2983############################################################################# 3297#############################################################################
2984 3298
2985package CFClient::UI::Root; 3299package CFClient::UI::Inventory;
2986 3300
2987our @ISA = CFClient::UI::Container::; 3301our @ISA = CFClient::UI::ScrolledWindow::;
2988
2989use CFClient::OpenGL;
2990 3302
2991sub new { 3303sub new {
2992 my $class = shift; 3304 my $class = shift;
2993 3305
2994 $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
3307 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3308 @_,
3309 );
3310
3311 $self
3312}
3313
3314sub set_items {
3315 my ($self, $items) = @_;
3316
3317 $self->{child}->clear;
3318 return unless $items;
3319
3320 my @items = sort {
3321 ($a->{type} <=> $b->{type})
3322 or ($a->{name} cmp $b->{name})
3323 } @$items;
3324
3325 $self->{real_items} = \@items;
3326
3327 my $row = 0;
3328 for my $item (@items) {
3329 CFClient::Item::update_widgets $item;
3330
3331 $self->{child}->add (0, $row, $item->{face_widget});
3332 $self->{child}->add (1, $row, $item->{desc_widget});
3333 $self->{child}->add (2, $row, $item->{weight_widget});
3334
3335 $row++;
3336 }
3337}
3338
3339#############################################################################
3340
3341package CFClient::UI::BindEditor;
3342
3343our @ISA = CFClient::UI::FancyFrame::;
3344
3345sub new {
3346 my $class = shift;
3347
3348 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3349
3350 $self->add (my $vb = new CFClient::UI::VBox);
3351
3352
3353 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3354 text => "start recording",
3355 tooltip => "Start/Stops recording of actions."
3356 ."All subsequent actions after the recording started will be captured."
3357 ."The actions are displayed after the record was stopped."
3358 ."To bind the action you have to click on the 'Bind' button",
3359 on_activate => sub {
3360 unless ($self->{recording}) {
3361 $self->start;
3362 } else {
3363 $self->stop;
3364 }
3365 });
3366
3367 $vb->add (new CFClient::UI::Label text => "Actions:");
3368 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3369
3370 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3371 $vb->add (my $hb = new CFClient::UI::HBox);
3372 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3373 $hb->add (new CFClient::UI::Button
3374 text => "bind",
3375 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3376 on_activate => sub {
3377 $self->ask_for_bind;
3378 });
3379
3380 $vb->add (my $hb = new CFClient::UI::HBox);
3381 $hb->add (new CFClient::UI::Button
3382 text => "ok",
3383 expand => 1,
3384 tooltip => "This closes the binding editor and saves the binding",
3385 on_activate => sub {
3386 $self->hide;
3387 $self->commit;
3388 });
3389
3390 $hb->add (new CFClient::UI::Button
3391 text => "cancel",
3392 expand => 1,
3393 tooltip => "This closes the binding editor without saving",
3394 on_activate => sub {
3395 $self->hide;
3396 $self->{binding_cancel}->()
3397 if $self->{binding_cancel};
3398 });
3399
3400 $self->update_binding_widgets;
3401
3402 $self
3403}
3404
3405sub commit {
3406 my ($self) = @_;
3407 my ($mod, $sym, $cmds) = $self->get_binding;
3408 if ($sym != 0 && @$cmds > 0) {
3409 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3410 ."'. Don't forget 'Save Config'!");
3411 $self->{binding_change}->($mod, $sym, $cmds)
3412 if $self->{binding_change};
3413 } else {
3414 $::STATUSBOX->add ("No action bound, no key or action specified!");
3415 $self->{binding_cancel}->()
3416 if $self->{binding_cancel};
3417 }
3418}
3419
3420sub start {
3421 my ($self) = @_;
3422
3423 $self->{rec_btn}->set_text ("stop recording");
3424 $self->{recording} = 1;
3425 $self->clear_command_list;
3426 $::CONN->start_record if $::CONN;
3427}
3428
3429sub stop {
3430 my ($self) = @_;
3431
3432 $self->{rec_btn}->set_text ("start recording");
3433 $self->{recording} = 0;
3434
3435 my $rec;
3436 $rec = $::CONN->stop_record if $::CONN;
3437 return unless ref $rec eq 'ARRAY';
3438 $self->set_command_list ($rec);
3439}
3440
3441
3442sub ask_for_bind_and_commit {
3443 my ($self) = @_;
3444 $self->ask_for_bind (1);
3445}
3446
3447sub ask_for_bind {
3448 my ($self, $commit) = @_;
3449
3450 CFClient::Binder::open_binding_dialog (sub {
3451 my ($mod, $sym) = @_;
3452 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3453 $self->update_binding_widgets;
3454 $self->commit if $commit;
3455 });
3456}
3457
3458# $mod and $sym are the modifiers and key symbol
3459# $cmds is a array ref of strings (the commands)
3460# $cb is the callback that is executed on OK
3461# $ccb is the callback that is executed on CANCEL and
3462# when the binding was unsuccessful on OK
3463sub set_binding {
3464 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3465
3466 $self->clear_command_list;
3467 $self->{recording} = 0;
3468 $self->{rec_btn}->set_text ("start recording");
3469
3470 $self->{binding} = [$mod, $sym];
3471 $self->{commands} = $cmds;
3472
3473 $self->{binding_change} = $cb;
3474 $self->{binding_cancel} = $ccb;
3475
3476 $self->update_binding_widgets;
3477}
3478
3479# this is a shortcut method that asks for a binding
3480# and then just binds it.
3481sub do_quick_binding {
3482 my ($self, $cmds) = @_;
3483 $self->set_binding (undef, undef, $cmds, sub {
3484 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3485 });
3486 $self->ask_for_bind (1);
3487}
3488
3489sub update_binding_widgets {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3493 $self->set_command_list ($cmds);
3494}
3495
3496sub get_binding {
3497 my ($self) = @_;
3498 return (
3499 $self->{binding}->[0],
3500 $self->{binding}->[1],
3501 [ grep { defined $_ } @{$self->{commands}} ]
3502 );
3503}
3504
3505sub clear_command_list {
3506 my ($self) = @_;
3507 $self->{cmdbox}->clear ();
3508}
3509
3510sub set_command_list {
3511 my ($self, $cmds) = @_;
3512
3513 $self->{cmdbox}->clear ();
3514 $self->{commands} = $cmds;
3515
3516 my $idx = 0;
3517
3518 for (@$cmds) {
3519 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3520
3521 my $i = $idx;
3522 $hb->add (new CFClient::UI::Label text => $_);
3523 $hb->add (new CFClient::UI::Button
3524 text => "delete",
3525 tooltip => "Deletes the action from the record",
3526 on_activate => sub {
3527 $self->{cmdbox}->remove ($hb);
3528 $cmds->[$i] = undef;
3529 });
3530
3531
3532 $idx++
3533 }
3534}
3535
3536#############################################################################
3537
3538package CFClient::UI::SpellList;
3539
3540our @ISA = CFClient::UI::Table::;
3541
3542sub new {
3543 my $class = shift;
3544
3545 my $self = $class->SUPER::new (
3546 binding => [],
3547 commands => [],
2995 @_, 3548 @_,
2996 ) 3549 )
2997} 3550}
2998 3551
2999sub configure { 3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3000 my ($self, $x, $y, $w, $h) = @_; 3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3001 3558
3002 $self->{w} = $w; 3559sub rebuild_spell_list {
3003 $self->{h} = $h; 3560 my ($self) = @_;
3004}
3005 3561
3006sub check_size { 3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3606sub add_spell {
3007 my ($self) = @_; 3607 my ($self, $spell) = @_;
3008 3608
3009 $self->size_allocate ($self->{w}, $self->{h}) 3609 $self->{spell}->{$spell->{name}} = $spell;
3010 if $self->{w}; 3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620#############################################################################
3621
3622package CFClient::UI::Root;
3623
3624our @ISA = CFClient::UI::Container::;
3625
3626use List::Util qw(min max);
3627
3628use CFClient::OpenGL;
3629
3630sub new {
3631 my $class = shift;
3632
3633 my $self = $class->SUPER::new (
3634 visible => 1,
3635 @_,
3636 );
3637
3638 Scalar::Util::weaken ($self->{root} = $self);
3639
3640 $self
3011} 3641}
3012 3642
3013sub size_request { 3643sub size_request {
3014 my ($self) = @_; 3644 my ($self) = @_;
3015 3645
3016 ($self->{w}, $self->{h}) 3646 ($self->{w}, $self->{h})
3647}
3648
3649sub _to_pixel {
3650 my ($coord, $size, $max) = @_;
3651
3652 $coord =
3653 $coord eq "center" ? ($max - $size) * 0.5
3654 : $coord eq "max" ? $max
3655 : $coord;
3656
3657 $coord = 0 if $coord < 0;
3658 $coord = $max - $size if $coord > $max - $size;
3659
3660 int $coord + 0.5
3017} 3661}
3018 3662
3019sub size_allocate { 3663sub size_allocate {
3020 my ($self, $w, $h) = @_; 3664 my ($self, $w, $h) = @_;
3021 3665
3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3024
3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3027
3028 for my $child ($self->children) { 3666 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3667 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3668
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3669 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3670 $Y = $child->{force_y} if exists $child->{force_y};
3033 3671
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3672 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3673 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3674
3040 $child->configure ($X, $Y, $W, $H); 3675 $child->configure ($X, $Y, $W, $H);
3041 } 3676 }
3042} 3677}
3043 3678
… …
3054} 3689}
3055 3690
3056sub update { 3691sub update {
3057 my ($self) = @_; 3692 my ($self) = @_;
3058 3693
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3694 $::WANT_REFRESH++;
3061} 3695}
3062 3696
3063sub add { 3697sub add {
3064 my ($self, @children) = @_; 3698 my ($self, @children) = @_;
3065 3699
3066 for my $child (@children) {
3067 $child->{toplevel} = 1; 3700 $_->{is_toplevel} = 1
3068 3701 for @children;
3069 # integerise window positions
3070 $child->{x} = int $child->{x};
3071 $child->{y} = int $child->{y};
3072 }
3073 3702
3074 $self->SUPER::add (@children); 3703 $self->SUPER::add (@children);
3704}
3705
3706sub remove {
3707 my ($self, @children) = @_;
3708
3709 $self->SUPER::remove (@children);
3710
3711 delete $self->{is_toplevel}
3712 for @children;
3075 3713
3076 while (@children) { 3714 while (@children) {
3077 my $w = pop @children; 3715 my $w = pop @children;
3078 push @children, $w->children; 3716 push @children, $w->children;
3079 $w->{visible} = 1; 3717 $w->set_invisible;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 } 3718 }
3093} 3719}
3094 3720
3095sub on_refresh { 3721sub on_refresh {
3096 my ($self, $id, $cb) = @_; 3722 my ($self, $id, $cb) = @_;
… …
3110 while ($self->{refresh_hook}) { 3736 while ($self->{refresh_hook}) {
3111 $_->() 3737 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3738 for values %{delete $self->{refresh_hook}};
3113 } 3739 }
3114 3740
3115 if ($self->{check_size}) { 3741 if ($self->{realloc}) {
3116 my @queue = ([], []); 3742 my %queue;
3743 my @queue;
3744 my $widget;
3117 3745
3118 for (;;) { 3746 outer:
3119 if ($self->{check_size}) { 3747 while () {
3120 # heuristic: check containers last 3748 if (my $realloc = delete $self->{realloc}) {
3121 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3749 for $widget (values %$realloc) {
3122 for values %{delete $self->{check_size}} 3750 $widget->{visible} or next; # do not resize invisible widgets
3751
3752 $queue{$widget+0}++ and next; # duplicates are common
3753
3754 push @{ $queue[$widget->{visible}] }, $widget;
3755 }
3123 } 3756 }
3124 3757
3125 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3758 while () {
3759 @queue or last outer;
3126 3760
3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3761 $widget = pop @{ $queue[-1] || [] }
3128 ? @$widget{qw(user_w user_h)} 3762 and last;
3129 : $widget->size_request;
3130
3131 if (delete $widget->{force_alloc}
3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3133 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3134 3763
3764 pop @queue;
3765 }
3766
3767 delete $queue{$widget+0};
3768
3769 my ($w, $h) = $widget->size_request;
3770
3771 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3772 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3773
3774 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3775 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3776
3777 $w = $widget->{force_w} if exists $widget->{force_w};
3778 $h = $widget->{force_h} if exists $widget->{force_h};
3779
3780 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3781 || delete $widget->{force_realloc}) {
3135 $widget->{req_w} = $w; 3782 $widget->{req_w} = $w;
3136 $widget->{req_h} = $h; 3783 $widget->{req_h} = $h;
3137 3784
3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3785 $self->{size_alloc}{$widget+0} = $widget;
3139 3786
3140 $widget->{parent}->check_size
3141 if $widget->{parent}; 3787 if (my $parent = $widget->{parent}) {
3788 $self->{realloc}{$parent+0} = $parent
3789 unless $queue{$parent+0};
3790
3791 $parent->{force_size_alloc} = 1;
3792 $self->{size_alloc}{$parent+0} = $parent;
3793 }
3142 } 3794 }
3795
3796 delete $self->{realloc}{$widget+0};
3143 } 3797 }
3144 } 3798 }
3145 3799
3146 while ($self->{size_alloc}) { 3800 while (my $size_alloc = delete $self->{size_alloc}) {
3147 for (values %{delete $self->{size_alloc}}) { 3801 my @queue = sort { $b->{visible} <=> $a->{visible} }
3148 my ($widget, $w, $h) = @$_; 3802 values %$size_alloc;
3803
3804 while () {
3805 my $widget = pop @queue || last;
3806
3807 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3149 3808
3150 $w = 0 if $w < 0; 3809 $w = 0 if $w < 0;
3151 $h = 0 if $h < 0; 3810 $h = 0 if $h < 0;
3152 3811
3812 $w = int $w + 0.5;
3813 $h = int $h + 0.5;
3814
3815 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3816 $widget->{old_w} = $widget->{w};
3817 $widget->{old_h} = $widget->{h};
3818
3153 $widget->{w} = $w; 3819 $widget->{w} = $w;
3154 $widget->{h} = $h; 3820 $widget->{h} = $h;
3155 $widget->size_allocate ($w, $h); 3821
3156 $widget->emit (size_allocate => $w, $h); 3822 $widget->emit (size_allocate => $w, $h);
3823 }
3157 } 3824 }
3158 } 3825 }
3159 3826
3160 while ($self->{post_alloc_hook}) { 3827 while ($self->{post_alloc_hook}) {
3161 $_->() 3828 $_->()
3162 for values %{delete $self->{post_alloc_hook}}; 3829 for values %{delete $self->{post_alloc_hook}};
3163 } 3830 }
3831
3164 3832
3165 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3833 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3834 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3167 glClear GL_COLOR_BUFFER_BIT; 3835 glClear GL_COLOR_BUFFER_BIT;
3168 3836
… …
3170 glLoadIdentity; 3838 glLoadIdentity;
3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3839 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3172 glMatrixMode GL_MODELVIEW; 3840 glMatrixMode GL_MODELVIEW;
3173 glLoadIdentity; 3841 glLoadIdentity;
3174 3842
3843 {
3844 package CFClient::UI::Base;
3845
3846 ($draw_x, $draw_y, $draw_w, $draw_h) =
3847 (0, 0, $self->{w}, $self->{h});
3848 }
3849
3175 $self->_draw; 3850 $self->_draw;
3176} 3851}
3177 3852
3178############################################################################# 3853#############################################################################
3179 3854

Diff Legend

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