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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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