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

Diff Legend

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