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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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