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

Diff Legend

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