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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.378 by root, Mon Jul 16 20:22:39 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::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
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
23 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
24 34
25 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
26 36
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 38
29 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 40 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 41 }
42 42
43 return; 43 return;
44 } 44 }
45 } 45 }
46 } 46 }
47 47
48 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
49 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
50} 74}
51 75
52# class methods for events 76# class methods for events
53sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 78 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 79 if $FOCUS;
56} 80}
57 81
58sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 83 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 84 if $FOCUS;
85}
86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
61} 98}
62 99
63sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
64 my ($ev) = @_; 101 my ($ev) = @_;
65 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
66 103
67 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
68 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
69 108
70 $GRAB = $widget; 109 $GRAB = $widget;
71 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
72 111
73 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
74 } 113 }
75
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 114
78 if ($GRAB) { 115 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y); 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
81 } 124 }
82} 125}
83 126
84sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
85 my ($ev) = @_; 128 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y});
87 129
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
89 131
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 133
92 if ($GRAB) { 134 $GRAB->emit (button_up => $ev)
93 ($x, $y) = $GRAB->coord2local ($x, $y); 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 136
97 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 139 $grab->update if $grab;
100 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
101 141
102 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
103 } 144 }
104} 145}
105 146
106sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
107 my ($ev) = @_; 148 my ($ev) = @_;
108 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
109 150
110 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
111 152
112 if ($widget != $HOVER) { 153 check_hover $widget;
113 my $hover = $HOVER; $HOVER = $widget;
114 154
115 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
116 $HOVER->update if $HOVER && $HOVER->{can_hover};
117
118 check_tooltip;
119 }
120
121 if ($HOVER) { 156 if $HOVER;
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
125} 157}
126 158
127# convert position array to integers 159# convert position array to integers
128sub harmonize { 160sub harmonize {
129 my ($vals) = @_; 161 my ($vals) = @_;
… …
135 $rem += $_ - $i; 167 $rem += $_ - $i;
136 $_ = $i; 168 $_ = $i;
137 } 169 }
138} 170}
139 171
172sub full_refresh {
173 # make a copy, otherwise for complains about freed values.
174 my @widgets = values %WIDGET;
175
176 $_->update
177 for @widgets;
178}
179
180sub reconfigure_widgets {
181 # make a copy, otherwise C<for> complains about freed values.
182 my @widgets = values %WIDGET;
183
184 $_->reconfigure
185 for @widgets;
186}
187
188# call when resolution changes etc.
189sub rescale_widgets {
190 my ($sx, $sy) = @_;
191
192 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
199 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
200 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
201 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
202 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
203
204 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
205 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
206
207 }
208 }
209
210 reconfigure_widgets;
211}
212
140############################################################################# 213#############################################################################
141 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
142package CFClient::UI::Base; 223package CFPlus::UI::Base;
143 224
144use strict; 225use strict;
145 226
146use CFClient::OpenGL; 227use CFPlus::OpenGL;
147 228
148sub new { 229sub new {
149 my $class = shift; 230 my $class = shift;
150 231
151 my $self = bless { 232 my $self = bless {
152 x => 0, 233 x => "center",
153 y => 0, 234 y => "center",
154 z => 0, 235 z => 0,
236 w => undef,
237 h => undef,
155 can_events => 1, 238 can_events => 1,
156 @_ 239 @_
157 }, $class; 240 }, $class;
158 241
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
243
159 for (keys %$self) { 244 for (keys %$self) {
160 if (/^connect_(.*)$/) { 245 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
162 } 247 }
163 } 248 }
164 249
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
255
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258
259 $self->show if $layout->{show};
260 }
261
165 $self 262 $self
166} 263}
167 264
168sub destroy { 265sub destroy {
169 my ($self) = @_; 266 my ($self) = @_;
170 267
171 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
172 %$self = (); 270 %$self = ();
173} 271}
174 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
175sub show { 277sub show {
176 my ($self) = @_; 278 my ($self) = @_;
177 279
178 return if $self->{parent}; 280 return if $self->{parent};
179 281
180 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
181} 283}
182 284
183sub hide { 285sub set_visible {
184 my ($self) = @_; 286 my ($self) = @_;
287
288 return if $self->{visible};
289
290 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1;
292
293 $self->emit (visibility_change => 1);
294
295 $self->realloc if !exists $self->{req_w};
296
297 $_->set_visible for $self->children;
298}
299
300sub set_invisible {
301 my ($self) = @_;
302
303 return unless $self->{visible};
304
305 $_->set_invisible for $self->children;
306
307 delete $self->{visible};
308 delete $self->{root};
185 309
186 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
188 312
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
314 if $TOOLTIP->{owner} == $self;
315
316 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0);
318}
319
320sub set_visibility {
321 my ($self, $visible) = @_;
322
323 return if $self->{visible} == $visible;
324
325 $visible ? $self->show
326 : $self->hide;
327}
328
329sub toggle_visibility {
330 my ($self) = @_;
331
332 $self->{visible}
333 ? $self->hide
334 : $self->show;
335}
336
337sub hide {
338 my ($self) = @_;
339
340 $self->set_invisible;
341
189 $self->{parent}->remove ($self) 342 $self->{parent}->remove ($self)
190 if $self->{parent}; 343 if $self->{parent};
191} 344}
192 345
193sub move { 346sub move_abs {
194 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
195 348
196 $self->{x} = int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
197 $self->{y} = int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
198 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
199 352
200 $self->update; 353 $self->update;
201} 354}
202 355
203sub set_size { 356sub set_size {
204 my ($self, $w, $h) = @_; 357 my ($self, $w, $h) = @_;
205 358
206 $self->{user_w} = $w; 359 $self->{force_w} = $w;
207 $self->{user_h} = $h; 360 $self->{force_h} = $h;
208 361
209 $self->check_size; 362 $self->realloc;
210} 363}
211 364
212sub size_request { 365sub size_request {
213 require Carp; 366 require Carp;
214 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
215} 368}
216 369
370sub baseline_shift {
371 0
372}
373
217sub configure { 374sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
219 376
220 if ($self->{aspect}) { 377 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h);
379
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
223 382
224 # use alignment to adjust x, y 383 # use alignment to adjust x, y
225 384
226 $x += int +($w - $w2) * 0.5; 385 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 386 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 387 }
231 388
232 if ($self->{x} != $x || $self->{y} != $y) { 389 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 390 $self->{x} = $x;
234 $self->{y} = $y; 391 $self->{y} = $y;
235 $self->update; 392 $self->update;
236 } 393 }
237 394
238 if ($self->{w} != $w || $self->{h} != $h) { 395 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 396 return unless $self->{visible};
240 }
241}
242 397
243sub size_allocate { 398 $self->{alloc_w} = $w;
244 # nothing to be done 399 $self->{alloc_h} = $h;
400
401 $self->{root}{size_alloc}{$self+0} = $self;
402 }
245} 403}
246 404
247sub children { 405sub children {
406 # nop
248} 407}
249 408
250# call when resolution changes etc. 409sub visible_children {
251sub reconfigure { 410 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 411}
261 412
262sub set_max_size { 413sub set_max_size {
263 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
264 415
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
420}
421
422sub set_tooltip {
423 my ($self, $tooltip) = @_;
424
425 $tooltip =~ s/^\s+//;
426 $tooltip =~ s/\s+$//;
427
428 return if $self->{tooltip} eq $tooltip;
429
430 $self->{tooltip} = $tooltip;
431
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
435 }
267} 436}
268 437
269# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
270sub coord2local { 439sub coord2local {
271 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
272 441
442 Carp::confess unless $self->{parent};#d#
443
273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
274} 445}
275 446
276# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
277sub coord2global { 448sub coord2global {
278 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
279 450
451 Carp::confess unless $self->{parent};#d#
452
280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
281} 454}
282 455
283sub focus_in { 456sub invoke_focus_in {
284 my ($self) = @_; 457 my ($self) = @_;
285 458
286 return if $FOCUS == $self; 459 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
288 461
289 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
290 463
291 $self->emit (focus_in => $focus); 464 $self->update;
292 465
293 $focus->update if $focus; 466 0
294 $FOCUS->update;
295} 467}
296 468
297sub focus_out { 469sub invoke_focus_out {
298 my ($self) = @_; 470 my ($self) = @_;
299 471
300 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
301 473
302 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
303 475
304 $self->emit (focus_out => $focus); 476 $self->update;
305 477
306 $focus->update if $focus; #? 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
307} 479 unless $FOCUS;
308 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
309sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
310sub button_up { } 492sub invoke_button_up { 0 }
311sub key_down { } 493sub invoke_key_down { 0 }
312sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
313 496
314sub button_down { 497sub invoke_button_down {
315 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
316 499
317 $self->focus_in; 500 $self->grab_focus;
318}
319 501
320sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
321sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
322sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 504
323sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 505sub connect {
324sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550}
551
552sub find_widget {
553 my ($self, $x, $y) = @_;
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563
564sub set_parent {
565 my ($self, $parent) = @_;
566
567 CFPlus::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible};
569}
570
571sub realloc {
572 my ($self) = @_;
573
574 if ($self->{visible}) {
575 return if $self->{root}{realloc}{$self+0};
576
577 $self->{root}{realloc}{$self+0} = $self;
578 $self->{root}->update;
579 } else {
580 delete $self->{req_w};
581 delete $self->{req_h};
582 }
583}
584
585sub update {
586 my ($self) = @_;
587
588 $self->{parent}->update
589 if $self->{parent};
590}
591
592sub reconfigure {
593 my ($self) = @_;
594
595 $self->realloc;
596 $self->update;
597}
598
599# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
325 602
326sub draw { 603sub draw {
327 my ($self) = @_; 604 my ($self) = @_;
328 605
329 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
330 615
331 glPushMatrix; 616 glPushMatrix;
332 glTranslate $self->{x}, $self->{y}, 0; 617 glTranslate $self->{x}, $self->{y}, 0;
333 $self->_draw;
334 glPopMatrix;
335 618
336 if ($self == $HOVER && $self->{can_hover}) { 619 if ($self == $HOVER && $self->{can_hover}) {
337 my ($x, $y) = @$self{qw(x y)};
338
339 glColor 1, 0.8, 0.5, 0.2; 620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
340 glEnable GL_BLEND; 621 glEnable GL_BLEND;
341 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
342 glBegin GL_QUADS; 623 glBegin GL_QUADS;
343 glVertex $x , $y;
344 glVertex $x + $self->{w}, $y;
345 glVertex $x + $self->{w}, $y + $self->{h};
346 glVertex $x , $y + $self->{h};
347 glEnd;
348 glDisable GL_BLEND;
349 }
350
351 if ($ENV{PCLIENT_DEBUG}) {
352 glPushMatrix;
353 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0; 624 glVertex 0 , 0;
357 glVertex $self->{w}, 0; 625 glVertex $self->{w}, 0;
358 glVertex $self->{w}, $self->{h}; 626 glVertex $self->{w}, $self->{h};
359 glVertex 0 , $self->{h}; 627 glVertex 0 , $self->{h};
360 glEnd; 628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
361 glPopMatrix; 642 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 644 }
645
646 $self->_draw;
647 glPopMatrix;
364} 648}
365 649
366sub _draw { 650sub _draw {
367 my ($self) = @_; 651 my ($self) = @_;
368 652
369 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
370} 654}
371 655
372sub find_widget { 656my $cntx;#d#
373 my ($self, $x, $y) = @_;
374
375 return () unless $self->{can_events};
376
377 return $self
378 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
379 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
380
381 ()
382}
383
384sub set_parent {
385 my ($self, $parent) = @_;
386
387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 657sub DESTROY {
420 my ($self) = @_; 658 my ($self) = @_;
421 659
422 #$self->deactivate; 660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
423} 666}
424 667
425############################################################################# 668#############################################################################
426 669
427package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
428 671
429our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
430 673
431use strict; 674use strict;
432use CFClient::OpenGL; 675use CFPlus::OpenGL;
433 676
434sub new { 677sub new {
435 my $class = shift; 678 my $class = shift;
436 679
437 # range [value, low, high, page] 680 # range [value, low, high, page]
438 681
439 $class->SUPER::new ( 682 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 683 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 684 #active_bg => [1, 1, 1, 0.5],
442 @_ 685 @_
443 ) 686 )
444} 687}
445 688
446sub _draw { 689sub _draw {
447 my ($self) = @_; 690 my ($self) = @_;
448 691
692 my $color = $FOCUS == $self && $self->{active_bg}
693 ? $self->{active_bg}
694 : $self->{bg};
695
696 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
450 698
451 glEnable GL_BLEND; 699 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 701 glColor_premultiply @$color;
454 702
455 glBegin GL_QUADS; 703 glBegin GL_QUADS;
456 glVertex 0 , 0; 704 glVertex 0 , 0;
457 glVertex 0 , $h; 705 glVertex 0 , $h;
458 glVertex $w, $h; 706 glVertex $w, $h;
459 glVertex $w, 0; 707 glVertex $w, 0;
460 glEnd; 708 glEnd;
461 709
462 glDisable GL_BLEND; 710 glDisable GL_BLEND;
711 }
463} 712}
464 713
465############################################################################# 714#############################################################################
466 715
467package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
468 717
469our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
470 719
471sub new { 720sub new {
472 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
474} 723}
475 724
476sub size_request { 725sub size_request {
477 (0, 0) 726 my ($self) = @_;
727
728 ($self->{w} + 0, $self->{h} + 0)
478} 729}
479 730
480sub draw { } 731sub draw { }
481 732
482############################################################################# 733#############################################################################
483 734
484package CFClient::UI::Container; 735package CFPlus::UI::Container;
485 736
486our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
487 738
488sub new { 739sub new {
489 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
490 741
491 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
492 743
493 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
494 children => [], 745 children => [],
495 can_events => 0, 746 can_events => 0,
496 %arg, 747 %arg,
497 ); 748 );
749
498 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
499 752
500 $self 753 $self
754}
755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
501} 762}
502 763
503sub add { 764sub add {
504 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
505 766
… …
511 $self->{children} = [ 772 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 773 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 774 @{$self->{children}}, @widgets
514 ]; 775 ];
515 776
516 $self->check_size (1); 777 $self->realloc;
517 $self->update;
518} 778}
519 779
520sub children { 780sub children {
521 @{ $_[0]{children} } 781 @{ $_[0]{children} }
522} 782}
… …
527 delete $child->{parent}; 787 delete $child->{parent};
528 $child->hide; 788 $child->hide;
529 789
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 791
532 $self->check_size; 792 $self->realloc;
533 $self->update;
534} 793}
535 794
536sub clear { 795sub clear {
537 my ($self) = @_; 796 my ($self) = @_;
538 797
… …
542 for (@$children) { 801 for (@$children) {
543 delete $_->{parent}; 802 delete $_->{parent};
544 $_->hide; 803 $_->hide;
545 } 804 }
546 805
547 $self->check_size; 806 $self->realloc;
548 $self->update;
549} 807}
550 808
551sub find_widget { 809sub find_widget {
552 my ($self, $x, $y) = @_; 810 my ($self, $x, $y) = @_;
553 811
554 $x -= $self->{x}; 812 $x -= $self->{x};
555 $y -= $self->{y}; 813 $y -= $self->{y};
556 814
557 my $res; 815 my $res;
558 816
559 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
560 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
561 and return $res; 819 and return $res;
562 } 820 }
563 821
564 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
570 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
571} 829}
572 830
573############################################################################# 831#############################################################################
574 832
575package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
576 834
577our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
578 836
579sub new { 837sub new {
580 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
581 839
582 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
583 841
584 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
585} 843}
586 844
587sub add { 845sub add {
588 my ($self, $child) = @_; 846 my ($self, $child) = @_;
589 847
590 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
591
592 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
593} 850}
594 851
595sub remove { 852sub remove {
596 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
597 854
598 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
599 856
600 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
601 unless @{$self->{children}}; 858 unless @{$self->{children}};
602} 859}
603 860
604sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
605 862
606sub size_request { 863sub size_request {
607 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
608} 865}
609 866
610sub size_allocate { 867sub invoke_size_allocate {
611 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
612 869
613 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
614} 873}
615 874
616############################################################################# 875#############################################################################
617 876
877# back-buffered drawing area
878
618package CFClient::UI::Window; 879package CFPlus::UI::Window;
619 880
620our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
621 882
622use CFClient::OpenGL; 883use CFPlus::OpenGL;
623 884
624sub new { 885sub new {
625 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
626 887
627 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
628} 889}
629 890
630sub update { 891sub update {
631 my ($self) = @_; 892 my ($self) = @_;
632 893
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 895 $self->SUPER::update;
635} 896}
636 897
637sub size_allocate { 898sub invoke_size_allocate {
638 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
639 900
640 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
642} 904}
643 905
644sub _render { 906sub _render {
907 my ($self) = @_;
908
645 $_[0]{children}[0]->draw; 909 $self->{children}[0]->draw;
646} 910}
647 911
648sub render_child { 912sub render_child {
649 my ($self) = @_; 913 my ($self) = @_;
650 914
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
654 918
919 {
920 package CFPlus::UI::Base;
921
922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h});
924
655 $self->_render; 925 $self->_render;
656# glColorMask 1, 1, 1, 0; 926 }
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 927 };
664} 928}
665 929
666sub _draw { 930sub _draw {
667 my ($self) = @_; 931 my ($self) = @_;
668
669 my ($w, $h) = ($self->w, $self->h);
670 932
671 my $tex = $self->{texture} 933 my $tex = $self->{texture}
672 or return; 934 or return;
673 935
674 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
677 939
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
679 941
680 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
681} 943}
682 944
683############################################################################# 945#############################################################################
684 946
685package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
686 948
949use List::Util qw(min max);
950
687our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
952
953sub new {
954 my $class = shift;
955
956 $class->SUPER::new (
957 scroll_x => 0,
958 scroll_y => 1,
959 @_,
960 )
961}
688 962
689sub size_request { 963sub size_request {
690 my ($self) = @_; 964 my ($self) = @_;
691 965
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 966 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 967
695 @$self{qw(child_w child_h)} 968 $w = 10 if $self->{scroll_x};
696} 969 $h = 10 if $self->{scroll_y};
697 970
971 ($w, $h)
972}
973
698sub size_allocate { 974sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 975 my ($self, $w, $h) = @_;
700 976
977 my $child = $self->child;
978
979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
981
982 $self->child->configure (0, 0, $w, $h);
701 $self->update; 983 $self->update;
984
985 1
702} 986}
703 987
704sub set_offset { 988sub set_offset {
705 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
706 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
707 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
708 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
709 997
998 $self->emit (changed => $x, $y);
710 $self->update; 999 $self->update;
1000 }
711} 1001}
712 1002
713# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local { 1004sub coord2local {
715 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) { 1024 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else { 1026 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
738 } 1028 }
739} 1029}
740 1030
741sub _render { 1031sub _render {
742 my ($self) = @_; 1032 my ($self) = @_;
743 1033
1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1036
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 1038
746 $self->SUPER::_render; 1039 $self->SUPER::_render;
747} 1040}
748 1041
749############################################################################# 1042#############################################################################
750 1043
751package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
752 1045
1046our @ISA = CFPlus::UI::Table::;
1047
1048sub new {
1049 my ($class, %arg) = @_;
1050
1051 my $child = delete $arg{child};
1052
1053 my $self;
1054
1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1065 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub {
1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1070 },
1071 ;
1072
1073 $self = $class->SUPER::new (
1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1081 %arg,
1082 );
1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1100 $self->add ($child) if $child;
1101
1102 $self
1103}
1104
1105#TODO# update range on size_allocate depending on child
1106
1107sub add {
1108 my ($self, $widget) = @_;
1109
1110 $self->{vp}->add ($self->{child} = $widget);
1111}
1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1144sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_;
1146
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev);
1150
1151 1
1152}
1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
1156
1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 $self->update_slider;
1201 $self->SUPER::invoke_size_allocate ($w, $h)
1202}
1203
1204#############################################################################
1205
1206package CFPlus::UI::Frame;
1207
753our @ISA = CFClient::UI::HBox::; 1208our @ISA = CFPlus::UI::Bin::;
1209
1210use CFPlus::OpenGL;
754 1211
755sub new { 1212sub new {
756 my $class = shift; 1213 my $class = shift;
757 1214
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new ( 1215 $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1216 bg => undef,
770 slider => $slider,
771 @_, 1217 @_,
1218 )
1219}
1220
1221sub _draw {
1222 my ($self) = @_;
1223
1224 if ($self->{bg}) {
1225 my ($w, $h) = @$self{qw(w h)};
1226
1227 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND;
1239 }
1240
1241 $self->SUPER::_draw;
1242}
1243
1244#############################################################################
1245
1246package CFPlus::UI::FancyFrame;
1247
1248our @ISA = CFPlus::UI::Bin::;
1249
1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
772 ); 1269 );
773 1270
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self 1271 $self
779} 1272}
780 1273
781#TODO# update range on size_allocate depeneing on child 1274sub add {
782# update viewport offset on scroll 1275 my ($self, @widgets) = @_;
783 1276
784############################################################################# 1277 $self->SUPER::add (@widgets);
785 1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792#############################################################################
793
794package CFClient::UI::FancyFrame;
795
796our @ISA = CFClient::UI::Bin::;
797
798use CFClient::OpenGL;
799
800my @tex =
801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
802 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803
804sub new {
805 my $class = shift;
806
807 # TODO: user_x, user_y, overwrite moveto?
808
809 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1],
812 border => 0.6,
813 can_events => 1,
814 @_
815 );
816
817 $self->{title} &&= new CFClient::UI::Label
818 align => 0,
819 valign => 1,
820 text => $self->{title},
821 fontsize => $self->{border};
822
823 $self
824} 1279}
825 1280
826sub border { 1281sub border {
827 int $_[0]{border} * $::FONTSIZE 1282 int $_[0]{border} * $::FONTSIZE
828} 1283}
829 1284
830sub size_request { 1285sub size_request {
831 my ($self) = @_; 1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
832 1290
833 my ($w, $h) = $self->SUPER::size_request; 1291 my ($w, $h) = $self->SUPER::size_request;
834 1292
835 ( 1293 (
836 $w + $self->border * 2, 1294 $w + $self->border * 2,
837 $h + $self->border * 2, 1295 $h + $self->border * 2,
838 ) 1296 )
839} 1297}
840 1298
841sub size_allocate { 1299sub invoke_size_allocate {
842 my ($self, $w, $h) = @_; 1300 my ($self, $w, $h) = @_;
843 1301
844 $h -= List::Util::max 0, $self->border * 2; 1302 my $border = $self->border;
1303
845 $w -= List::Util::max 0, $self->border * 2; 1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
846 1306
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1307 if (my $label = $self->{label}) {
848 if $self->{title}; 1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
849 1312
850 $self->child->configure ($self->border, $self->border, $w, $h); 1313 $self->child->configure ($border, $border, $w, $h);
851}
852 1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1351
1352my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1354 mipmap => 1, wrap => 1;
1355
1356my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360sub new {
1361 my ($class, %arg) = @_;
1362
1363 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1],
1365 border_bg => [1, 1, 1, 1],
1366 border => 0.6,
1367 can_events => 1,
1368 min_w => 64,
1369 min_h => 32,
1370 %arg,
1371 );
1372
1373 $self->{title_widget} = new CFPlus::UI::Label
1374 align => 0,
1375 valign => 1,
1376 text => $self->{title},
1377 fontsize => $self->{border},
1378 if exists $self->{title};
1379
1380 if ($self->{has_close_button}) {
1381 $self->{close_button} =
1382 new CFPlus::UI::ImageButton
1383 path => 'x1_close.png',
1384 on_activate => sub { $self->emit ("delete") };
1385
1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1387 }
1388
1389 $self
1390}
1391
1392sub add {
1393 my ($self, @widgets) = @_;
1394
1395 $self->SUPER::add (@widgets);
1396 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1398}
1399
1400sub border {
1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub size_request {
1405 my ($self) = @_;
1406
1407 $self->{title_widget}->size_request
1408 if $self->{title_widget};
1409
1410 $self->{close_button}->size_request
1411 if $self->{close_button};
1412
1413 my ($w, $h) = $self->SUPER::size_request;
1414
1415 (
1416 $w + $self->border * 2,
1417 $h + $self->border * 2,
1418 )
1419}
1420
1421sub invoke_size_allocate {
1422 my ($self, $w, $h) = @_;
1423
1424 if ($self->{title_widget}) {
1425 $self->{title_widget}{w} = $w;
1426 $self->{title_widget}{h} = $h;
1427 $self->{title_widget}->invoke_size_allocate ($w, $h);
1428 }
1429
1430 my $border = $self->border;
1431
1432 $h -= List::Util::max 0, $border * 2;
1433 $w -= List::Util::max 0, $border * 2;
1434
1435 $self->child->configure ($border, $border, $w, $h);
1436
1437 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1438 if $self->{close_button};
1439
1440 1
1441}
1442
1443sub invoke_delete {
1444 my ($self) = @_;
1445
1446 $self->hide;
1447
1448 1
1449}
1450
853sub button_down { 1451sub invoke_button_down {
854 my ($self, $ev, $x, $y) = @_; 1452 my ($self, $ev, $x, $y) = @_;
855 1453
856 my ($w, $h) = @$self{qw(w h)}; 1454 my ($w, $h) = @$self{qw(w h)};
857 my $border = $self->border; 1455 my $border = $self->border;
858 1456
… …
871 my ($ev, $x, $y) = @_; 1469 my ($ev, $x, $y) = @_;
872 1470
873 my $dx = $ev->{x} - $ox; 1471 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1472 my $dy = $ev->{y} - $oy;
875 1473
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1474 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1475 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1476
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1477 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size; 1478 $self->realloc;
880 }; 1479 };
881 1480
882 } elsif ($lr ^ $td) { 1481 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1482 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1483 my ($bx, $by) = ($self->{x}, $self->{y});
… …
886 $self->{motion} = sub { 1485 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1486 my ($ev, $x, $y) = @_;
888 1487
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1488 ($x, $y) = ($ev->{x}, $ev->{y});
890 1489
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1490 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update; 1491 # HACK: the next line is required to enforce placement
1492 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
893 }; 1493 };
1494 } else {
1495 return 0;
1496 }
1497
894 } 1498 1
895} 1499}
896 1500
897sub button_up { 1501sub invoke_button_up {
898 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
899 1503
900 delete $self->{motion}; 1504 ! ! delete $self->{motion}
901} 1505}
902 1506
903sub mouse_motion { 1507sub invoke_mouse_motion {
904 my ($self, $ev, $x, $y) = @_; 1508 my ($self, $ev, $x, $y) = @_;
905 1509
906 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1511
1512 ! ! $self->{motion}
1513}
1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
907} 1521}
908 1522
909sub _draw { 1523sub _draw {
910 my ($self) = @_; 1524 my ($self) = @_;
911 1525
1526 my $child = $self->{children}[0];
1527
912 my ($w, $h ) = ($self->{w}, $self->{h}); 1528 my ($w, $h ) = ($self->{w}, $self->{h});
913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1529 my ($cw, $ch) = ($child->{w}, $child->{h});
914 1530
915 glEnable GL_TEXTURE_2D; 1531 glEnable GL_TEXTURE_2D;
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1533
918 my $border = $self->border; 1534 my $border = $self->border;
919 1535
920 glColor @{ $self->{border_bg} }; 1536 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1537 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1541
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1543 glColor @{ $self->{bg} };
928 1544
929 # TODO: repeat texture not scale 1545 # TODO: repeat texture not scale
1546 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1547 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1548 $bg->{t} = $ch / $bg->{h};
932
933 glColor @{ $self->{bg} };
934
935 $bg->{s} = $rep_x;
936 $bg->{t} = $rep_y;
937 $bg->{wrap_mode} = 1;
938 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1549 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1550 }
940 1551
941 glDisable GL_TEXTURE_2D; 1552 glDisable GL_TEXTURE_2D;
942 1553
943 $self->{title}->draw if $self->{title};
944
945 $self->child->draw; 1554 $child->draw;
1555
1556 if ($self->{title_widget}) {
1557 glTranslate 0, $border - $self->{h};
1558 $self->{title_widget}->_draw;
1559
1560 glTranslate 0, - ($border - $self->{h});
1561 }
1562
1563 $self->{close_button}->draw
1564 if $self->{close_button};
946} 1565}
947 1566
948############################################################################# 1567#############################################################################
949 1568
950package CFClient::UI::Table; 1569package CFPlus::UI::Table;
951 1570
952our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
953 1572
954use List::Util qw(max sum); 1573use List::Util qw(max sum);
955 1574
956use CFClient::OpenGL; 1575use CFPlus::OpenGL;
957 1576
958sub new { 1577sub new {
959 my $class = shift; 1578 my $class = shift;
960 1579
961 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
962 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
963 @_ 1584 @_,
964 ) 1585 )
965}
966
967sub add {
968 my ($self, $x, $y, $child) = @_;
969
970 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child;
972
973 $child->check_size;
974} 1586}
975 1587
976sub children { 1588sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978} 1590}
979 1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add {
1594 my ($self) = shift;
1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1604 $self->realloc;
1605}
1606
1607sub remove {
1608 my ($self, $child) = @_;
1609
1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1615}
1616
980# TODO: move to container class maybe? send childs a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
981sub clear { 1618sub clear {
982 my ($self) = @_; 1619 my ($self) = @_;
983 1620
984 my @children = $self->children; 1621 my @children = $self->children;
985 delete $self->{children}; 1622 delete $self->{children};
… …
987 for (@children) { 1624 for (@children) {
988 delete $_->{parent}; 1625 delete $_->{parent};
989 $_->hide; 1626 $_->hide;
990 } 1627 }
991 1628
992 $self->update; 1629 $self->realloc;
993} 1630}
994 1631
995sub get_wh { 1632sub get_wh {
996 my ($self) = @_; 1633 my ($self) = @_;
997 1634
… …
1023 (sum @$ws), 1660 (sum @$ws),
1024 (sum @$hs), 1661 (sum @$hs),
1025 ) 1662 )
1026} 1663}
1027 1664
1028sub size_allocate { 1665sub invoke_size_allocate {
1029 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1030 1667
1031 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1032 1669
1033 my $req_w = sum @$ws; 1670 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1671 my $req_h = (sum @$hs) || 1;
1035 1672
1036 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1037 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1040 1677
1041 # linearly scale sizes
1042 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1043 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1044 1679
1045 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1046 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1047 1689
1048 my $y; 1690 my $y;
1049 1691
1050 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1051 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1065 } 1707 }
1066 1708
1067 $y += $row_h; 1709 $y += $row_h;
1068 } 1710 }
1069 1711
1712 1
1070} 1713}
1071 1714
1072sub find_widget { 1715sub find_widget {
1073 my ($self, $x, $y) = @_; 1716 my ($self, $x, $y) = @_;
1074 1717
… …
1093 } 1736 }
1094} 1737}
1095 1738
1096############################################################################# 1739#############################################################################
1097 1740
1098package CFClient::UI::HBox; 1741package CFPlus::UI::Fixed;
1099 1742
1100# TODO: wrap into common Box base class 1743use List::Util qw(min max);
1101 1744
1102our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1103 1761
1104sub size_request { 1762sub size_request {
1105 my ($self) = @_; 1763 my ($self) = @_;
1106 1764
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1108 1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1109 ( 1778 }
1110 (List::Util::sum map $_->[0], @alloc), 1779
1111 (List::Util::max map $_->[1], @alloc), 1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1826
1827sub size_request {
1828 my ($self) = @_;
1829
1830 $self->{vertical}
1831 ? (
1832 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1833 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1834 )
1835 : (
1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1837 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1838 )
1839}
1840
1841sub invoke_size_allocate {
1842 my ($self, $w, $h) = @_;
1843
1844 my $space = $self->{vertical} ? $h : $w;
1845 my @children = $self->visible_children;
1846
1847 my @req;
1848
1849 if ($self->{homogeneous}) {
1850 @req = ($space / (@children || 1)) x @children;
1851 } else {
1852 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1853 my $req = List::Util::sum @req;
1854
1855 if ($req > $space) {
1856 # ah well, not enough space
1857 $_ *= $space / $req for @req;
1858 } else {
1859 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1860
1861 $space = ($space - $req) / $expand; # remaining space to give away
1862
1863 $req[$_] += $space * $children[$_]{expand}
1864 for 0 .. $#children;
1865 }
1866 }
1867
1868 CFPlus::UI::harmonize \@req;
1869
1870 my $pos = 0;
1871 for (0 .. $#children) {
1872 my $alloc = $req[$_];
1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1874
1875 $pos += $alloc;
1876 }
1877
1878 1
1879}
1880
1881#############################################################################
1882
1883package CFPlus::UI::HBox;
1884
1885our @ISA = CFPlus::UI::Box::;
1886
1887sub new {
1888 my $class = shift;
1889
1890 $class->SUPER::new (
1891 vertical => 0,
1892 @_,
1112 ) 1893 )
1113} 1894}
1114 1895
1115sub size_allocate {
1116 my ($self, $w, $h) = @_;
1117
1118 ($h, $w) = ($w, $h);
1119
1120 my $children = $self->{children};
1121
1122 my @h = map $_->{req_w}, @$children;
1123
1124 my $req_h = List::Util::sum @h;
1125
1126 if ($req_h > $h) {
1127 # ah well, not enough space
1128 $_ *= $h / $req_h for @h;
1129 } else {
1130 my $exp = List::Util::sum map $_->{expand}, @$children;
1131 $exp ||= 1;
1132
1133 for (0 .. $#$children) {
1134 my $child = $children->[$_];
1135
1136 my $alloc_h = $h[$_];
1137 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138 $h[$_] = $alloc_h;
1139 }
1140 }
1141
1142 CFClient::UI::harmonize \@h;
1143
1144 my $y = 0;
1145 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_];
1148 $child->configure ($y, 0, $h, $w);
1149
1150 $y += $h;
1151 }
1152
1153 1
1154}
1155
1156############################################################################# 1896#############################################################################
1157 1897
1158package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1159 1899
1160# TODO: wrap into common Box base class 1900our @ISA = CFPlus::UI::Box::;
1161 1901
1162our @ISA = CFClient::UI::Container::; 1902sub new {
1903 my $class = shift;
1163 1904
1164sub size_request { 1905 $class->SUPER::new (
1165 my ($self) = @_; 1906 vertical => 1,
1166 1907 @_,
1167 my @alloc = map [$_->size_request], @{$self->{children}};
1168
1169 (
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1908 )
1173} 1909}
1174 1910
1175sub size_allocate {
1176 my ($self, $w, $h) = @_;
1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180 my $children = $self->{children};
1181
1182 my @h = map $_->{req_h}, @$children;
1183
1184 my $req_h = List::Util::sum @h;
1185
1186 if ($req_h > $h) {
1187 # ah well, not enough space
1188 $_ *= $h / $req_h for @h;
1189 } else {
1190 my $exp = List::Util::sum map $_->{expand}, @$children;
1191 $exp ||= 1;
1192
1193 for (0 .. $#$children) {
1194 my $child = $children->[$_];
1195
1196 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197 }
1198 }
1199
1200 CFClient::UI::harmonize \@h;
1201
1202 my $y = 0;
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205 my $h = $h[$_];
1206 $child->configure (0, $y, $w, $h);
1207
1208 $y += $h;
1209 }
1210
1211 1
1212}
1213
1214############################################################################# 1911#############################################################################
1215 1912
1216package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1217 1914
1218our @ISA = CFClient::UI::Base::; 1915our @ISA = CFPlus::UI::DrawBG::;
1219 1916
1220use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1221 1918
1222sub new { 1919sub new {
1223 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1224 1921
1225 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1923 fg => [1, 1, 1],
1924 #bg => none
1925 #active_bg => none
1227 #font => default_font 1926 #font => default_font
1228 #text => initial text 1927 #text => initial text
1229 #markup => initial narkup 1928 #markup => initial narkup
1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1931 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1231 fontsize => 1, 1933 fontsize => 1,
1232 align => -1, 1934 align => -1,
1233 valign => -1, 1935 valign => -1,
1234 padding => 2, 1936 padding_x => 2,
1937 padding_y => 2,
1235 can_events => 0, 1938 can_events => 0,
1236 %arg 1939 %arg
1237 ); 1940 );
1238 1941
1239 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1240 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1241 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1242 $self->{template} = $layout; 1945 $self->{template} = $layout;
1243 } 1946 }
1244 1947
1245 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1249 } 1952 }
1250 1953
1251 $self 1954 $self
1252} 1955}
1253 1956
1254sub escape {
1255 local $_ = $_[1];
1256
1257 s/&/&amp;/g;
1258 s/>/&gt;/g;
1259 s/</&lt;/g;
1260
1261 $_[1]
1262}
1263
1264sub update { 1957sub update {
1265 my ($self) = @_; 1958 my ($self) = @_;
1266 1959
1267 delete $self->{texture}; 1960 delete $self->{texture};
1268 $self->SUPER::update; 1961 $self->SUPER::update;
1269} 1962}
1270 1963
1964sub realloc {
1965 my ($self) = @_;
1966
1967 delete $self->{ox};
1968 $self->SUPER::realloc;
1969}
1970
1271sub set_text { 1971sub set_text {
1272 my ($self, $text) = @_; 1972 my ($self, $text) = @_;
1273 1973
1274 return if $self->{text} eq "T$text"; 1974 return if $self->{text} eq "T$text";
1275 $self->{text} = "T$text"; 1975 $self->{text} = "T$text";
1276 1976
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1977 $self->{layout}->set_text ($text);
1279 1978
1979 delete $self->{size_req};
1980 $self->realloc;
1280 $self->update; 1981 $self->update;
1281 $self->check_size;
1282} 1982}
1283 1983
1284sub set_markup { 1984sub set_markup {
1285 my ($self, $markup) = @_; 1985 my ($self, $markup) = @_;
1286 1986
1287 return if $self->{text} eq "M$markup"; 1987 return if $self->{text} eq "M$markup";
1288 $self->{text} = "M$markup"; 1988 $self->{text} = "M$markup";
1289 1989
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1990 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1991
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1293 $self->{layout}->set_markup ($markup); 1992 $self->{layout}->set_markup ($markup);
1294 1993
1994 delete $self->{size_req};
1995 $self->realloc;
1295 $self->update; 1996 $self->update;
1296 $self->check_size;
1297} 1997}
1298 1998
1299sub size_request { 1999sub size_request {
1300 my ($self) = @_; 2000 my ($self) = @_;
1301 2001
2002 $self->{size_req} ||= do {
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2003 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 2004 $self->{layout}->set_width ($self->{max_w} || -1);
2005 $self->{layout}->set_ellipsise ($self->{ellipsise});
2006 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 2008
1306 my ($w, $h) = $self->{layout}->size; 2009 my ($w, $h) = $self->{layout}->size;
1307 2010
1308 if (exists $self->{template}) { 2011 if (exists $self->{template}) {
1309 $self->{template}->set_font ($self->{font}) if $self->{font}; 2012 $self->{template}->set_font ($self->{font}) if $self->{font};
2013 $self->{template}->set_width ($self->{max_w} || -1);
1310 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1311 2015
1312 my ($w2, $h2) = $self->{template}->size; 2016 my ($w2, $h2) = $self->{template}->size;
1313 2017
1314 $w = List::Util::max $w, $w2; 2018 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 2019 $h = List::Util::max $h, $h2;
2020 }
2021
2022 [$w, $h]
1316 } 2023 };
1317 2024
1318 ( 2025 @{ $self->{size_req} }
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 2026}
1323 2027
2028sub baseline_shift {
2029 $_[0]{layout}->descent
2030}
2031
1324sub size_allocate { 2032sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 2033 my ($self, $w, $h) = @_;
1326 2034
2035 delete $self->{ox};
2036
1327 delete $self->{texture}; 2037 delete $self->{texture}
2038 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2039
2040 1
1328} 2041}
1329 2042
1330sub set_fontsize { 2043sub set_fontsize {
1331 my ($self, $fontsize) = @_; 2044 my ($self, $fontsize) = @_;
1332 2045
1333 $self->{fontsize} = $fontsize; 2046 $self->{fontsize} = $fontsize;
2047 delete $self->{size_req};
1334 delete $self->{texture}; 2048 delete $self->{texture};
1335 2049
1336 $self->update; 2050 $self->realloc;
1337 $self->check_size; 2051}
2052
2053sub reconfigure {
2054 my ($self) = @_;
2055
2056 delete $self->{size_req};
2057 delete $self->{texture};
2058
2059 $self->SUPER::reconfigure;
1338} 2060}
1339 2061
1340sub _draw { 2062sub _draw {
1341 my ($self) = @_; 2063 my ($self) = @_;
1342 2064
2065 $self->SUPER::_draw; # draw background, if applicable
2066
1343 my $tex = $self->{texture} ||= do { 2067 my $size = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 2068 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2069 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 2070 $self->{layout}->set_width ($self->{w});
2071 $self->{layout}->set_ellipsise ($self->{ellipsise});
2072 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2073 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 2074
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2075 [$self->{layout}->size]
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1360 }; 2076 };
1361 2077
1362 glEnable GL_TEXTURE_2D; 2078 unless (exists $self->{ox}) {
1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2081 : ($self->{w} - $size->[0]) * 0.5);
1364 2082
1365 if ($tex->{format} == GL_ALPHA) { 2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1366 glColor @{$self->{fg}}; 2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2085 : ($self->{h} - $size->[1]) * 0.5);
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 } 2086 };
1371 2087
1372 glDisable GL_TEXTURE_2D; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
2090
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1373} 2092}
1374 2093
1375############################################################################# 2094#############################################################################
1376 2095
1377package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1378 2097
1379our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1380 2099
1381use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1382 2101
1383sub new { 2102sub new {
1384 my $class = shift; 2103 my $class = shift;
1385 2104
1386 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1390 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1391 can_hover => 1, 2110 can_hover => 1,
1392 can_focus => 1, 2111 can_focus => 1,
1393 valign => 0, 2112 valign => 0,
1394 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
2115 #text => ...
2116 #hidden => "*",
1395 @_ 2117 @_
1396 ) 2118 )
1397} 2119}
1398 2120
1399sub _set_text { 2121sub _set_text {
… …
1401 2123
1402 delete $self->{cur_h}; 2124 delete $self->{cur_h};
1403 2125
1404 return if $self->{text} eq $text; 2126 return if $self->{text} eq $text;
1405 2127
1406 delete $self->{texture};
1407
1408 $self->{last_activity} = $::NOW; 2128 $self->{last_activity} = $::NOW;
1409 $self->{text} = $text; 2129 $self->{text} = $text;
1410 2130
1411 $text =~ s/./*/g if $self->{hidden}; 2131 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 2132 $self->{layout}->set_text ("$text ");
2133 delete $self->{size_req};
1413 2134
1414 $self->emit (changed => $self->{text}); 2135 $self->emit (changed => $self->{text});
2136
2137 $self->realloc;
2138 $self->update;
1415} 2139}
1416 2140
1417sub set_text { 2141sub set_text {
1418 my ($self, $text) = @_; 2142 my ($self, $text) = @_;
1419 2143
1420 $self->{cursor} = length $text; 2144 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 2145 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424} 2146}
1425 2147
1426sub get_text { 2148sub get_text {
1427 $_[0]{text} 2149 $_[0]{text}
1428} 2150}
… …
1433 my ($w, $h) = $self->SUPER::size_request; 2155 my ($w, $h) = $self->SUPER::size_request;
1434 2156
1435 ($w + 1, $h) # add 1 for cursor 2157 ($w + 1, $h) # add 1 for cursor
1436} 2158}
1437 2159
1438sub size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442}
1443
1444sub key_down { 2160sub invoke_key_down {
1445 my ($self, $ev) = @_; 2161 my ($self, $ev) = @_;
1446 2162
1447 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1448 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1450 2166
1451 my $text = $self->get_text; 2167 my $text = $self->get_text;
1452 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1453 if ($sym == 8) { 2171 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 2173 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1462 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 2194 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 2195 $self->emit ('escape');
1467 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
2200 } else {
2201 return 0;
1469 } 2202 }
1470 2203
1471 $self->_set_text ($text); 2204 $self->_set_text ($text);
2205
2206 $self->realloc;
1472 $self->update; 2207 $self->update;
1473}
1474 2208
2209 1
2210}
2211
1475sub focus_in { 2212sub invoke_focus_in {
1476 my ($self) = @_; 2213 my ($self) = @_;
1477 2214
1478 $self->{last_activity} = $::NOW; 2215 $self->{last_activity} = $::NOW;
1479 2216
1480 $self->SUPER::focus_in; 2217 $self->SUPER::invoke_focus_in
1481} 2218}
1482 2219
1483sub button_down { 2220sub invoke_button_down {
1484 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1485 2222
1486 $self->SUPER::button_down ($ev, $x, $y); 2223 $self->SUPER::invoke_button_down ($ev, $x, $y);
1487 2224
1488 my $idx = $self->{layout}->xy_to_index ($x, $y); 2225 my $idx = $self->{layout}->xy_to_index ($x, $y);
1489 2226
1490 # byte-index to char-index 2227 # byte-index to char-index
1491 my $text = $self->{text}; 2228 my $text = $self->{text};
1492 utf8::encode $text; 2229 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1493 $self->{cursor} = length substr $text, 0, $idx; 2230 $self->{cursor} = length $text;
1494 2231
1495 $self->_set_text ($self->{text}); 2232 $self->_set_text ($self->{text});
1496 $self->update; 2233 $self->update;
2234
2235 1
1497} 2236}
1498 2237
1499sub mouse_motion { 2238sub invoke_mouse_motion {
1500 my ($self, $ev, $x, $y) = @_; 2239 my ($self, $ev, $x, $y) = @_;
1501# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2240# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2241
2242 1
1502} 2243}
1503 2244
1504sub _draw { 2245sub _draw {
1505 my ($self) = @_; 2246 my ($self) = @_;
1506 2247
1507 local $self->{fg} = $self->{fg}; 2248 local $self->{fg} = $self->{fg};
1508 2249
1509 if ($FOCUS == $self) { 2250 if ($FOCUS == $self) {
1510 glColor @{$self->{active_bg}}; 2251 glColor_premultiply @{$self->{active_bg}};
1511 $self->{fg} = $self->{active_fg}; 2252 $self->{fg} = $self->{active_fg};
1512 } else { 2253 } else {
1513 glColor @{$self->{bg}}; 2254 glColor_premultiply @{$self->{bg}};
1514 } 2255 }
1515 2256
1516 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
1517 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1518 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
1519 glVertex 0 , 0; 2260 glVertex 0 , 0;
1520 glVertex 0 , $self->{h}; 2261 glVertex 0 , $self->{h};
1521 glVertex $self->{w}, $self->{h}; 2262 glVertex $self->{w}, $self->{h};
1522 glVertex $self->{w}, 0; 2263 glVertex $self->{w}, 0;
… …
1533 utf8::encode $text; 2274 utf8::encode $text;
1534 2275
1535 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1536 } 2277 }
1537 2278
1538 glColor @{$self->{fg}};
1539 glBegin GL_LINES; 2279 glBegin GL_LINES;
1540 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1541 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1542 glEnd; 2282 glEnd;
1543 } 2283 }
1544} 2284}
1545 2285
2286#############################################################################
2287
1546package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1547 2289
1548our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1549 2291
1550use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1551 2293
1552sub key_down { 2294sub invoke_key_down {
1553 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1554 2296
1555 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1556 2298
1557 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1558 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
2302
1560 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1563 $self->update; 2306 $self->update;
1564 2307
1565 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1568 } 2311 }
1569 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1570 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1572 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1573 } 2316 }
1574 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1575 } 2318 }
1576 2319
1577 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1578 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1579 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1580 2323
1581 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1582 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1583 } else { 2326 } else {
1584 $self->set_text ($self->{history_saveback}); 2327 $self->set_text ($self->{history_saveback});
1585 } 2328 }
1586 2329
1587 } else { 2330 } else {
1588 $self->SUPER::key_down ($ev); 2331 return $self->SUPER::invoke_key_down ($ev)
2332 }
2333
1589 } 2334 1
1590
1591} 2335}
1592 2336
1593############################################################################# 2337#############################################################################
1594 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1595package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1596 2379
1597our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1598 2381
1599use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1600 2383
1601my @tex = 2384my @tex =
1602 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1603 qw(b1_button_active.png); 2386 qw(b1_button_active.png);
1604 2387
1605sub new { 2388sub new {
1606 my $class = shift; 2389 my $class = shift;
1607 2390
1608 $class->SUPER::new ( 2391 $class->SUPER::new (
1609 padding => 4, 2392 padding_x => 4,
2393 padding_y => 4,
1610 fg => [1, 1, 1], 2394 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 2395 active_fg => [0, 0, 1],
1613 can_hover => 1, 2396 can_hover => 1,
1614 align => 0, 2397 align => 0,
1615 valign => 0, 2398 valign => 0,
1616 can_events => 1, 2399 can_events => 1,
1617 @_ 2400 @_
1618 ) 2401 )
1619} 2402}
1620 2403
1621sub button_up { 2404sub invoke_button_up {
1622 my ($self, $ev, $x, $y) = @_; 2405 my ($self, $ev, $x, $y) = @_;
1623 2406
2407 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 2408 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 2409 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate"); 2410
1627 } 2411 1
1628} 2412}
1629 2413
1630sub _draw { 2414sub _draw {
1631 my ($self) = @_; 2415 my ($self) = @_;
1632 2416
1633 local $self->{fg} = $self->{fg}; 2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1634
1635 if ($GRAB == $self) {
1636 $self->{fg} = $self->{active_fg};
1637 }
1638 2418
1639 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
1642 2422
… …
1647 $self->SUPER::_draw; 2427 $self->SUPER::_draw;
1648} 2428}
1649 2429
1650############################################################################# 2430#############################################################################
1651 2431
1652package CFClient::UI::CheckBox; 2432package CFPlus::UI::CheckBox;
1653 2433
1654our @ISA = CFClient::UI::DrawBG::; 2434our @ISA = CFPlus::UI::DrawBG::;
1655 2435
1656my @tex = 2436my @tex =
1657 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1658 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2438 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1659 2439
1660use CFClient::OpenGL; 2440use CFPlus::OpenGL;
1661 2441
1662sub new { 2442sub new {
1663 my $class = shift; 2443 my $class = shift;
1664 2444
1665 $class->SUPER::new ( 2445 $class->SUPER::new (
1666 padding => 2, 2446 padding_x => 2,
2447 padding_y => 2,
1667 fg => [1, 1, 1], 2448 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 2449 active_fg => [1, 1, 0],
2450 bg => [0, 0, 0, 0.2],
2451 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 2452 state => 0,
1670 can_hover => 1, 2453 can_hover => 1,
1671 @_ 2454 @_
1672 ) 2455 )
1673} 2456}
1674 2457
1675sub size_request { 2458sub size_request {
1676 my ($self) = @_; 2459 my ($self) = @_;
1677 2460
1678 ($self->{padding} * 2 + 6) x 2 2461 (6) x 2
1679} 2462}
1680 2463
2464sub toggle {
2465 my ($self) = @_;
2466
2467 $self->{state} = !$self->{state};
2468 $self->emit (changed => $self->{state});
2469 $self->update;
2470}
2471
1681sub button_down { 2472sub invoke_button_down {
1682 my ($self, $ev, $x, $y) = @_; 2473 my ($self, $ev, $x, $y) = @_;
1683 2474
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2475 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2476 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 2477 $self->toggle;
1687 $self->emit (changed => $self->{state}); 2478 } else {
2479 return 0
2480 }
2481
1688 } 2482 1
1689} 2483}
1690 2484
1691sub _draw { 2485sub _draw {
1692 my ($self) = @_; 2486 my ($self) = @_;
1693 2487
1694 $self->SUPER::_draw; 2488 $self->SUPER::_draw;
1695 2489
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2490 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 2491
1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2492 my ($w, $h) = @$self{qw(w h)};
2493
2494 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1699 2495
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2496 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 2497
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2498 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 2499
… …
1706 glDisable GL_TEXTURE_2D; 2502 glDisable GL_TEXTURE_2D;
1707} 2503}
1708 2504
1709############################################################################# 2505#############################################################################
1710 2506
1711package CFClient::UI::Image; 2507package CFPlus::UI::Image;
1712 2508
1713our @ISA = CFClient::UI::Base::; 2509our @ISA = CFPlus::UI::Base::;
1714 2510
1715use CFClient::OpenGL; 2511use CFPlus::OpenGL;
1716use Carp qw/confess/;
1717 2512
1718our %loaded_images; 2513our %texture_cache;
1719 2514
1720sub new { 2515sub new {
1721 my $class = shift; 2516 my $class = shift;
1722 2517
1723 my $self = $class->SUPER::new (can_events => 0, @_); 2518 my $self = $class->SUPER::new (
2519 can_events => 0,
2520 @_,
2521 );
1724 2522
1725 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2523 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required";
1726 2525
1727 $loaded_images{$self->{image}} ||= 2526 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1728 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2527 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1729 2528
1730 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2529 CFPlus::weaken $texture_cache{$self->{path}};
1731 2530
1732 Scalar::Util::weaken $loaded_images{$self->{image}}; 2531 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1733
1734 $self->{aspect} = $tex->{w} / $tex->{h};
1735 2532
1736 $self 2533 $self
1737} 2534}
1738 2535
2536sub STORABLE_freeze {
2537 my ($self, $cloning) = @_;
2538
2539 $self->{path}
2540 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2541
2542 $self->{path}
2543}
2544
2545sub STORABLE_attach {
2546 my ($self, $cloning, $path) = @_;
2547
2548 $self->new (path => $path)
2549}
2550
1739sub size_request { 2551sub size_request {
1740 my ($self) = @_; 2552 my ($self) = @_;
1741 2553
1742 ($self->{tex}->{w}, $self->{tex}->{h}) 2554 ($self->{tex}{w}, $self->{tex}{h})
1743} 2555}
1744 2556
1745sub _draw { 2557sub _draw {
1746 my ($self) = @_; 2558 my ($self) = @_;
1747 2559
… …
1757 } 2569 }
1758 2570
1759 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1761 2573
1762 $tex->draw_quad_alpha (0, 0, $w, $h); 2574 $tex->draw_quad (0, 0, $w, $h);
1763 2575
1764 glDisable GL_TEXTURE_2D; 2576 glDisable GL_TEXTURE_2D;
1765} 2577}
1766 2578
1767############################################################################# 2579#############################################################################
1768 2580
2581package CFPlus::UI::ImageButton;
2582
2583our @ISA = CFPlus::UI::Image::;
2584
2585use CFPlus::OpenGL;
2586
2587my %textures;
2588
2589sub new {
2590 my $class = shift;
2591
2592 my $self = $class->SUPER::new (
2593 padding_x => 4,
2594 padding_y => 4,
2595 fg => [1, 1, 1],
2596 active_fg => [0, 0, 1],
2597 can_hover => 1,
2598 align => 0,
2599 valign => 0,
2600 can_events => 1,
2601 @_
2602 );
2603}
2604
2605sub invoke_button_up {
2606 my ($self, $ev, $x, $y) = @_;
2607
2608 $self->emit ("activate")
2609 if $x >= 0 && $x < $self->{w}
2610 && $y >= 0 && $y < $self->{h};
2611
2612 1
2613}
2614
2615#############################################################################
2616
1769package CFClient::UI::VGauge; 2617package CFPlus::UI::VGauge;
1770 2618
1771our @ISA = CFClient::UI::Base::; 2619our @ISA = CFPlus::UI::Base::;
1772 2620
1773use List::Util qw(min max); 2621use List::Util qw(min max);
1774 2622
1775use CFClient::OpenGL; 2623use CFPlus::OpenGL;
1776 2624
1777my %tex = ( 2625my %tex = (
1778 food => [ 2626 food => [
1779 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2627 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1780 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2628 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1781 ], 2629 ],
1782 grace => [ 2630 grace => [
1783 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2631 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1784 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2632 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1785 ], 2633 ],
1786 hp => [ 2634 hp => [
1787 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2635 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1788 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2636 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1789 ], 2637 ],
1790 mana => [ 2638 mana => [
1791 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2639 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1792 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2640 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1793 ], 2641 ],
1794); 2642);
1795 2643
1796# eg. VGauge->new (gauge => 'food'), default gauge: food 2644# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1856 my $ycut1 = max 0, min 1, $ycut; 2704 my $ycut1 = max 0, min 1, $ycut;
1857 my $ycut2 = max 0, min 1, $ycut - 1; 2705 my $ycut2 = max 0, min 1, $ycut - 1;
1858 2706
1859 my $h1 = $self->{h} * (1 - $ycut1); 2707 my $h1 = $self->{h} * (1 - $ycut1);
1860 my $h2 = $self->{h} * (1 - $ycut2); 2708 my $h2 = $self->{h} * (1 - $ycut2);
2709 my $h3 = $self->{h};
2710
2711 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1861 2712
1862 glEnable GL_BLEND; 2713 glEnable GL_BLEND;
1863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2715 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1864 glEnable GL_TEXTURE_2D; 2716 glEnable GL_TEXTURE_2D;
1865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1866 2718
1867 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2719 glBindTexture GL_TEXTURE_2D, $t1->{name};
1868 glBegin GL_QUADS; 2720 glBegin GL_QUADS;
… …
1883 2735
1884 if ($t3) { 2736 if ($t3) {
1885 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2737 glBindTexture GL_TEXTURE_2D, $t3->{name};
1886 glBegin GL_QUADS; 2738 glBegin GL_QUADS;
1887 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2739 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1888 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2740 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1889 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2741 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1890 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2742 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1891 glEnd; 2743 glEnd;
1892 } 2744 }
1893 2745
1894 glDisable GL_BLEND; 2746 glDisable GL_BLEND;
1895 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
1896} 2748}
1897 2749
1898############################################################################# 2750#############################################################################
1899 2751
1900package CFClient::UI::Gauge; 2752package CFPlus::UI::Gauge;
1901 2753
1902our @ISA = CFClient::UI::VBox::; 2754our @ISA = CFPlus::UI::VBox::;
1903 2755
1904sub new { 2756sub new {
1905 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
1906 2758
1907 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
… …
1909 can_hover => 1, 2761 can_hover => 1,
1910 can_events => 1, 2762 can_events => 1,
1911 %arg, 2763 %arg,
1912 ); 2764 );
1913 2765
1914 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2766 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1915 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2767 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1916 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2768 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1917 2769
1918 $self 2770 $self
1919} 2771}
1920 2772
1921sub set_fontsize { 2773sub set_fontsize {
… …
1942 $self->{value}->set_text ($val); 2794 $self->{value}->set_text ($val);
1943} 2795}
1944 2796
1945############################################################################# 2797#############################################################################
1946 2798
1947package CFClient::UI::Slider; 2799package CFPlus::UI::Slider;
1948 2800
1949use strict; 2801use strict;
1950 2802
1951use CFClient::OpenGL; 2803use CFPlus::OpenGL;
1952 2804
1953our @ISA = CFClient::UI::DrawBG::; 2805our @ISA = CFPlus::UI::DrawBG::;
1954 2806
1955my @tex = 2807my @tex =
1956 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2808 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1957 qw(s1_slider.png s1_slider_bg.png); 2809 qw(s1_slider.png s1_slider_bg.png);
1958 2810
1959sub new { 2811sub new {
1960 my $class = shift; 2812 my $class = shift;
1961 2813
1962 # range [value, low, high, page] 2814 # range [value, low, high, page, unit]
1963 2815
1964 # TODO: 0-width page 2816 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2817 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2818 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2820 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2821 active_fg => [0, 0, 0],
2822 bg => [0, 0, 0, 0.2],
2823 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2824 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2825 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2826 min_h => $::WIDTH / 80,
1973 vertical => 0, 2827 vertical => 0,
1974 can_hover => 1, 2828 can_hover => 1,
1975 inner_pad => 5, 2829 inner_pad => 0.02,
1976 @_ 2830 @_
1977 ); 2831 );
1978 2832
2833 $self->set_value ($self->{range}[0]);
2834 $self->update;
2835
1979 $self 2836 $self
1980} 2837}
1981 2838
2839sub set_range {
2840 my ($self, $range) = @_;
2841
2842 ($range, $self->{range}) = ($self->{range}, $range);
2843
2844 if ("@$range" ne "@{$self->{range}}") {
2845 $self->update;
2846 $self->set_value ($self->{range}[0]);
2847 }
2848}
2849
2850sub set_value {
2851 my ($self, $value) = @_;
2852
2853 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2854
2855 $hi = $lo + 1 if $hi <= $lo;
2856
2857 $page = $hi - $lo if $page > $hi - $lo;
2858
2859 $value = $lo if $value < $lo;
2860 $value = $hi - $page if $value > $hi - $page;
2861
2862 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2863 if $unit;
2864
2865 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2866
2867 if ($value != $old_value) {
2868 $self->emit (changed => $value);
2869 $self->update;
2870 }
2871}
2872
1982sub size_request { 2873sub size_request {
1983 my ($self) = @_; 2874 my ($self) = @_;
1984 2875
1985 my $w = $self->{req_w}; 2876 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2877}
1990 2878
1991sub button_down { 2879sub invoke_button_down {
1992 my ($self, $ev, $x, $y) = @_; 2880 my ($self, $ev, $x, $y) = @_;
1993 2881
1994 $self->SUPER::button_down ($ev, $x, $y); 2882 $self->SUPER::invoke_button_down ($ev, $x, $y);
2883
2884 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885
1995 $self->mouse_motion ($ev, $x, $y); 2886 $self->invoke_mouse_motion ($ev, $x, $y)
1996} 2887}
1997 2888
1998sub mouse_motion { 2889sub invoke_mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2890 my ($self, $ev, $x, $y) = @_;
2000 2891
2001 if ($GRAB == $self) { 2892 if ($GRAB == $self) {
2893 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2894
2895 my (undef, $lo, $hi, $page) = @{$self->{range}};
2896
2897 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2898
2899 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2900 } else {
2901 return 0;
2902 }
2903
2904 1
2905}
2906
2907sub invoke_mouse_wheel {
2908 my ($self, $ev) = @_;
2909
2910 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2911
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915
2916 ! ! $delta
2917}
2918
2919sub update {
2920 my ($self) = @_;
2921
2922 delete $self->{knob_w};
2923 $self->SUPER::update;
2924}
2925
2926sub _draw {
2927 my ($self) = @_;
2928
2929 unless ($self->{knob_w}) {
2930 $self->set_value ($self->{range}[0]);
2931
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2932 my ($value, $lo, $hi, $page) = @{$self->{range}};
2933 my $range = ($hi - $page - $lo) || 1e-100;
2003 2934
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2935 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2936
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2937 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2938 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2939
2009 $x -= $inner_pad_px; # substract the padding 2940 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2941 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2942
2015 $self->emit (changed => $x); 2943 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2944 $self->{knob_w} = $knob_w;
2017 } 2945 }
2018}
2019
2020# the inner_* stuff is for generating a padding for the slider handle,
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026}
2027
2028sub _draw {
2029 my ($self) = @_;
2030 2946
2031 $self->SUPER::_draw (); 2947 $self->SUPER::_draw ();
2032 2948
2033 my ($w, $h) = @$self{qw(w h)}; 2949 glScale $self->{w}, $self->{h};
2034 2950
2035 if ($self->{vertical}) { 2951 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2952 # draw a vertical slider like a rotated horizontal slider
2037 2953
2954 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2955 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2956 }
2043 2957
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2958 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2959 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2960
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2963
2068 # draw background 2964 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2965 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2966
2071 # draw handle 2967 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2968 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2969
2074 glDisable GL_TEXTURE_2D; 2970 glDisable GL_TEXTURE_2D;
2075} 2971}
2076 2972
2077############################################################################# 2973#############################################################################
2078 2974
2079package CFClient::UI::TextView; 2975package CFPlus::UI::ValSlider;
2080 2976
2081our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2082 2978
2979sub new {
2980 my ($class, %arg) = @_;
2981
2982 my $range = delete $arg{range};
2983
2984 my $self = $class->SUPER::new (
2985 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2986 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2987 to_value => sub { shift },
2988 from_value => sub { shift },
2989 %arg,
2990 );
2991
2992 $self->{slider}->connect (changed => sub {
2993 my ($self, $value) = @_;
2994 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2995 $self->{parent}->emit (changed => $value);
2996 });
2997
2998# $self->{entry}->connect (changed => sub {
2999# my ($self, $value) = @_;
3000# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
3001# $self->{parent}->emit (changed => $value);
3002# });
3003
3004 $self->add ($self->{slider}, $self->{entry});
3005
3006 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
3007
3008 $self
3009}
3010
3011sub set_range { shift->{slider}->set_range (@_) }
3012sub set_value { shift->{slider}->set_value (@_) }
3013
3014#############################################################################
3015
3016package CFPlus::UI::TextScroller;
3017
3018our @ISA = CFPlus::UI::HBox::;
3019
2083use CFClient::OpenGL; 3020use CFPlus::OpenGL;
2084 3021
2085sub new { 3022sub new {
2086 my $class = shift; 3023 my $class = shift;
2087 3024
2088 my $self = $class->SUPER::new ( 3025 my $self = $class->SUPER::new (
2089 fontsize => 1, 3026 fontsize => 1,
2090 can_events => 0, 3027 can_events => 1,
3028 indent => 0,
2091 #font => default_font 3029 #font => default_font
2092 @_, 3030 @_,
2093 3031
2094 layout => (new CFClient::Layout 1), 3032 layout => (new CFPlus::Layout),
2095 par => [], 3033 par => [],
3034 max_par => 0,
2096 height => 0, 3035 height => 0,
2097 children => [ 3036 children => [
2098 (new CFClient::UI::Empty expand => 1), 3037 (new CFPlus::UI::Empty expand => 1),
2099 (new CFClient::UI::Slider vertical => 1), 3038 (new CFPlus::UI::Slider vertical => 1),
2100 ], 3039 ],
2101 ); 3040 );
2102 3041
2103 $self->{children}[1]->connect (changed => sub { $self->update }); 3042 $self->{children}[1]->connect (changed => sub { $self->update });
2104 3043
… …
2110 3049
2111 $self->{fontsize} = $fontsize; 3050 $self->{fontsize} = $fontsize;
2112 $self->reflow; 3051 $self->reflow;
2113} 3052}
2114 3053
2115sub text_height { 3054sub size_request {
3055 my ($self) = @_;
3056
3057 my ($empty, $slider) = @{ $self->{children} };
3058
3059 local $self->{children} = [$empty, $slider];
3060 $self->SUPER::size_request
3061}
3062
3063sub invoke_size_allocate {
3064 my ($self, $w, $h) = @_;
3065
3066 my ($empty, $slider, @other) = @{ $self->{children} };
3067 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3068
3069 $self->{layout}->set_font ($self->{font}) if $self->{font};
3070 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3071 $self->{layout}->set_width ($empty->{w});
3072 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3073
3074 $self->reflow;
3075
3076 local $self->{children} = [$empty, $slider];
3077 $self->SUPER::invoke_size_allocate ($w, $h)
3078}
3079
3080sub invoke_mouse_wheel {
2116 my ($self, $text) = @_; 3081 my ($self, $ev) = @_;
3082
3083 return 0 unless $ev->{dy}; # only vertical movements
3084
3085 $self->{children}[1]->emit (mouse_wheel => $ev);
3086
3087 1
3088}
3089
3090sub get_layout {
3091 my ($self, $para) = @_;
2117 3092
2118 my $layout = $self->{layout}; 3093 my $layout = $self->{layout};
2119 3094
3095 $layout->set_font ($self->{font}) if $self->{font};
3096 $layout->set_foreground (@{$para->{fg}});
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3097 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w}); 3098 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3099 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2122 $layout->set_markup ($text); 3100 $layout->set_markup ($para->{markup});
3101
3102 $layout->set_shapes (
3103 map
3104 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3105 @{$para->{widget}}
2123 3106 );
2124 ($layout->size)[1] 3107
3108 $layout
2125} 3109}
2126 3110
2127sub reflow { 3111sub reflow {
2128 my ($self) = @_; 3112 my ($self) = @_;
2129 3113
2130 $self->{need_reflow}++; 3114 $self->{need_reflow}++;
2131 $self->update; 3115 $self->update;
2132} 3116}
2133 3117
2134sub size_allocate { 3118sub set_offset {
3119 my ($self, $offset) = @_;
3120
3121 # todo: base offset on lines or so, not on pixels
3122 $self->{children}[1]->set_value ($offset);
3123}
3124
3125sub current_paragraph {
3126 my ($self) = @_;
3127
3128 $self->{top_paragraph} - 1
3129}
3130
3131sub scroll_to {
2135 my ($self, $w, $h) = @_; 3132 my ($self, $para) = @_;
2136 3133
2137 $self->SUPER::size_allocate ($w, $h); 3134 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2138 3135
2139 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3136 $self->{scroll_to} = $para;
2140 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3137 $self->update;
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 3138}
2142 3139
2143 $self->reflow; 3140sub clear {
3141 my ($self) = @_;
3142
3143 my (undef, undef, @other) = @{ $self->{children} };
3144 $self->remove ($_) for @other;
3145
3146 $self->{par} = [];
3147 $self->{height} = 0;
3148 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2144} 3149}
2145 3150
2146sub add_paragraph { 3151sub add_paragraph {
2147 my ($self, $color, $text) = @_; 3152 my $self = shift;
2148 3153
2149 #TODO: intelligently "reformat" paragraph 3154 for my $para (@_) {
3155 $para = {
3156 fg => [1, 1, 1, 1],
3157 indent => 0,
3158 markup => "",
3159 widget => [],
3160 ref $para ? %$para : (markup => $para),
3161 w => 1e10,
3162 wrapped => 1,
3163 };
2150 3164
2151 my $height = $self->text_height ($text); 3165 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3166 push @{$self->{par}}, $para;
3167 }
2152 3168
3169 if (my $max = $self->{max_par}) {
3170 shift @{$self->{par}} while @{$self->{par}} > $max;
3171 }
3172
3173 $self->{need_reflow}++;
3174 $self->update;
3175}
3176
3177sub scroll_to_bottom {
3178 my ($self) = @_;
3179
3180 $self->{scroll_to} = $#{$self->{par}};
3181 $self->update;
3182}
3183
3184sub force_uptodate {
3185 my ($self) = @_;
3186
3187 if (delete $self->{need_reflow}) {
3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189
3190 my $height = 0;
3191
3192 for my $para (@{$self->{par}}) {
3193 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3194 my $layout = $self->get_layout ($para);
3195 my ($w, $h) = $layout->size;
3196
3197 $para->{w} = $w + $para->{indent};
3198 $para->{h} = $h;
3199 $para->{wrapped} = $layout->has_wrapped;
3200 }
3201
3202 $para->{y} = $height;
3203 $height += $para->{h};
3204 }
3205
2153 $self->{height} += $height; 3206 $self->{height} = $height;
3207 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2154 3208
2155 push @{$self->{par}}, [$height, $color, $text]; 3209 delete $self->{texture};
3210 }
2156 3211
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3212 if (my $paridx = delete $self->{scroll_to}) {
2158 $self->{children}[1]->update; 3213 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3214 }
2159} 3215}
2160 3216
2161sub update { 3217sub update {
2162 my ($self) = @_; 3218 my ($self) = @_;
2163 3219
… …
2165 3221
2166 return unless $self->{h} > 0; 3222 return unless $self->{h} > 0;
2167 3223
2168 delete $self->{texture}; 3224 delete $self->{texture};
2169 3225
2170 $ROOT->on_refresh ($self, sub { 3226 $ROOT->on_post_alloc ($self => sub {
2171 if (delete $self->{need_reflow}) { 3227 $self->force_uptodate;
2172 my $height = 0;
2173 3228
2174 $height += $_->[0] = $self->text_height ($_->[2]) 3229 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2175 for @{$self->{par}};
2176 3230
2177 $self->{height} = $height; 3231 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2178
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2180
2181 delete $self->{texture};
2182 }
2183
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2185 glClearColor 0, 0, 0, 0; 3232 glClearColor 0, 0, 0, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 3233 glClear GL_COLOR_BUFFER_BIT;
2187 3234
2188 glEnable GL_TEXTURE_2D; 3235 package CFPlus::UI::Base;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3236 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3237 (0, 0, $self->{w}, $self->{h});
2190 3238
2191 my $top = int $self->{children}[1]{range}[0]; 3239 my $top = int $self->{children}[1]{range}[0];
2192 3240
3241 my $paridx = 0;
3242 my $top_paragraph;
3243 my $top = int $self->{children}[1]{range}[0];
3244
2193 my $y0 = $top; 3245 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 3246 my $y1 = $top + $H;
2195 3247
2196 my $y = 0;
2197
2198 my $layout = $self->{layout};
2199
2200 $layout->set_font ($self->{font}) if $self->{font};
2201
2202 for my $par (@{$self->{par}}) { 3248 for my $para (@{$self->{par}}) {
2203 my $h = $par->[0]; 3249 my $h = $para->{h};
3250 my $y = $para->{y};
2204 3251
2205 if ($y0 < $y + $h && $y < $y1) { 3252 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 3253 my $layout = $self->get_layout ($para);
2207 $layout->set_markup ($par->[2]);
2208 3254
2209 my ($W, $H) = $layout->size; 3255 $layout->render ($para->{indent}, $y - $y0);
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3256
3257 if (my @w = @{ $para->{widget} }) {
3258 my @s = $layout->get_shapes;
3259
3260 for (@w) {
3261 my ($dx, $dy) = splice @s, 0, 2, ();
3262
3263 $_->{x} = $dx + $para->{indent};
3264 $_->{y} = $dy + $y - $y0;
3265
3266 $_->draw;
3267 }
3268 }
2211 } 3269 }
2212 3270
2213 $y += $h; 3271 $paridx++;
3272 $top_paragraph ||= $paridx if $y >= $top;
2214 } 3273 }
2215 3274
2216 glDisable GL_TEXTURE_2D; 3275 $self->{top_paragraph} = $top_paragraph;
2217 }; 3276 };
2218 }); 3277 });
2219} 3278}
2220 3279
3280sub reconfigure {
3281 my ($self) = @_;
3282
3283 $self->SUPER::reconfigure;
3284
3285 $_->{w} = 1e10 for @{ $self->{par} };
3286 $self->reflow;
3287}
3288
2221sub _draw { 3289sub _draw {
2222 my ($self) = @_; 3290 my ($self) = @_;
2223 3291
2224 glEnable GL_TEXTURE_2D; 3292 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 3294 glColor 0, 0, 0, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3295 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 3296 glDisable GL_TEXTURE_2D;
2229 3297
2230 $self->{children}[1]->draw; 3298 $self->{children}[1]->draw;
2231
2232} 3299}
2233 3300
2234############################################################################# 3301#############################################################################
2235 3302
2236package CFClient::UI::Animator; 3303package CFPlus::UI::Animator;
2237 3304
2238use CFClient::OpenGL; 3305use CFPlus::OpenGL;
2239 3306
2240our @ISA = CFClient::UI::Bin::; 3307our @ISA = CFPlus::UI::Bin::;
2241 3308
2242sub moveto { 3309sub moveto {
2243 my ($self, $x, $y) = @_; 3310 my ($self, $x, $y) = @_;
2244 3311
2245 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3312 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2273 glPopMatrix; 3340 glPopMatrix;
2274} 3341}
2275 3342
2276############################################################################# 3343#############################################################################
2277 3344
2278package CFClient::UI::Flopper; 3345package CFPlus::UI::Flopper;
2279 3346
2280our @ISA = CFClient::UI::Button::; 3347our @ISA = CFPlus::UI::Button::;
2281 3348
2282sub new { 3349sub new {
2283 my $class = shift; 3350 my $class = shift;
2284 3351
2285 my $self = $class->SUPER::new ( 3352 my $self = $class->SUPER::new (
2286 state => 0, 3353 state => 0,
2287 connect_activate => \&toggle_flopper, 3354 on_activate => \&toggle_flopper,
2288 @_ 3355 @_
2289 ); 3356 );
2290 3357
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 3358 $self
2297} 3359}
2298 3360
2299sub toggle_flopper { 3361sub toggle_flopper {
2300 my ($self) = @_; 3362 my ($self) = @_;
2301 3363
2302 # TODO: use animation 3364 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 3365}
2314 3366
2315############################################################################# 3367#############################################################################
2316 3368
2317package CFClient::UI::Tooltip; 3369package CFPlus::UI::Tooltip;
2318 3370
2319our @ISA = CFClient::UI::Bin::; 3371our @ISA = CFPlus::UI::Bin::;
2320 3372
2321use CFClient::OpenGL; 3373use CFPlus::OpenGL;
2322 3374
2323sub new { 3375sub new {
2324 my $class = shift; 3376 my $class = shift;
2325 3377
2326 $class->SUPER::new ( 3378 $class->SUPER::new (
… …
2330} 3382}
2331 3383
2332sub set_tooltip_from { 3384sub set_tooltip_from {
2333 my ($self, $widget) = @_; 3385 my ($self, $widget) = @_;
2334 3386
3387 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3388 if $widget->{tooltip} =~ /^#(.*)$/;
3389
3390 my $tooltip = $widget->{tooltip};
3391
3392 if ($ENV{CFPLUS_DEBUG} & 2) {
3393 $tooltip .= "\n\n" . (ref $widget) . "\n"
3394 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3395 . "req $widget->{req_w} $widget->{req_h}\n"
3396 . "visible $widget->{visible}";
3397 }
3398
3399 $tooltip =~ s/^\n+//;
3400 $tooltip =~ s/\n+$//;
3401
2335 $self->add (new CFClient::UI::Label 3402 $self->add (new CFPlus::UI::Label
2336 markup => $widget->{tooltip}, 3403 markup => $tooltip,
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3404 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 3405 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 3406 style => 1, # FLAG_INVERSE
3407 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 3408 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 3409 );
2342} 3410}
2343 3411
2344sub size_request { 3412sub size_request {
2345 my ($self) = @_; 3413 my ($self) = @_;
… …
2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3415 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2348 3416
2349 ($w + 4, $h + 4) 3417 ($w + 4, $h + 4)
2350} 3418}
2351 3419
2352sub size_allocate { 3420sub invoke_size_allocate {
2353 my ($self, $w, $h) = @_; 3421 my ($self, $w, $h) = @_;
2354 3422
2355 $self->SUPER::size_allocate ($w - 4, $h - 4); 3423 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3424}
3425
3426sub invoke_visibility_change {
3427 my ($self, $visible) = @_;
3428
3429 return unless $visible;
3430
3431 $self->{root}->on_post_alloc ("move_$self" => sub {
3432 my $widget = $self->{owner}
3433 or return;
3434
3435 if ($widget->{visible}) {
3436 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3437
3438 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3439 if $x + $self->{w} > $self->{root}{w};
3440
3441 $self->move_abs ($x, $y);
3442 } else {
3443 $self->hide;
3444 }
3445 });
2356} 3446}
2357 3447
2358sub _draw { 3448sub _draw {
2359 my ($self) = @_; 3449 my ($self) = @_;
2360 3450
… …
2377 glVertex $w, $h; 3467 glVertex $w, $h;
2378 glVertex $w, 0; 3468 glVertex $w, 0;
2379 glEnd; 3469 glEnd;
2380 3470
2381 glTranslate 2 - 0.375, 2 - 0.375; 3471 glTranslate 2 - 0.375, 2 - 0.375;
3472
2382 $self->SUPER::_draw; 3473 $self->SUPER::_draw;
2383} 3474}
2384 3475
2385############################################################################# 3476#############################################################################
2386 3477
2387package CFClient::UI::Face; 3478package CFPlus::UI::Face;
2388 3479
2389our @ISA = CFClient::UI::Base::; 3480our @ISA = CFPlus::UI::DrawBG::;
2390 3481
2391use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2392 3483
2393sub new { 3484sub new {
2394 my $class = shift; 3485 my $class = shift;
2395 3486
2396 $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
2397 aspect => 1, 3490 aspect => 1,
3491 can_events => 0,
2398 @_, 3492 @_,
2399 ) 3493 );
3494
3495 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self);
3497
3498 $self->{timer} = Event->timer (
3499 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3500 hard => 1,
3501 interval => $self->{animspeed},
3502 cb => sub {
3503 return unless $::CONN;
3504
3505 ++$widget->{frame};
3506 $self->update_face;
3507 $self->update;
3508 },
3509 );
3510
3511 $self->update_face;
3512 }
3513
3514 $self
3515}
3516
3517sub update_face {
3518 my ($self) = @_;
3519
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
2400} 3528}
2401 3529
2402sub size_request { 3530sub size_request {
2403 (32, 8) 3531 my ($self) = @_;
3532
3533 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc;
3540 });
3541 }
3542 }
3543 }
3544
3545 ($self->{size_w} || 8, $self->{size_h} || 8)
3546}
3547
3548sub update {
3549 my ($self) = @_;
3550
3551 return unless $self->{visible};
3552
3553 $self->SUPER::update;
2404} 3554}
2405 3555
2406sub _draw { 3556sub _draw {
2407 my ($self) = @_; 3557 my ($self) = @_;
2408 3558
2409 return unless $::CONN;#d# manage and cache textures differently 3559 return unless $::CONN;
3560
3561 $self->SUPER::_draw;
3562
3563 my $faceid = $::CONN->{faceid}[$self->{face}]
3564 or return;
3565
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3566 my $tex = $::CONN->{texture}[$faceid];
2411 3567
2412 # TODO animation
2413 if ($tex) { 3568 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 3569 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 3571 glColor 0, 0, 0, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3572 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 3573 glDisable GL_TEXTURE_2D;
2419 } 3574 }
2420} 3575}
2421 3576
3577sub destroy {
3578 my ($self) = @_;
3579
3580 $self->{timer}->cancel
3581 if $self->{timer};
3582
3583 $self->SUPER::destroy;
3584}
3585
2422############################################################################# 3586#############################################################################
2423 3587
2424package CFClient::UI::InventoryItem; 3588package CFPlus::UI::Buttonbar;
2425 3589
2426our @ISA = CFClient::UI::HBox::; 3590our @ISA = CFPlus::UI::HBox::;
2427 3591
2428sub new { 3592# TODO: should actually wrap buttons and other goodies.
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487 3593
2488############################################################################# 3594#############################################################################
2489 3595
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Menu; 3596package CFPlus::UI::Menu;
2534 3597
2535our @ISA = CFClient::UI::FancyFrame::; 3598our @ISA = CFPlus::UI::Toplevel::;
2536 3599
2537use CFClient::OpenGL; 3600use CFPlus::OpenGL;
2538 3601
2539sub new { 3602sub new {
2540 my $class = shift; 3603 my $class = shift;
2541 3604
2542 my $self = $class->SUPER::new ( 3605 my $self = $class->SUPER::new (
2543 items => [], 3606 items => [],
2544 z => 100, 3607 z => 100,
2545 @_, 3608 @_,
2546 ); 3609 );
2547 3610
2548 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3611 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2549 3612
2550 for my $item (@{ $self->{items} }) { 3613 for my $item (@{ $self->{items} }) {
2551 my ($widget, $cb) = @$item; 3614 my ($widget, $cb, $tooltip) = @$item;
2552 3615
2553 # handle various types of items, only text for now 3616 # handle various types of items, only text for now
2554 if (!ref $widget) { 3617 if (!ref $widget) {
3618 if ($widget =~ /\t/) {
3619 my ($left, $right) = split /\t/, $widget, 2;
3620
2555 $widget = new CFClient::UI::Label 3621 $widget = new CFPlus::UI::HBox
2556 can_hover => 1, 3622 can_hover => 1,
2557 can_events => 1, 3623 can_events => 1,
3624 tooltip => $tooltip,
3625 children => [
3626 (new CFPlus::UI::Label markup => $left, expand => 1),
3627 (new CFPlus::UI::Label markup => $right, align => +1),
3628 ],
3629 ;
3630
3631 } else {
3632 $widget = new CFPlus::UI::Label
3633 can_hover => 1,
3634 can_events => 1,
2558 text => $widget; 3635 markup => $widget,
3636 tooltip => $tooltip;
3637 }
2559 } 3638 }
2560 3639
2561 $self->{item}{$widget} = $item; 3640 $self->{item}{$widget} = $item;
2562 3641
2563 $self->{vbox}->add ($widget); 3642 $self->{vbox}->add ($widget);
… …
2575 # maybe save $GRAB? must be careful about events... 3654 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 3655 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 3656 $self->{button} = $ev->{button};
2578 3657
2579 $self->show; 3658 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3659 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581} 3660}
2582 3661
2583sub mouse_motion { 3662sub invoke_mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 3663 my ($self, $ev, $x, $y) = @_;
2585 3664
2586 # TODO: should use vbox->find_widget or so 3665 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3666 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER}; 3667 $self->{hover} = $self->{item}{$HOVER};
2589}
2590 3668
3669 0
3670}
3671
2591sub button_up { 3672sub invoke_button_up {
2592 my ($self, $ev, $x, $y) = @_; 3673 my ($self, $ev, $x, $y) = @_;
2593 3674
2594 if ($ev->{button} == $self->{button}) { 3675 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 3676 undef $GRAB;
2596 $self->hide; 3677 $self->hide;
2597 3678
2598 $self->emit ("popdown"); 3679 $self->emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 3680 $self->{hover}[1]->() if $self->{hover};
3681 } else {
3682 return 0
3683 }
3684
2600 } 3685 1
2601} 3686}
2602 3687
2603############################################################################# 3688#############################################################################
2604 3689
2605package CFClient::UI::Statusbox; 3690package CFPlus::UI::Multiplexer;
2606 3691
3692our @ISA = CFPlus::UI::Container::;
3693
3694sub new {
3695 my $class = shift;
3696
3697 my $self = $class->SUPER::new (
3698 @_,
3699 );
3700
3701 $self->{current} = $self->{children}[0]
3702 if @{ $self->{children} };
3703
3704 $self
3705}
3706
3707sub add {
3708 my ($self, @widgets) = @_;
3709
3710 $self->SUPER::add (@widgets);
3711
3712 $self->{current} = $self->{children}[0]
3713 if @{ $self->{children} };
3714}
3715
3716sub get_current_page {
3717 my ($self) = @_;
3718
3719 $self->{current}
3720}
3721
3722sub set_current_page {
3723 my ($self, $page_or_widget) = @_;
3724
3725 my $widget = ref $page_or_widget
3726 ? $page_or_widget
3727 : $self->{children}[$page_or_widget];
3728
3729 $self->{current} = $widget;
3730 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3731
3732 $self->emit (page_changed => $self->{current});
3733
3734 $self->realloc;
3735}
3736
3737sub visible_children {
3738 $_[0]{current}
3739}
3740
3741sub size_request {
3742 my ($self) = @_;
3743
3744 $self->{current}->size_request
3745}
3746
3747sub invoke_size_allocate {
3748 my ($self, $w, $h) = @_;
3749
3750 $self->{current}->configure (0, 0, $w, $h);
3751
3752 1
3753}
3754
3755sub _draw {
3756 my ($self) = @_;
3757
3758 $self->{current}->draw;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Notebook;
3764
2607our @ISA = CFClient::UI::VBox::; 3765our @ISA = CFPlus::UI::VBox::;
3766
3767sub new {
3768 my $class = shift;
3769
3770 my $self = $class->SUPER::new (
3771 buttonbar => (new CFPlus::UI::Buttonbar),
3772 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3773 # filter => # will be put between multiplexer and $self
3774 @_,
3775 );
3776
3777 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3778 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3779
3780 $self
3781}
3782
3783sub add {
3784 my ($self, $title, $widget, $tooltip) = @_;
3785
3786 CFPlus::weaken $self;
3787
3788 $self->{buttonbar}->add (new CFPlus::UI::Button
3789 markup => $title,
3790 tooltip => $tooltip,
3791 on_activate => sub { $self->set_current_page ($widget) },
3792 );
3793
3794 $self->{multiplexer}->add ($widget);
3795}
3796
3797sub get_current_page {
3798 my ($self) = @_;
3799
3800 $self->{multiplexer}->get_current_page
3801}
3802
3803sub set_current_page {
3804 my ($self, $page) = @_;
3805
3806 $self->{multiplexer}->set_current_page ($page);
3807 $self->emit (page_changed => $self->{multiplexer}{current});
3808}
3809
3810#############################################################################
3811
3812package CFPlus::UI::Selector;
3813
3814use utf8;
3815
3816our @ISA = CFPlus::UI::Button::;
3817
3818sub new {
3819 my $class = shift;
3820
3821 my $self = $class->SUPER::new (
3822 options => [], # [value, title, longdesc], ...
3823 value => undef,
3824 @_,
3825 );
3826
3827 $self->_set_value ($self->{value});
3828
3829 $self
3830}
3831
3832sub invoke_button_down {
3833 my ($self, $ev) = @_;
3834
3835 my @menu_items;
3836
3837 for (@{ $self->{options} }) {
3838 my ($value, $title, $tooltip) = @$_;
3839
3840 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3841 }
3842
3843 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3844}
3845
3846sub _set_value {
3847 my ($self, $value) = @_;
3848
3849 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3850 or return;
3851
3852 $self->{value} = $item->[0];
3853 $self->set_markup ("$item->[1] ⇓");
3854 $self->set_tooltip ($item->[2]);
3855}
3856
3857sub set_value {
3858 my ($self, $value) = @_;
3859
3860 return unless $self->{value} ne $value;
3861
3862 $self->_set_value ($value);
3863 $self->emit (changed => $value);
3864}
3865
3866#############################################################################
3867
3868package CFPlus::UI::Statusbox;
3869
3870our @ISA = CFPlus::UI::VBox::;
3871
3872sub new {
3873 my $class = shift;
3874
3875 my $self = $class->SUPER::new (
3876 fontsize => 0.8,
3877 @_,
3878 );
3879
3880 CFPlus::weaken (my $this = $self);
3881
3882 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3883
3884 $self
3885}
2608 3886
2609sub reorder { 3887sub reorder {
2610 my ($self) = @_; 3888 my ($self) = @_;
2611 my $NOW = time; 3889 my $NOW = Time::HiRes::time;
3890
3891 # freeze display when hovering over any label
3892 return if $CFPlus::UI::TOOLTIP->{owner}
3893 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3894 values %{ $self->{item} };
2612 3895
2613 while (my ($k, $v) = each %{ $self->{item} }) { 3896 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3897 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 } 3898 }
2616 3899
… …
2619 my @items = sort { 3902 my @items = sort {
2620 $a->{pri} <=> $b->{pri} 3903 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id} 3904 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} }; 3905 } values %{ $self->{item} };
2623 3906
3907 $self->{timer}->interval (1);
3908
2624 my $count = 10 + 1; 3909 my $count = 10 + 1;
2625 for my $item (@items) { 3910 for my $item (@items) {
2626 last unless --$count; 3911 last unless --$count;
2627 3912
2628 push @widgets, $item->{label} ||= do { 3913 my $label = $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all) 3914 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1 3915 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}" 3916 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 3917 : $item->{text};
2633 3918
2634 for ($short) { 3919 for ($short) {
2635 s/^\s+//; 3920 s/^\s+//;
2636 s/\012.*/…/s; 3921 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 3922 }
2640 3923
2641 new CFClient::UI::Label 3924 new CFPlus::UI::Label
2642 markup => $short, 3925 markup => $short,
2643 tooltip => $item->{tooltip}, 3926 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 3927 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 3928 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 3929 fontsize => $item->{fontsize} || $self->{fontsize},
2647 color => $item->{color}, 3930 max_w => $::WIDTH * 0.44,
3931 fg => [@{ $item->{fg} }],
2648 can_events => 1, 3932 can_events => 1,
2649 can_hover => 1 3933 can_hover => 1
2650 }; 3934 };
3935
3936 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3937 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3938 $label->update;
3939 $label->set_max_size (undef, $label->{req_h} * $diff)
3940 if $diff < 1;
3941 $self->{timer}->interval (1/30);
3942 } else {
3943 $label->{fg}[3] = $item->{fg}[3] || 1;
3944 }
3945
3946 push @widgets, $label;
2651 } 3947 }
2652 3948
2653 $self->clear; 3949 $self->clear;
2654 $self->SUPER::add (reverse @widgets); 3950 $self->SUPER::add (reverse @widgets);
2655} 3951}
2656 3952
2657sub add { 3953sub add {
2658 my ($self, $text, %arg) = @_; 3954 my ($self, $text, %arg) = @_;
2659 3955
3956 $text =~ s/^\s+//;
3957 $text =~ s/\s+$//;
3958
3959 return unless $text;
3960
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 3961 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2661 3962
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 3964
2664 if (my $item = $self->{item}{$group}) { 3965 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) { 3966 if ($item->{text} eq $text) {
2666 $item->{count}++; 3967 $item->{count}++;
2667 } else { 3968 } else {
2668 $item->{count} = 1; 3969 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 3970 $item->{text} = $item->{tooltip} = $text;
2670 } 3971 }
3972 $item->{id} += 0.2;#d#
2671 $item->{timeout} = $timeout; 3973 $item->{timeout} = $timeout;
2672 delete $item->{label}; 3974 delete $item->{label};
2673 } else { 3975 } else {
2674 $self->{item}{$group} = { 3976 $self->{item}{$group} = {
2675 id => ++$self->{id}, 3977 id => ++$self->{id},
2676 text => $text, 3978 text => $text,
2677 timeout => $timeout, 3979 timeout => $timeout,
2678 tooltip => $text, 3980 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 3981 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 3982 pri => 0,
2682 count => 1, 3983 count => 1,
2683 %arg, 3984 %arg,
2684 }; 3985 };
2685 } 3986 }
2686 3987
3988 $ROOT->on_refresh (reorder => sub {
3989 $self->reorder;
3990 });
3991}
3992
3993sub reconfigure {
3994 my ($self) = @_;
3995
3996 delete $_->{label}
3997 for values %{ $self->{item} || {} };
3998
2687 $self->reorder; 3999 $self->reorder;
4000 $self->SUPER::reconfigure;
4001}
4002
4003sub destroy {
4004 my ($self) = @_;
4005
4006 $self->{timer}->cancel;
4007
4008 $self->SUPER::destroy;
2688} 4009}
2689 4010
2690############################################################################# 4011#############################################################################
2691 4012
2692package CFClient::UI::Root; 4013package CFPlus::UI::Root;
2693 4014
2694our @ISA = CFClient::UI::Container::; 4015our @ISA = CFPlus::UI::Container::;
2695 4016
4017use List::Util qw(min max);
4018
2696use CFClient::OpenGL; 4019use CFPlus::OpenGL;
2697 4020
2698sub new { 4021sub new {
2699 my $class = shift; 4022 my $class = shift;
2700 4023
2701 $class->SUPER::new ( 4024 my $self = $class->SUPER::new (
4025 visible => 1,
2702 @_, 4026 @_,
2703 ) 4027 );
2704}
2705 4028
2706sub configure { 4029 CFPlus::weaken ($self->{root} = $self);
2707 my ($self, $x, $y, $w, $h) = @_;
2708 4030
2709 $self->{w} = $w; 4031 $self
2710 $self->{h} = $h;
2711}
2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718} 4032}
2719 4033
2720sub size_request { 4034sub size_request {
2721 my ($self) = @_; 4035 my ($self) = @_;
2722 4036
2723 ($self->{w}, $self->{h}) 4037 ($self->{w}, $self->{h})
2724} 4038}
2725 4039
4040sub _to_pixel {
4041 my ($coord, $size, $max) = @_;
4042
4043 $coord =
4044 $coord eq "center" ? ($max - $size) * 0.5
4045 : $coord eq "max" ? $max
4046 : $coord;
4047
4048 $coord = 0 if $coord < 0;
4049 $coord = $max - $size if $coord > $max - $size;
4050
4051 int $coord + 0.5
4052}
4053
2726sub size_allocate { 4054sub invoke_size_allocate {
2727 my ($self, $w, $h) = @_; 4055 my ($self, $w, $h) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744 4056
2745 for my $child ($self->children) { 4057 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4058 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 4059
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4060 $X = $child->{force_x} if exists $child->{force_x};
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4061 $Y = $child->{force_y} if exists $child->{force_y};
4062
4063 $X = _to_pixel $X, $W, $self->{w};
4064 $Y = _to_pixel $Y, $H, $self->{h};
4065
2750 $child->configure ($X, $Y, $W, $H); 4066 $child->configure ($X, $Y, $W, $H);
2751 } 4067 }
2752 4068
2753 $self->{old_w} = $w; 4069 1
2754 $self->{old_h} = $h;
2755} 4070}
2756 4071
2757sub coord2local { 4072sub coord2local {
2758 my ($self, $x, $y) = @_; 4073 my ($self, $x, $y) = @_;
2759 4074
… …
2767} 4082}
2768 4083
2769sub update { 4084sub update {
2770 my ($self) = @_; 4085 my ($self) = @_;
2771 4086
2772 $self->check_size;
2773 $::WANT_REFRESH++; 4087 $::WANT_REFRESH++;
2774} 4088}
2775 4089
2776sub add { 4090sub add {
2777 my ($self, $child) = @_; 4091 my ($self, @children) = @_;
2778 4092
2779 # integerise window positions 4093 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 4094 for @children;
2781 $child->{y} = int $child->{y};
2782 4095
2783 $self->SUPER::add ($child); 4096 $self->SUPER::add (@children);
4097}
4098
4099sub remove {
4100 my ($self, @children) = @_;
4101
4102 $self->SUPER::remove (@children);
4103
4104 delete $self->{is_toplevel}
4105 for @children;
4106
4107 while (@children) {
4108 my $w = pop @children;
4109 push @children, $w->children;
4110 $w->set_invisible;
4111 }
2784} 4112}
2785 4113
2786sub on_refresh { 4114sub on_refresh {
2787 my ($self, $id, $cb) = @_; 4115 my ($self, $id, $cb) = @_;
2788 4116
2789 $self->{refresh_hook}{$id} = $cb; 4117 $self->{refresh_hook}{$id} = $cb;
2790} 4118}
2791 4119
4120sub on_post_alloc {
4121 my ($self, $id, $cb) = @_;
4122
4123 $self->{post_alloc_hook}{$id} = $cb;
4124}
4125
2792sub draw { 4126sub draw {
2793 my ($self) = @_; 4127 my ($self) = @_;
2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839 4128
2840 while ($self->{refresh_hook}) { 4129 while ($self->{refresh_hook}) {
2841 $_->() 4130 $_->()
2842 for values %{delete $self->{refresh_hook}}; 4131 for values %{delete $self->{refresh_hook}};
2843 } 4132 }
2844 4133
4134 if ($self->{realloc}) {
4135 my %queue;
4136 my @queue;
4137 my $widget;
4138
4139 outer:
4140 while () {
4141 if (my $realloc = delete $self->{realloc}) {
4142 for $widget (values %$realloc) {
4143 $widget->{visible} or next; # do not resize invisible widgets
4144
4145 $queue{$widget+0}++ and next; # duplicates are common
4146
4147 push @{ $queue[$widget->{visible}] }, $widget;
4148 }
4149 }
4150
4151 while () {
4152 @queue or last outer;
4153
4154 $widget = pop @{ $queue[-1] || [] }
4155 and last;
4156
4157 pop @queue;
4158 }
4159
4160 delete $queue{$widget+0};
4161
4162 my ($w, $h) = $widget->size_request;
4163
4164 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4165 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4166
4167 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4168 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4169
4170 $w = $widget->{force_w} if exists $widget->{force_w};
4171 $h = $widget->{force_h} if exists $widget->{force_h};
4172
4173 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4174 || delete $widget->{force_realloc}) {
4175 $widget->{req_w} = $w;
4176 $widget->{req_h} = $h;
4177
4178 $self->{size_alloc}{$widget+0} = $widget;
4179
4180 if (my $parent = $widget->{parent}) {
4181 $self->{realloc}{$parent+0} = $parent
4182 unless $queue{$parent+0};
4183
4184 $parent->{force_size_alloc} = 1;
4185 $self->{size_alloc}{$parent+0} = $parent;
4186 }
4187 }
4188
4189 delete $self->{realloc}{$widget+0};
4190 }
4191 }
4192
4193 while (my $size_alloc = delete $self->{size_alloc}) {
4194 my @queue = sort { $b->{visible} <=> $a->{visible} }
4195 values %$size_alloc;
4196
4197 while () {
4198 my $widget = pop @queue || last;
4199
4200 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4201
4202 $w = 0 if $w < 0;
4203 $h = 0 if $h < 0;
4204
4205 $w = max $widget->{min_w}, $w;
4206 $h = max $widget->{min_h}, $h;
4207
4208# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4209# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4210
4211 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4212 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4213
4214 $w = int $w + 0.5;
4215 $h = int $h + 0.5;
4216
4217 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4218 $widget->{old_w} = $widget->{w};
4219 $widget->{old_h} = $widget->{h};
4220
4221 $widget->{w} = $w;
4222 $widget->{h} = $h;
4223
4224 $widget->emit (size_allocate => $w, $h);
4225 }
4226 }
4227 }
4228
4229 while ($self->{post_alloc_hook}) {
4230 $_->()
4231 for values %{delete $self->{post_alloc_hook}};
4232 }
4233
4234
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4235 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4236 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 4237 glClear GL_COLOR_BUFFER_BIT;
2848 4238
2849 glMatrixMode GL_PROJECTION; 4239 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 4240 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4241 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 4242 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 4243 glLoadIdentity;
2854 4244
4245 {
4246 package CFPlus::UI::Base;
4247
4248 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4249 (0, 0, $self->{w}, $self->{h});
4250
2855 $self->_draw; 4251 $self->_draw;
4252 }
2856} 4253}
2857 4254
2858############################################################################# 4255#############################################################################
2859 4256
2860package CFClient::UI; 4257package CFPlus::UI;
2861 4258
2862$ROOT = new CFClient::UI::Root; 4259$ROOT = new CFPlus::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 4260$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2864 4261
28651 42621
2866 4263

Diff Legend

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