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.378 by root, Mon Jul 16 20:22:39 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
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
1360sub new {
1361 my ($class, %arg) = @_;
960 1362
961 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1366 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1367 can_events => 1,
967 @_ 1368 min_w => 64,
1369 min_h => 32,
1370 %arg,
968 ); 1371 );
969 1372
970 $self->{title} &&= new CFClient::UI::Label 1373 $self->{title_widget} = new CFPlus::UI::Label
971 align => 0, 1374 align => 0,
972 valign => 1, 1375 valign => 1,
973 text => $self->{title}, 1376 text => $self->{title},
974 fontsize => $self->{border}; 1377 fontsize => $self->{border},
1378 if exists $self->{title};
1379
1380 if ($self->{has_close_button}) {
1381 $self->{close_button} =
1382 new CFPlus::UI::ImageButton
1383 path => 'x1_close.png',
1384 on_activate => sub { $self->emit ("delete") };
1385
1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1387 }
975 1388
976 $self 1389 $self
1390}
1391
1392sub add {
1393 my ($self, @widgets) = @_;
1394
1395 $self->SUPER::add (@widgets);
1396 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
977} 1398}
978 1399
979sub border { 1400sub border {
980 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
981} 1402}
982 1403
983sub size_request { 1404sub size_request {
984 my ($self) = @_; 1405 my ($self) = @_;
1406
1407 $self->{title_widget}->size_request
1408 if $self->{title_widget};
1409
1410 $self->{close_button}->size_request
1411 if $self->{close_button};
985 1412
986 my ($w, $h) = $self->SUPER::size_request; 1413 my ($w, $h) = $self->SUPER::size_request;
987 1414
988 ( 1415 (
989 $w + $self->border * 2, 1416 $w + $self->border * 2,
990 $h + $self->border * 2, 1417 $h + $self->border * 2,
991 ) 1418 )
992} 1419}
993 1420
994sub size_allocate { 1421sub invoke_size_allocate {
995 my ($self, $w, $h) = @_; 1422 my ($self, $w, $h) = @_;
996 1423
1424 if ($self->{title_widget}) {
1425 $self->{title_widget}{w} = $w;
1426 $self->{title_widget}{h} = $h;
1427 $self->{title_widget}->invoke_size_allocate ($w, $h);
1428 }
1429
1430 my $border = $self->border;
1431
997 $h -= List::Util::max 0, $self->border * 2; 1432 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1433 $w -= List::Util::max 0, $border * 2;
999 1434
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); 1435 $self->child->configure ($border, $border, $w, $h);
1004}
1005 1436
1437 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1438 if $self->{close_button};
1439
1440 1
1441}
1442
1443sub invoke_delete {
1444 my ($self) = @_;
1445
1446 $self->hide;
1447
1448 1
1449}
1450
1006sub button_down { 1451sub invoke_button_down {
1007 my ($self, $ev, $x, $y) = @_; 1452 my ($self, $ev, $x, $y) = @_;
1008 1453
1009 my ($w, $h) = @$self{qw(w h)}; 1454 my ($w, $h) = @$self{qw(w h)};
1010 my $border = $self->border; 1455 my $border = $self->border;
1011 1456
… …
1024 my ($ev, $x, $y) = @_; 1469 my ($ev, $x, $y) = @_;
1025 1470
1026 my $dx = $ev->{x} - $ox; 1471 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1472 my $dy = $ev->{y} - $oy;
1028 1473
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1474 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1475 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1476
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1477 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1478 $self->realloc;
1033 }; 1479 };
1034 1480
1035 } elsif ($lr ^ $td) { 1481 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1482 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1483 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1485 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1486 my ($ev, $x, $y) = @_;
1041 1487
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1488 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1489
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1490 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1491 # HACK: the next line is required to enforce placement
1492 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1493 };
1494 } else {
1495 return 0;
1496 }
1497
1047 } 1498 1
1048} 1499}
1049 1500
1050sub button_up { 1501sub invoke_button_up {
1051 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1052 1503
1053 delete $self->{motion}; 1504 ! ! delete $self->{motion}
1054} 1505}
1055 1506
1056sub mouse_motion { 1507sub invoke_mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1508 my ($self, $ev, $x, $y) = @_;
1058 1509
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1511
1512 ! ! $self->{motion}
1513}
1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
1060} 1521}
1061 1522
1062sub _draw { 1523sub _draw {
1063 my ($self) = @_; 1524 my ($self) = @_;
1064 1525
1526 my $child = $self->{children}[0];
1527
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1528 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1529 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1530
1068 glEnable GL_TEXTURE_2D; 1531 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1533
1071 my $border = $self->border; 1534 my $border = $self->border;
1072 1535
1073 glColor @{ $self->{border_bg} }; 1536 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1537 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1541
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1543 glColor @{ $self->{bg} };
1081 1544
1082 # TODO: repeat texture not scale 1545 # TODO: repeat texture not scale
1546 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1547 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1548 $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); 1549 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1550 }
1093 1551
1094 glDisable GL_TEXTURE_2D; 1552 glDisable GL_TEXTURE_2D;
1095 1553
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1554 $child->draw;
1555
1556 if ($self->{title_widget}) {
1557 glTranslate 0, $border - $self->{h};
1558 $self->{title_widget}->_draw;
1559
1560 glTranslate 0, - ($border - $self->{h});
1561 }
1562
1563 $self->{close_button}->draw
1564 if $self->{close_button};
1099} 1565}
1100 1566
1101############################################################################# 1567#############################################################################
1102 1568
1103package CFClient::UI::Table; 1569package CFPlus::UI::Table;
1104 1570
1105our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
1106 1572
1107use List::Util qw(max sum); 1573use List::Util qw(max sum);
1108 1574
1109use CFClient::OpenGL; 1575use CFPlus::OpenGL;
1110 1576
1111sub new { 1577sub new {
1112 my $class = shift; 1578 my $class = shift;
1113 1579
1114 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1115 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1116 @_, 1584 @_,
1117 ) 1585 )
1118} 1586}
1119 1587
1120sub children { 1588sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1122} 1590}
1123 1591
1592# TODO: store row/col info in child widget and use standard add/del
1124sub add { 1593sub add {
1125 my ($self, $x, $y, $child) = @_; 1594 my ($self) = shift;
1126 1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1127 $child->set_parent ($self); 1598 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1600 }
1129 1601
1130 $self->check_size (1); 1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1604 $self->realloc;
1605}
1606
1607sub remove {
1608 my ($self, $child) = @_;
1609
1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1131} 1615}
1132 1616
1133# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1618sub clear {
1135 my ($self) = @_; 1619 my ($self) = @_;
… …
1140 for (@children) { 1624 for (@children) {
1141 delete $_->{parent}; 1625 delete $_->{parent};
1142 $_->hide; 1626 $_->hide;
1143 } 1627 }
1144 1628
1145 $self->check_size (1); 1629 $self->realloc;
1146 $self->update;
1147} 1630}
1148 1631
1149sub get_wh { 1632sub get_wh {
1150 my ($self) = @_; 1633 my ($self) = @_;
1151 1634
… …
1177 (sum @$ws), 1660 (sum @$ws),
1178 (sum @$hs), 1661 (sum @$hs),
1179 ) 1662 )
1180} 1663}
1181 1664
1182sub size_allocate { 1665sub invoke_size_allocate {
1183 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1184 1667
1185 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1186 1669
1187 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1188 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1189 1672
1190 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1191 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1192 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1193 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1194 1677
1195 # linearly scale sizes
1196 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1197 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1198 1679
1199 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1200 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1201 1689
1202 my $y; 1690 my $y;
1203 1691
1204 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1205 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1219 } 1707 }
1220 1708
1221 $y += $row_h; 1709 $y += $row_h;
1222 } 1710 }
1223 1711
1712 1
1224} 1713}
1225 1714
1226sub find_widget { 1715sub find_widget {
1227 my ($self, $x, $y) = @_; 1716 my ($self, $x, $y) = @_;
1228 1717
… …
1247 } 1736 }
1248} 1737}
1249 1738
1250############################################################################# 1739#############################################################################
1251 1740
1252package CFClient::UI::HBox; 1741package CFPlus::UI::Fixed;
1253 1742
1254# TODO: wrap into common Box base class 1743use List::Util qw(min max);
1255 1744
1256our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1257 1761
1258sub size_request { 1762sub size_request {
1259 my ($self) = @_; 1763 my ($self) = @_;
1260 1764
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1262 1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1263 ( 1778 }
1264 (List::Util::sum map $_->[0], @alloc), 1779
1265 (List::Util::max map $_->[1], @alloc), 1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1826
1827sub size_request {
1828 my ($self) = @_;
1829
1830 $self->{vertical}
1831 ? (
1832 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1833 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1834 )
1835 : (
1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1837 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1838 )
1839}
1840
1841sub invoke_size_allocate {
1842 my ($self, $w, $h) = @_;
1843
1844 my $space = $self->{vertical} ? $h : $w;
1845 my @children = $self->visible_children;
1846
1847 my @req;
1848
1849 if ($self->{homogeneous}) {
1850 @req = ($space / (@children || 1)) x @children;
1851 } else {
1852 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1853 my $req = List::Util::sum @req;
1854
1855 if ($req > $space) {
1856 # ah well, not enough space
1857 $_ *= $space / $req for @req;
1858 } else {
1859 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1860
1861 $space = ($space - $req) / $expand; # remaining space to give away
1862
1863 $req[$_] += $space * $children[$_]{expand}
1864 for 0 .. $#children;
1865 }
1866 }
1867
1868 CFPlus::UI::harmonize \@req;
1869
1870 my $pos = 0;
1871 for (0 .. $#children) {
1872 my $alloc = $req[$_];
1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1874
1875 $pos += $alloc;
1876 }
1877
1878 1
1879}
1880
1881#############################################################################
1882
1883package CFPlus::UI::HBox;
1884
1885our @ISA = CFPlus::UI::Box::;
1886
1887sub new {
1888 my $class = shift;
1889
1890 $class->SUPER::new (
1891 vertical => 0,
1892 @_,
1266 ) 1893 )
1267} 1894}
1268 1895
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############################################################################# 1896#############################################################################
1311 1897
1312package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1313 1899
1314# TODO: wrap into common Box base class 1900our @ISA = CFPlus::UI::Box::;
1315 1901
1316our @ISA = CFClient::UI::Container::; 1902sub new {
1903 my $class = shift;
1317 1904
1318sub size_request { 1905 $class->SUPER::new (
1319 my ($self) = @_; 1906 vertical => 1,
1320 1907 @_,
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 ) 1908 )
1327} 1909}
1328 1910
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############################################################################# 1911#############################################################################
1369 1912
1370package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1371 1914
1372our @ISA = CFClient::UI::DrawBG::; 1915our @ISA = CFPlus::UI::DrawBG::;
1373 1916
1374use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1375 1918
1376sub new { 1919sub new {
1377 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1378 1921
1379 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
… …
1382 #active_bg => none 1925 #active_bg => none
1383 #font => default_font 1926 #font => default_font
1384 #text => initial text 1927 #text => initial text
1385 #markup => initial narkup 1928 #markup => initial narkup
1386 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1387 ellipsise => 3, # end 1931 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1389 fontsize => 1, 1933 fontsize => 1,
1390 align => -1, 1934 align => -1,
1391 valign => -1, 1935 valign => -1,
1392 padding => 2, 1936 padding_x => 2,
1937 padding_y => 2,
1393 can_events => 0, 1938 can_events => 0,
1394 %arg 1939 %arg
1395 ); 1940 );
1396 1941
1397 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1398 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1399 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1400 $self->{template} = $layout; 1945 $self->{template} = $layout;
1401 } 1946 }
1402 1947
1403 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1407 } 1952 }
1408 1953
1409 $self 1954 $self
1410} 1955}
1411 1956
1412sub escape($) {
1413 local $_ = $_[0];
1414
1415 s/&/&amp;/g;
1416 s/>/&gt;/g;
1417 s/</&lt;/g;
1418
1419 $_
1420}
1421
1422sub update { 1957sub update {
1423 my ($self) = @_; 1958 my ($self) = @_;
1424 1959
1425 delete $self->{texture}; 1960 delete $self->{texture};
1426 $self->SUPER::update; 1961 $self->SUPER::update;
1427} 1962}
1428 1963
1964sub realloc {
1965 my ($self) = @_;
1966
1967 delete $self->{ox};
1968 $self->SUPER::realloc;
1969}
1970
1429sub set_text { 1971sub set_text {
1430 my ($self, $text) = @_; 1972 my ($self, $text) = @_;
1431 1973
1432 return if $self->{text} eq "T$text"; 1974 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1975 $self->{text} = "T$text";
1434 1976
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1977 $self->{layout}->set_text ($text);
1437 1978
1979 delete $self->{size_req};
1980 $self->realloc;
1438 $self->update; 1981 $self->update;
1439 $self->check_size;
1440} 1982}
1441 1983
1442sub set_markup { 1984sub set_markup {
1443 my ($self, $markup) = @_; 1985 my ($self, $markup) = @_;
1444 1986
1445 return if $self->{text} eq "M$markup"; 1987 return if $self->{text} eq "M$markup";
1446 $self->{text} = "M$markup"; 1988 $self->{text} = "M$markup";
1447 1989
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1990 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1991
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1992 $self->{layout}->set_markup ($markup);
1452 1993
1994 delete $self->{size_req};
1995 $self->realloc;
1453 $self->update; 1996 $self->update;
1454 $self->check_size;
1455} 1997}
1456 1998
1457sub size_request { 1999sub size_request {
1458 my ($self) = @_; 2000 my ($self) = @_;
1459 2001
2002 $self->{size_req} ||= do {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2003 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 2004 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2005 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2006 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 2008
1466 my ($w, $h) = $self->{layout}->size; 2009 my ($w, $h) = $self->{layout}->size;
1467 2010
1468 if (exists $self->{template}) { 2011 if (exists $self->{template}) {
1469 $self->{template}->set_font ($self->{font}) if $self->{font}; 2012 $self->{template}->set_font ($self->{font}) if $self->{font};
2013 $self->{template}->set_width ($self->{max_w} || -1);
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 2015
1472 my ($w2, $h2) = $self->{template}->size; 2016 my ($w2, $h2) = $self->{template}->size;
1473 2017
1474 $w = List::Util::max $w, $w2; 2018 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 2019 $h = List::Util::max $h, $h2;
2020 }
2021
2022 [$w, $h]
1476 } 2023 };
1477 2024
1478 ( 2025 @{ $self->{size_req} }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 2026}
1483 2027
2028sub baseline_shift {
2029 $_[0]{layout}->descent
2030}
2031
1484sub size_allocate { 2032sub invoke_size_allocate {
1485 my ($self, $w, $h) = @_; 2033 my ($self, $w, $h) = @_;
1486 2034
2035 delete $self->{ox};
2036
1487 delete $self->{texture}; 2037 delete $self->{texture}
2038 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2039
2040 1
1488} 2041}
1489 2042
1490sub set_fontsize { 2043sub set_fontsize {
1491 my ($self, $fontsize) = @_; 2044 my ($self, $fontsize) = @_;
1492 2045
1493 $self->{fontsize} = $fontsize; 2046 $self->{fontsize} = $fontsize;
2047 delete $self->{size_req};
1494 delete $self->{texture}; 2048 delete $self->{texture};
1495 2049
1496 $self->update; 2050 $self->realloc;
1497 $self->check_size; 2051}
2052
2053sub reconfigure {
2054 my ($self) = @_;
2055
2056 delete $self->{size_req};
2057 delete $self->{texture};
2058
2059 $self->SUPER::reconfigure;
1498} 2060}
1499 2061
1500sub _draw { 2062sub _draw {
1501 my ($self) = @_; 2063 my ($self) = @_;
1502 2064
1503 $self->SUPER::_draw; # draw background, if applicable 2065 $self->SUPER::_draw; # draw background, if applicable
1504 2066
1505 my $tex = $self->{texture} ||= do { 2067 my $size = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}}); 2068 $self->{layout}->set_foreground (@{$self->{fg}});
1507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2069 $self->{layout}->set_font ($self->{font}) if $self->{font};
1508 $self->{layout}->set_width ($self->{w}); 2070 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2071 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2072 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2073 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 2074
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2075 [$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 }; 2076 };
1525 2077
1526 glEnable GL_TEXTURE_2D; 2078 unless (exists $self->{ox}) {
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2081 : ($self->{w} - $size->[0]) * 0.5);
1528 2082
1529 if ($tex->{format} == GL_ALPHA) { 2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1530 glColor @{$self->{fg}}; 2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2085 : ($self->{h} - $size->[1]) * 0.5);
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 } 2086 };
1535 2087
1536 glDisable GL_TEXTURE_2D; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
2090
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1537} 2092}
1538 2093
1539############################################################################# 2094#############################################################################
1540 2095
1541package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1542 2097
1543our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1544 2099
1545use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1546 2101
1547sub new { 2102sub new {
1548 my $class = shift; 2103 my $class = shift;
1549 2104
1550 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1554 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1555 can_hover => 1, 2110 can_hover => 1,
1556 can_focus => 1, 2111 can_focus => 1,
1557 valign => 0, 2112 valign => 0,
1558 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1559 #text => ... 2115 #text => ...
2116 #hidden => "*",
1560 @_ 2117 @_
1561 ) 2118 )
1562} 2119}
1563 2120
1564sub _set_text { 2121sub _set_text {
… …
1566 2123
1567 delete $self->{cur_h}; 2124 delete $self->{cur_h};
1568 2125
1569 return if $self->{text} eq $text; 2126 return if $self->{text} eq $text;
1570 2127
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 2128 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 2129 $self->{text} = $text;
1575 2130
1576 $text =~ s/./*/g if $self->{hidden}; 2131 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 2132 $self->{layout}->set_text ("$text ");
2133 delete $self->{size_req};
1578 2134
1579 $self->_emit (changed => $self->{text}); 2135 $self->emit (changed => $self->{text});
2136
2137 $self->realloc;
2138 $self->update;
1580} 2139}
1581 2140
1582sub set_text { 2141sub set_text {
1583 my ($self, $text) = @_; 2142 my ($self, $text) = @_;
1584 2143
1585 $self->{cursor} = length $text; 2144 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 2145 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 2146}
1590 2147
1591sub get_text { 2148sub get_text {
1592 $_[0]{text} 2149 $_[0]{text}
1593} 2150}
… …
1598 my ($w, $h) = $self->SUPER::size_request; 2155 my ($w, $h) = $self->SUPER::size_request;
1599 2156
1600 ($w + 1, $h) # add 1 for cursor 2157 ($w + 1, $h) # add 1 for cursor
1601} 2158}
1602 2159
1603sub key_down { 2160sub invoke_key_down {
1604 my ($self, $ev) = @_; 2161 my ($self, $ev) = @_;
1605 2162
1606 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1607 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1608 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1609 2166
1610 my $text = $self->get_text; 2167 my $text = $self->get_text;
2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1611 2170
1612 if ($uni == 8) { 2171 if ($uni == 8) {
1613 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1614 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1615 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1616 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1617 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1618 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1619 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1620 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1621 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1622 } elsif ($sym == CFClient::SDLK_END) {
1623 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 2195 $self->emit ('escape');
1626 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
2200 } else {
2201 return 0;
1628 } 2202 }
1629 2203
1630 $self->_set_text ($text); 2204 $self->_set_text ($text);
2205
2206 $self->realloc;
1631 $self->update; 2207 $self->update;
1632 $self->check_size;
1633}
1634 2208
2209 1
2210}
2211
1635sub focus_in { 2212sub invoke_focus_in {
1636 my ($self) = @_; 2213 my ($self) = @_;
1637 2214
1638 $self->{last_activity} = $::NOW; 2215 $self->{last_activity} = $::NOW;
1639 2216
1640 $self->SUPER::focus_in; 2217 $self->SUPER::invoke_focus_in
1641} 2218}
1642 2219
1643sub button_down { 2220sub invoke_button_down {
1644 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1645 2222
1646 $self->SUPER::button_down ($ev, $x, $y); 2223 $self->SUPER::invoke_button_down ($ev, $x, $y);
1647 2224
1648 my $idx = $self->{layout}->xy_to_index ($x, $y); 2225 my $idx = $self->{layout}->xy_to_index ($x, $y);
1649 2226
1650 # byte-index to char-index 2227 # byte-index to char-index
1651 my $text = $self->{text}; 2228 my $text = $self->{text};
1652 utf8::encode $text; 2229 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 2230 $self->{cursor} = length $text;
1654 2231
1655 $self->_set_text ($self->{text}); 2232 $self->_set_text ($self->{text});
1656 $self->update; 2233 $self->update;
2234
2235 1
1657} 2236}
1658 2237
1659sub mouse_motion { 2238sub invoke_mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 2239 my ($self, $ev, $x, $y) = @_;
1661# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2240# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2241
2242 1
1662} 2243}
1663 2244
1664sub _draw { 2245sub _draw {
1665 my ($self) = @_; 2246 my ($self) = @_;
1666 2247
1667 local $self->{fg} = $self->{fg}; 2248 local $self->{fg} = $self->{fg};
1668 2249
1669 if ($FOCUS == $self) { 2250 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 2251 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 2252 $self->{fg} = $self->{active_fg};
1672 } else { 2253 } else {
1673 glColor @{$self->{bg}}; 2254 glColor_premultiply @{$self->{bg}};
1674 } 2255 }
1675 2256
1676 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
1679 glVertex 0 , 0; 2260 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 2261 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 2262 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 2263 glVertex $self->{w}, 0;
… …
1693 utf8::encode $text; 2274 utf8::encode $text;
1694 2275
1695 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1696 } 2277 }
1697 2278
1698 glColor @{$self->{fg}};
1699 glBegin GL_LINES; 2279 glBegin GL_LINES;
1700 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1701 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1702 glEnd; 2282 glEnd;
1703 } 2283 }
1704} 2284}
1705 2285
2286#############################################################################
2287
1706package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1707 2289
1708our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1709 2291
1710use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1711 2293
1712sub key_down { 2294sub invoke_key_down {
1713 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1714 2296
1715 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1716 2298
1717 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1718 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1719 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
2302
1720 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1721 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1722 $self->_emit (activate => $txt); 2305 $self->emit (activate => $txt);
1723 $self->update; 2306 $self->update;
1724 2307
1725 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1726 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1727 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1728 } 2311 }
1729 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1730 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1732 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1733 } 2316 }
1734 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1735 } 2318 }
1736 2319
1737 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1738 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1739 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1740 2323
1741 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1742 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1743 } else { 2326 } else {
1744 $self->set_text ($self->{history_saveback}); 2327 $self->set_text ($self->{history_saveback});
1745 } 2328 }
1746 2329
1747 } else { 2330 } else {
1748 $self->SUPER::key_down ($ev); 2331 return $self->SUPER::invoke_key_down ($ev)
2332 }
2333
1749 } 2334 1
1750
1751} 2335}
1752 2336
1753############################################################################# 2337#############################################################################
1754 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1755package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1756 2379
1757our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1758 2381
1759use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1760 2383
1761my @tex = 2384my @tex =
1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1763 qw(b1_button_active.png); 2386 qw(b1_button_active.png);
1764 2387
1765sub new { 2388sub new {
1766 my $class = shift; 2389 my $class = shift;
1767 2390
1768 $class->SUPER::new ( 2391 $class->SUPER::new (
1769 padding => 4, 2392 padding_x => 4,
2393 padding_y => 4,
1770 fg => [1, 1, 1], 2394 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 2395 active_fg => [0, 0, 1],
1772 can_hover => 1, 2396 can_hover => 1,
1773 align => 0, 2397 align => 0,
1774 valign => 0, 2398 valign => 0,
1775 can_events => 1, 2399 can_events => 1,
1776 @_ 2400 @_
1777 ) 2401 )
1778} 2402}
1779 2403
1780sub activate { }
1781
1782sub button_up { 2404sub invoke_button_up {
1783 my ($self, $ev, $x, $y) = @_; 2405 my ($self, $ev, $x, $y) = @_;
1784 2406
1785 $self->emit ("activate") 2407 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 2408 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 2409 && $y >= 0 && $y < $self->{h};
2410
2411 1
1788} 2412}
1789 2413
1790sub _draw { 2414sub _draw {
1791 my ($self) = @_; 2415 my ($self) = @_;
1792 2416
1793 local $self->{fg} = $self->{fg}; 2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 2418
1799 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
1802 2422
… …
1807 $self->SUPER::_draw; 2427 $self->SUPER::_draw;
1808} 2428}
1809 2429
1810############################################################################# 2430#############################################################################
1811 2431
1812package CFClient::UI::CheckBox; 2432package CFPlus::UI::CheckBox;
1813 2433
1814our @ISA = CFClient::UI::DrawBG::; 2434our @ISA = CFPlus::UI::DrawBG::;
1815 2435
1816my @tex = 2436my @tex =
1817 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1818 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2438 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1819 2439
1820use CFClient::OpenGL; 2440use CFPlus::OpenGL;
1821 2441
1822sub new { 2442sub new {
1823 my $class = shift; 2443 my $class = shift;
1824 2444
1825 $class->SUPER::new ( 2445 $class->SUPER::new (
1826 padding => 2, 2446 padding_x => 2,
2447 padding_y => 2,
1827 fg => [1, 1, 1], 2448 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 2449 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 2450 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 2451 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 2452 state => 0,
… …
1835} 2456}
1836 2457
1837sub size_request { 2458sub size_request {
1838 my ($self) = @_; 2459 my ($self) = @_;
1839 2460
1840 ($self->{padding} * 2 + 6) x 2 2461 (6) x 2
1841} 2462}
1842 2463
2464sub toggle {
2465 my ($self) = @_;
2466
2467 $self->{state} = !$self->{state};
2468 $self->emit (changed => $self->{state});
2469 $self->update;
2470}
2471
1843sub button_down { 2472sub invoke_button_down {
1844 my ($self, $ev, $x, $y) = @_; 2473 my ($self, $ev, $x, $y) = @_;
1845 2474
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2475 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2476 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 2477 $self->toggle;
1849 $self->_emit (changed => $self->{state}); 2478 } else {
2479 return 0
2480 }
2481
1850 } 2482 1
1851} 2483}
1852 2484
1853sub _draw { 2485sub _draw {
1854 my ($self) = @_; 2486 my ($self) = @_;
1855 2487
1856 $self->SUPER::_draw; 2488 $self->SUPER::_draw;
1857 2489
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2490 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 2491
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2492 my ($w, $h) = @$self{qw(w h)};
2493
2494 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 2495
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2496 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2497
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2498 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2499
… …
1868 glDisable GL_TEXTURE_2D; 2502 glDisable GL_TEXTURE_2D;
1869} 2503}
1870 2504
1871############################################################################# 2505#############################################################################
1872 2506
1873package CFClient::UI::Image; 2507package CFPlus::UI::Image;
1874 2508
1875our @ISA = CFClient::UI::Base::; 2509our @ISA = CFPlus::UI::Base::;
1876 2510
1877use CFClient::OpenGL; 2511use CFPlus::OpenGL;
1878use Carp qw/confess/;
1879 2512
1880our %loaded_images; 2513our %texture_cache;
1881 2514
1882sub new { 2515sub new {
1883 my $class = shift; 2516 my $class = shift;
1884 2517
1885 my $self = $class->SUPER::new (can_events => 0, @_); 2518 my $self = $class->SUPER::new (
2519 can_events => 0,
2520 @_,
2521 );
1886 2522
1887 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2523 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required";
1888 2525
1889 $loaded_images{$self->{image}} ||= 2526 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1890 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2527 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1891 2528
1892 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2529 CFPlus::weaken $texture_cache{$self->{path}};
1893 2530
1894 Scalar::Util::weaken $loaded_images{$self->{image}}; 2531 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1895
1896 $self->{aspect} = $tex->{w} / $tex->{h};
1897 2532
1898 $self 2533 $self
1899} 2534}
1900 2535
2536sub STORABLE_freeze {
2537 my ($self, $cloning) = @_;
2538
2539 $self->{path}
2540 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2541
2542 $self->{path}
2543}
2544
2545sub STORABLE_attach {
2546 my ($self, $cloning, $path) = @_;
2547
2548 $self->new (path => $path)
2549}
2550
1901sub size_request { 2551sub size_request {
1902 my ($self) = @_; 2552 my ($self) = @_;
1903 2553
1904 ($self->{tex}->{w}, $self->{tex}->{h}) 2554 ($self->{tex}{w}, $self->{tex}{h})
1905} 2555}
1906 2556
1907sub _draw { 2557sub _draw {
1908 my ($self) = @_; 2558 my ($self) = @_;
1909 2559
… …
1919 } 2569 }
1920 2570
1921 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923 2573
1924 $tex->draw_quad_alpha (0, 0, $w, $h); 2574 $tex->draw_quad (0, 0, $w, $h);
1925 2575
1926 glDisable GL_TEXTURE_2D; 2576 glDisable GL_TEXTURE_2D;
1927} 2577}
1928 2578
1929############################################################################# 2579#############################################################################
1930 2580
2581package CFPlus::UI::ImageButton;
2582
2583our @ISA = CFPlus::UI::Image::;
2584
2585use CFPlus::OpenGL;
2586
2587my %textures;
2588
2589sub new {
2590 my $class = shift;
2591
2592 my $self = $class->SUPER::new (
2593 padding_x => 4,
2594 padding_y => 4,
2595 fg => [1, 1, 1],
2596 active_fg => [0, 0, 1],
2597 can_hover => 1,
2598 align => 0,
2599 valign => 0,
2600 can_events => 1,
2601 @_
2602 );
2603}
2604
2605sub invoke_button_up {
2606 my ($self, $ev, $x, $y) = @_;
2607
2608 $self->emit ("activate")
2609 if $x >= 0 && $x < $self->{w}
2610 && $y >= 0 && $y < $self->{h};
2611
2612 1
2613}
2614
2615#############################################################################
2616
1931package CFClient::UI::VGauge; 2617package CFPlus::UI::VGauge;
1932 2618
1933our @ISA = CFClient::UI::Base::; 2619our @ISA = CFPlus::UI::Base::;
1934 2620
1935use List::Util qw(min max); 2621use List::Util qw(min max);
1936 2622
1937use CFClient::OpenGL; 2623use CFPlus::OpenGL;
1938 2624
1939my %tex = ( 2625my %tex = (
1940 food => [ 2626 food => [
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2627 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2628 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1943 ], 2629 ],
1944 grace => [ 2630 grace => [
1945 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2631 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/ 2632 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1947 ], 2633 ],
1948 hp => [ 2634 hp => [
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2635 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2636 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1951 ], 2637 ],
1952 mana => [ 2638 mana => [
1953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2639 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/ 2640 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1955 ], 2641 ],
1956); 2642);
1957 2643
1958# eg. VGauge->new (gauge => 'food'), default gauge: food 2644# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2018 my $ycut1 = max 0, min 1, $ycut; 2704 my $ycut1 = max 0, min 1, $ycut;
2019 my $ycut2 = max 0, min 1, $ycut - 1; 2705 my $ycut2 = max 0, min 1, $ycut - 1;
2020 2706
2021 my $h1 = $self->{h} * (1 - $ycut1); 2707 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2); 2708 my $h2 = $self->{h} * (1 - $ycut2);
2709 my $h3 = $self->{h};
2710
2711 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2023 2712
2024 glEnable GL_BLEND; 2713 glEnable GL_BLEND;
2025 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2715 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2026 glEnable GL_TEXTURE_2D; 2716 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2718
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2719 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2720 glBegin GL_QUADS;
… …
2045 2735
2046 if ($t3) { 2736 if ($t3) {
2047 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2737 glBindTexture GL_TEXTURE_2D, $t3->{name};
2048 glBegin GL_QUADS; 2738 glBegin GL_QUADS;
2049 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2739 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2050 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2740 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2051 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2741 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2052 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2742 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2053 glEnd; 2743 glEnd;
2054 } 2744 }
2055 2745
2056 glDisable GL_BLEND; 2746 glDisable GL_BLEND;
2057 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
2058} 2748}
2059 2749
2060############################################################################# 2750#############################################################################
2061 2751
2062package CFClient::UI::Gauge; 2752package CFPlus::UI::Gauge;
2063 2753
2064our @ISA = CFClient::UI::VBox::; 2754our @ISA = CFPlus::UI::VBox::;
2065 2755
2066sub new { 2756sub new {
2067 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
2068 2758
2069 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
… …
2071 can_hover => 1, 2761 can_hover => 1,
2072 can_events => 1, 2762 can_events => 1,
2073 %arg, 2763 %arg,
2074 ); 2764 );
2075 2765
2076 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2766 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2077 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2767 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2078 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2768 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2079 2769
2080 $self 2770 $self
2081} 2771}
2082 2772
2083sub set_fontsize { 2773sub set_fontsize {
… …
2104 $self->{value}->set_text ($val); 2794 $self->{value}->set_text ($val);
2105} 2795}
2106 2796
2107############################################################################# 2797#############################################################################
2108 2798
2109package CFClient::UI::Slider; 2799package CFPlus::UI::Slider;
2110 2800
2111use strict; 2801use strict;
2112 2802
2113use CFClient::OpenGL; 2803use CFPlus::OpenGL;
2114 2804
2115our @ISA = CFClient::UI::DrawBG::; 2805our @ISA = CFPlus::UI::DrawBG::;
2116 2806
2117my @tex = 2807my @tex =
2118 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2808 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2119 qw(s1_slider.png s1_slider_bg.png); 2809 qw(s1_slider.png s1_slider_bg.png);
2120 2810
2121sub new { 2811sub new {
2122 my $class = shift; 2812 my $class = shift;
2123 2813
… …
2130 fg => [1, 1, 1], 2820 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2821 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2822 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2823 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2824 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2825 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2826 min_h => $::WIDTH / 80,
2137 vertical => 0, 2827 vertical => 0,
2138 can_hover => 1, 2828 can_hover => 1,
2139 inner_pad => 0.02, 2829 inner_pad => 0.02,
2140 @_ 2830 @_
2141 ); 2831 );
… …
2149sub set_range { 2839sub set_range {
2150 my ($self, $range) = @_; 2840 my ($self, $range) = @_;
2151 2841
2152 ($range, $self->{range}) = ($self->{range}, $range); 2842 ($range, $self->{range}) = ($self->{range}, $range);
2153 2843
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}"; 2844 if ("@$range" ne "@{$self->{range}}") {
2845 $self->update;
2846 $self->set_value ($self->{range}[0]);
2847 }
2156} 2848}
2157 2849
2158sub set_value { 2850sub set_value {
2159 my ($self, $value) = @_; 2851 my ($self, $value) = @_;
2160 2852
… …
2171 if $unit; 2863 if $unit;
2172 2864
2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2865 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2174 2866
2175 if ($value != $old_value) { 2867 if ($value != $old_value) {
2176 $self->_emit (changed => $value); 2868 $self->emit (changed => $value);
2177 $self->update; 2869 $self->update;
2178 } 2870 }
2179} 2871}
2180 2872
2181sub size_request { 2873sub size_request {
2182 my ($self) = @_; 2874 my ($self) = @_;
2183 2875
2184 my $w = $self->{req_w}; 2876 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2877}
2189 2878
2190sub button_down { 2879sub invoke_button_down {
2191 my ($self, $ev, $x, $y) = @_; 2880 my ($self, $ev, $x, $y) = @_;
2192 2881
2193 $self->SUPER::button_down ($ev, $x, $y); 2882 $self->SUPER::invoke_button_down ($ev, $x, $y);
2194 2883
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2884 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2885
2197 $self->mouse_motion ($ev, $x, $y); 2886 $self->invoke_mouse_motion ($ev, $x, $y)
2198} 2887}
2199 2888
2200sub mouse_motion { 2889sub invoke_mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2890 my ($self, $ev, $x, $y) = @_;
2202 2891
2203 if ($GRAB == $self) { 2892 if ($GRAB == $self) {
2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2893 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2205 2894
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2895 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2896
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2897 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2898
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2899 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2900 } else {
2901 return 0;
2902 }
2903
2211 } 2904 1
2905}
2906
2907sub invoke_mouse_wheel {
2908 my ($self, $ev) = @_;
2909
2910 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2911
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915
2916 ! ! $delta
2212} 2917}
2213 2918
2214sub update { 2919sub update {
2215 my ($self) = @_; 2920 my ($self) = @_;
2216 2921
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2922 delete $self->{knob_w};
2923 $self->SUPER::update;
2924}
2925
2926sub _draw {
2927 my ($self) = @_;
2928
2929 unless ($self->{knob_w}) {
2218 $self->set_value ($self->{range}[0]); 2930 $self->set_value ($self->{range}[0]);
2219 2931
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2932 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2933 my $range = ($hi - $page - $lo) || 1e-100;
2222 2934
… …
2228 $value = ($value - $lo) / $range; 2940 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2941 $value = $value * $self->{scale} + $self->{offset};
2230 2942
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2943 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2944 $self->{knob_w} = $knob_w;
2233 }); 2945 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2946
2241 $self->SUPER::_draw (); 2947 $self->SUPER::_draw ();
2242 2948
2243 glScale $self->{w}, $self->{h}; 2949 glScale $self->{w}, $self->{h};
2244 2950
… …
2264 glDisable GL_TEXTURE_2D; 2970 glDisable GL_TEXTURE_2D;
2265} 2971}
2266 2972
2267############################################################################# 2973#############################################################################
2268 2974
2269package CFClient::UI::ValSlider; 2975package CFPlus::UI::ValSlider;
2270 2976
2271our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2272 2978
2273sub new { 2979sub new {
2274 my ($class, %arg) = @_; 2980 my ($class, %arg) = @_;
2275 2981
2276 my $range = delete $arg{range}; 2982 my $range = delete $arg{range};
2277 2983
2278 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2279 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2985 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2280 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2986 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2281 to_value => sub { shift }, 2987 to_value => sub { shift },
2282 from_value => sub { shift }, 2988 from_value => sub { shift },
2283 %arg, 2989 %arg,
2284 ); 2990 );
2285 2991
… …
2305sub set_range { shift->{slider}->set_range (@_) } 3011sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) } 3012sub set_value { shift->{slider}->set_value (@_) }
2307 3013
2308############################################################################# 3014#############################################################################
2309 3015
2310package CFClient::UI::TextView; 3016package CFPlus::UI::TextScroller;
2311 3017
2312our @ISA = CFClient::UI::HBox::; 3018our @ISA = CFPlus::UI::HBox::;
2313 3019
2314use CFClient::OpenGL; 3020use CFPlus::OpenGL;
2315 3021
2316sub new { 3022sub new {
2317 my $class = shift; 3023 my $class = shift;
2318 3024
2319 my $self = $class->SUPER::new ( 3025 my $self = $class->SUPER::new (
2320 fontsize => 1, 3026 fontsize => 1,
2321 can_events => 0, 3027 can_events => 1,
3028 indent => 0,
2322 #font => default_font 3029 #font => default_font
2323 @_, 3030 @_,
2324 3031
2325 layout => (new CFClient::Layout 1), 3032 layout => (new CFPlus::Layout),
2326 par => [], 3033 par => [],
3034 max_par => 0,
2327 height => 0, 3035 height => 0,
2328 children => [ 3036 children => [
2329 (new CFClient::UI::Empty expand => 1), 3037 (new CFPlus::UI::Empty expand => 1),
2330 (new CFClient::UI::Slider vertical => 1), 3038 (new CFPlus::UI::Slider vertical => 1),
2331 ], 3039 ],
2332 ); 3040 );
2333 3041
2334 $self->{children}[1]->connect (changed => sub { $self->update }); 3042 $self->{children}[1]->connect (changed => sub { $self->update });
2335 3043
… …
2341 3049
2342 $self->{fontsize} = $fontsize; 3050 $self->{fontsize} = $fontsize;
2343 $self->reflow; 3051 $self->reflow;
2344} 3052}
2345 3053
3054sub size_request {
3055 my ($self) = @_;
3056
3057 my ($empty, $slider) = @{ $self->{children} };
3058
3059 local $self->{children} = [$empty, $slider];
3060 $self->SUPER::size_request
3061}
3062
2346sub size_allocate { 3063sub invoke_size_allocate {
2347 my ($self, $w, $h) = @_; 3064 my ($self, $w, $h) = @_;
2348 3065
2349 $self->SUPER::size_allocate ($w, $h); 3066 my ($empty, $slider, @other) = @{ $self->{children} };
3067 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2350 3068
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3069 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3070 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $self->{layout}->set_width ($self->{children}[0]{w}); 3071 $self->{layout}->set_width ($empty->{w});
3072 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2354 3073
2355 $self->reflow; 3074 $self->reflow;
2356}
2357 3075
2358sub text_size { 3076 local $self->{children} = [$empty, $slider];
3077 $self->SUPER::invoke_size_allocate ($w, $h)
3078}
3079
3080sub invoke_mouse_wheel {
2359 my ($self, $text, $indent) = @_; 3081 my ($self, $ev) = @_;
3082
3083 return 0 unless $ev->{dy}; # only vertical movements
3084
3085 $self->{children}[1]->emit (mouse_wheel => $ev);
3086
3087 1
3088}
3089
3090sub get_layout {
3091 my ($self, $para) = @_;
2360 3092
2361 my $layout = $self->{layout}; 3093 my $layout = $self->{layout};
2362 3094
3095 $layout->set_font ($self->{font}) if $self->{font};
3096 $layout->set_foreground (@{$para->{fg}});
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3097 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $layout->set_width ($self->{children}[0]{w} - $indent); 3098 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3099 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2365 $layout->set_markup ($text); 3100 $layout->set_markup ($para->{markup});
3101
3102 $layout->set_shapes (
3103 map
3104 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3105 @{$para->{widget}}
2366 3106 );
3107
2367 $layout->size 3108 $layout
2368} 3109}
2369 3110
2370sub reflow { 3111sub reflow {
2371 my ($self) = @_; 3112 my ($self) = @_;
2372 3113
… …
2379 3120
2380 # todo: base offset on lines or so, not on pixels 3121 # todo: base offset on lines or so, not on pixels
2381 $self->{children}[1]->set_value ($offset); 3122 $self->{children}[1]->set_value ($offset);
2382} 3123}
2383 3124
3125sub current_paragraph {
3126 my ($self) = @_;
3127
3128 $self->{top_paragraph} - 1
3129}
3130
3131sub scroll_to {
3132 my ($self, $para) = @_;
3133
3134 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3135
3136 $self->{scroll_to} = $para;
3137 $self->update;
3138}
3139
2384sub clear { 3140sub clear {
2385 my ($self) = @_; 3141 my ($self) = @_;
3142
3143 my (undef, undef, @other) = @{ $self->{children} };
3144 $self->remove ($_) for @other;
2386 3145
2387 $self->{par} = []; 3146 $self->{par} = [];
2388 $self->{height} = 0; 3147 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3148 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390} 3149}
2391 3150
2392sub add_paragraph { 3151sub add_paragraph {
2393 my ($self, $color, $text, $indent) = @_; 3152 my $self = shift;
2394 3153
2395 for my $line (split /\n/, $text) { 3154 for my $para (@_) {
2396 my ($w, $h) = $self->text_size ($line); 3155 $para = {
3156 fg => [1, 1, 1, 1],
3157 indent => 0,
3158 markup => "",
3159 widget => [],
3160 ref $para ? %$para : (markup => $para),
3161 w => 1e10,
3162 wrapped => 1,
3163 };
3164
3165 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3166 push @{$self->{par}}, $para;
3167 }
3168
3169 if (my $max = $self->{max_par}) {
3170 shift @{$self->{par}} while @{$self->{par}} > $max;
3171 }
3172
3173 $self->{need_reflow}++;
3174 $self->update;
3175}
3176
3177sub scroll_to_bottom {
3178 my ($self) = @_;
3179
3180 $self->{scroll_to} = $#{$self->{par}};
3181 $self->update;
3182}
3183
3184sub force_uptodate {
3185 my ($self) = @_;
3186
3187 if (delete $self->{need_reflow}) {
3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189
3190 my $height = 0;
3191
3192 for my $para (@{$self->{par}}) {
3193 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3194 my $layout = $self->get_layout ($para);
3195 my ($w, $h) = $layout->size;
3196
3197 $para->{w} = $w + $para->{indent};
3198 $para->{h} = $h;
3199 $para->{wrapped} = $layout->has_wrapped;
3200 }
3201
3202 $para->{y} = $height;
3203 $height += $para->{h};
3204 }
3205
2397 $self->{height} += $h; 3206 $self->{height} = $height;
2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3207 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2399 }
2400 3208
2401 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3209 delete $self->{texture};
3210 }
3211
3212 if (my $paridx = delete $self->{scroll_to}) {
3213 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3214 }
2402} 3215}
2403 3216
2404sub update { 3217sub update {
2405 my ($self) = @_; 3218 my ($self) = @_;
2406 3219
… …
2408 3221
2409 return unless $self->{h} > 0; 3222 return unless $self->{h} > 0;
2410 3223
2411 delete $self->{texture}; 3224 delete $self->{texture};
2412 3225
2413 $ROOT->on_post_alloc ($self, sub { 3226 $ROOT->on_post_alloc ($self => sub {
3227 $self->force_uptodate;
3228
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3229 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415 3230
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 { 3231 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 3232 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 3233 glClear GL_COLOR_BUFFER_BIT;
2445 3234
3235 package CFPlus::UI::Base;
3236 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3237 (0, 0, $self->{w}, $self->{h});
3238
3239 my $top = int $self->{children}[1]{range}[0];
3240
3241 my $paridx = 0;
3242 my $top_paragraph;
2446 my $top = int $self->{children}[1]{range}[0]; 3243 my $top = int $self->{children}[1]{range}[0];
2447 3244
2448 my $y0 = $top; 3245 my $y0 = $top;
2449 my $y1 = $top + $H; 3246 my $y1 = $top + $H;
2450 3247
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}}) { 3248 for my $para (@{$self->{par}}) {
2462 my $h = $par->[1]; 3249 my $h = $para->{h};
3250 my $y = $para->{y};
2463 3251
2464 if ($y0 < $y + $h && $y < $y1) { 3252 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] }); 3253 my $layout = $self->get_layout ($para);
2466 $layout->set_width ($W - $par->[3]);
2467 $layout->set_markup ($par->[4]);
2468 3254
2469 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3255 $layout->render ($para->{indent}, $y - $y0);
2470 3256
2471 glRasterPos $par->[3], $y - $y0; 3257 if (my @w = @{ $para->{widget} }) {
2472 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3258 my @s = $layout->get_shapes;
3259
3260 for (@w) {
3261 my ($dx, $dy) = splice @s, 0, 2, ();
3262
3263 $_->{x} = $dx + $para->{indent};
3264 $_->{y} = $dy + $y - $y0;
3265
3266 $_->draw;
3267 }
3268 }
2473 } 3269 }
2474 3270
2475 $y += $h; 3271 $paridx++;
3272 $top_paragraph ||= $paridx if $y >= $top;
2476 } 3273 }
2477 3274
2478 glDisable GL_BLEND; 3275 $self->{top_paragraph} = $top_paragraph;
2479 }; 3276 };
2480 }); 3277 });
2481} 3278}
2482 3279
3280sub reconfigure {
3281 my ($self) = @_;
3282
3283 $self->SUPER::reconfigure;
3284
3285 $_->{w} = 1e10 for @{ $self->{par} };
3286 $self->reflow;
3287}
3288
2483sub _draw { 3289sub _draw {
2484 my ($self) = @_; 3290 my ($self) = @_;
2485 3291
2486 glEnable GL_TEXTURE_2D; 3292 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 3294 glColor 0, 0, 0, 1;
2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3295 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2490 glDisable GL_TEXTURE_2D; 3296 glDisable GL_TEXTURE_2D;
2491 3297
2492 $self->{children}[1]->draw; 3298 $self->{children}[1]->draw;
2493
2494} 3299}
2495 3300
2496############################################################################# 3301#############################################################################
2497 3302
2498package CFClient::UI::Animator; 3303package CFPlus::UI::Animator;
2499 3304
2500use CFClient::OpenGL; 3305use CFPlus::OpenGL;
2501 3306
2502our @ISA = CFClient::UI::Bin::; 3307our @ISA = CFPlus::UI::Bin::;
2503 3308
2504sub moveto { 3309sub moveto {
2505 my ($self, $x, $y) = @_; 3310 my ($self, $x, $y) = @_;
2506 3311
2507 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3312 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2535 glPopMatrix; 3340 glPopMatrix;
2536} 3341}
2537 3342
2538############################################################################# 3343#############################################################################
2539 3344
2540package CFClient::UI::Flopper; 3345package CFPlus::UI::Flopper;
2541 3346
2542our @ISA = CFClient::UI::Button::; 3347our @ISA = CFPlus::UI::Button::;
2543 3348
2544sub new { 3349sub new {
2545 my $class = shift; 3350 my $class = shift;
2546 3351
2547 my $self = $class->SUPER::new ( 3352 my $self = $class->SUPER::new (
2548 state => 0, 3353 state => 0,
2549 connect_activate => \&toggle_flopper, 3354 on_activate => \&toggle_flopper,
2550 @_ 3355 @_
2551 ); 3356 );
2552 3357
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 3358 $self
2559} 3359}
2560 3360
2561sub toggle_flopper { 3361sub toggle_flopper {
2562 my ($self) = @_; 3362 my ($self) = @_;
2563 3363
2564 # TODO: use animation 3364 $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} 3365}
2576 3366
2577############################################################################# 3367#############################################################################
2578 3368
2579package CFClient::UI::Tooltip; 3369package CFPlus::UI::Tooltip;
2580 3370
2581our @ISA = CFClient::UI::Bin::; 3371our @ISA = CFPlus::UI::Bin::;
2582 3372
2583use CFClient::OpenGL; 3373use CFPlus::OpenGL;
2584 3374
2585sub new { 3375sub new {
2586 my $class = shift; 3376 my $class = shift;
2587 3377
2588 $class->SUPER::new ( 3378 $class->SUPER::new (
… …
2592} 3382}
2593 3383
2594sub set_tooltip_from { 3384sub set_tooltip_from {
2595 my ($self, $widget) = @_; 3385 my ($self, $widget) = @_;
2596 3386
3387 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3388 if $widget->{tooltip} =~ /^#(.*)$/;
3389
3390 my $tooltip = $widget->{tooltip};
3391
3392 if ($ENV{CFPLUS_DEBUG} & 2) {
3393 $tooltip .= "\n\n" . (ref $widget) . "\n"
3394 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3395 . "req $widget->{req_w} $widget->{req_h}\n"
3396 . "visible $widget->{visible}";
3397 }
3398
3399 $tooltip =~ s/^\n+//;
3400 $tooltip =~ s/\n+$//;
3401
2597 $self->add (new CFClient::UI::Label 3402 $self->add (new CFPlus::UI::Label
2598 markup => $widget->{tooltip}, 3403 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3404 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 3405 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 3406 style => 1, # FLAG_INVERSE
2602 ellipsise => 0, 3407 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 3408 font => ($widget->{tooltip_font} || $::FONT_PROP),
2604 ); 3409 );
2605} 3410}
2606 3411
… …
2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3415 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2611 3416
2612 ($w + 4, $h + 4) 3417 ($w + 4, $h + 4)
2613} 3418}
2614 3419
2615sub size_allocate { 3420sub invoke_size_allocate {
2616 my ($self, $w, $h) = @_; 3421 my ($self, $w, $h) = @_;
2617 3422
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 3423 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3424}
3425
3426sub invoke_visibility_change {
3427 my ($self, $visible) = @_;
3428
3429 return unless $visible;
3430
3431 $self->{root}->on_post_alloc ("move_$self" => sub {
3432 my $widget = $self->{owner}
3433 or return;
3434
3435 if ($widget->{visible}) {
3436 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3437
3438 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3439 if $x + $self->{w} > $self->{root}{w};
3440
3441 $self->move_abs ($x, $y);
3442 } else {
3443 $self->hide;
3444 }
3445 });
2619} 3446}
2620 3447
2621sub _draw { 3448sub _draw {
2622 my ($self) = @_; 3449 my ($self) = @_;
2623 3450
… …
2640 glVertex $w, $h; 3467 glVertex $w, $h;
2641 glVertex $w, 0; 3468 glVertex $w, 0;
2642 glEnd; 3469 glEnd;
2643 3470
2644 glTranslate 2 - 0.375, 2 - 0.375; 3471 glTranslate 2 - 0.375, 2 - 0.375;
3472
2645 $self->SUPER::_draw; 3473 $self->SUPER::_draw;
2646} 3474}
2647 3475
2648############################################################################# 3476#############################################################################
2649 3477
2650package CFClient::UI::Face; 3478package CFPlus::UI::Face;
2651 3479
2652our @ISA = CFClient::UI::Base::; 3480our @ISA = CFPlus::UI::DrawBG::;
2653 3481
2654use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2655 3483
2656sub new { 3484sub new {
2657 my $class = shift; 3485 my $class = shift;
2658 3486
2659 my $self = $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
2660 aspect => 1, 3490 aspect => 1,
2661 can_events => 0, 3491 can_events => 0,
2662 @_, 3492 @_,
2663 ); 3493 );
2664 3494
2665 if ($self->{anim} && $self->{animspeed}) { 3495 if ($self->{anim} && $self->{animspeed}) {
2666 Scalar::Util::weaken (my $widget = $self); 3496 CFPlus::weaken (my $widget = $self);
2667 3497
2668 $self->{timer} = Event->timer ( 3498 $self->{timer} = Event->timer (
2669 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3499 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2670 hard => 1, 3500 hard => 1,
2671 interval => $self->{animspeed}, 3501 interval => $self->{animspeed},
2672 cb => sub { 3502 cb => sub {
3503 return unless $::CONN;
3504
2673 ++$widget->{frame}; 3505 ++$widget->{frame};
3506 $self->update_face;
2674 $widget->update; 3507 $self->update;
2675 }, 3508 },
2676 ); 3509 );
3510
3511 $self->update_face;
2677 } 3512 }
2678 3513
2679 $self 3514 $self
2680} 3515}
2681 3516
3517sub update_face {
3518 my ($self) = @_;
3519
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
3528}
3529
2682sub size_request { 3530sub size_request {
2683 (32, 8) 3531 my ($self) = @_;
3532
3533 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc;
3540 });
3541 }
3542 }
3543 }
3544
3545 ($self->{size_w} || 8, $self->{size_h} || 8)
2684} 3546}
2685 3547
2686sub update { 3548sub update {
2687 my ($self) = @_; 3549 my ($self) = @_;
2688 3550
… …
2694sub _draw { 3556sub _draw {
2695 my ($self) = @_; 3557 my ($self) = @_;
2696 3558
2697 return unless $::CONN; 3559 return unless $::CONN;
2698 3560
2699 my $face; 3561 $self->SUPER::_draw;
2700 3562
2701 if ($self->{frame}) {
2702 my $anim = $::CONN->{anim}[$self->{anim}]; 3563 my $faceid = $::CONN->{faceid}[$self->{face}]
2703 3564 or return;
2704 $face = $anim->[ $self->{frame} % @$anim ]
2705 if $anim && @$anim;
2706 }
2707 3565
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3566 my $tex = $::CONN->{texture}[$faceid];
2709 3567
2710 if ($tex) { 3568 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 3569 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 3571 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3572 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 3573 glDisable GL_TEXTURE_2D;
2716 } 3574 }
2717} 3575}
2718 3576
2719sub DESTROY { 3577sub destroy {
2720 my ($self) = @_; 3578 my ($self) = @_;
2721 3579
2722 $self->{timer}->cancel 3580 $self->{timer}->cancel
2723 if $self->{timer}; 3581 if $self->{timer};
2724 3582
2725 $self->SUPER::DESTROY; 3583 $self->SUPER::destroy;
2726} 3584}
2727 3585
2728############################################################################# 3586#############################################################################
2729 3587
2730package CFClient::UI::Inventory; 3588package CFPlus::UI::Buttonbar;
2731 3589
2732our @ISA = CFClient::UI::ScrolledWindow::; 3590our @ISA = CFPlus::UI::HBox::;
2733 3591
2734sub new { 3592# 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 3593
2775############################################################################# 3594#############################################################################
2776 3595
2777package CFClient::UI::Menu; 3596package CFPlus::UI::Menu;
2778 3597
2779our @ISA = CFClient::UI::FancyFrame::; 3598our @ISA = CFPlus::UI::Toplevel::;
2780 3599
2781use CFClient::OpenGL; 3600use CFPlus::OpenGL;
2782 3601
2783sub new { 3602sub new {
2784 my $class = shift; 3603 my $class = shift;
2785 3604
2786 my $self = $class->SUPER::new ( 3605 my $self = $class->SUPER::new (
2787 items => [], 3606 items => [],
2788 z => 100, 3607 z => 100,
2789 @_, 3608 @_,
2790 ); 3609 );
2791 3610
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3611 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2793 3612
2794 for my $item (@{ $self->{items} }) { 3613 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item; 3614 my ($widget, $cb, $tooltip) = @$item;
2796 3615
2797 # handle various types of items, only text for now 3616 # handle various types of items, only text for now
2798 if (!ref $widget) { 3617 if (!ref $widget) {
3618 if ($widget =~ /\t/) {
3619 my ($left, $right) = split /\t/, $widget, 2;
3620
2799 $widget = new CFClient::UI::Label 3621 $widget = new CFPlus::UI::HBox
2800 can_hover => 1, 3622 can_hover => 1,
2801 can_events => 1, 3623 can_events => 1,
3624 tooltip => $tooltip,
3625 children => [
3626 (new CFPlus::UI::Label markup => $left, expand => 1),
3627 (new CFPlus::UI::Label markup => $right, align => +1),
3628 ],
3629 ;
3630
3631 } else {
3632 $widget = new CFPlus::UI::Label
3633 can_hover => 1,
3634 can_events => 1,
2802 text => $widget; 3635 markup => $widget,
3636 tooltip => $tooltip;
3637 }
2803 } 3638 }
2804 3639
2805 $self->{item}{$widget} = $item; 3640 $self->{item}{$widget} = $item;
2806 3641
2807 $self->{vbox}->add ($widget); 3642 $self->{vbox}->add ($widget);
… …
2812 3647
2813# popup given the event (must be a mouse button down event currently) 3648# popup given the event (must be a mouse button down event currently)
2814sub popup { 3649sub popup {
2815 my ($self, $ev) = @_; 3650 my ($self, $ev) = @_;
2816 3651
2817 $self->_emit ("popdown"); 3652 $self->emit ("popdown");
2818 3653
2819 # maybe save $GRAB? must be careful about events... 3654 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 3655 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 3656 $self->{button} = $ev->{button};
2822 3657
2823 $self->show; 3658 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3659 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 3660}
2826 3661
2827sub mouse_motion { 3662sub invoke_mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 3663 my ($self, $ev, $x, $y) = @_;
2829 3664
2830 # TODO: should use vbox->find_widget or so 3665 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3666 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 3667 $self->{hover} = $self->{item}{$HOVER};
2833}
2834 3668
3669 0
3670}
3671
2835sub button_up { 3672sub invoke_button_up {
2836 my ($self, $ev, $x, $y) = @_; 3673 my ($self, $ev, $x, $y) = @_;
2837 3674
2838 if ($ev->{button} == $self->{button}) { 3675 if ($ev->{button} == $self->{button}) {
2839 undef $GRAB; 3676 undef $GRAB;
2840 $self->hide; 3677 $self->hide;
2841 3678
2842 $self->_emit ("popdown"); 3679 $self->emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 3680 $self->{hover}[1]->() if $self->{hover};
3681 } else {
3682 return 0
3683 }
3684
2844 } 3685 1
2845} 3686}
2846 3687
2847############################################################################# 3688#############################################################################
2848 3689
2849package CFClient::UI::Statusbox; 3690package CFPlus::UI::Multiplexer;
2850 3691
2851our @ISA = CFClient::UI::VBox::; 3692our @ISA = CFPlus::UI::Container::;
2852 3693
2853sub new { 3694sub new {
2854 my $class = shift; 3695 my $class = shift;
2855 3696
2856 $class->SUPER::new ( 3697 my $self = $class->SUPER::new (
3698 @_,
3699 );
3700
3701 $self->{current} = $self->{children}[0]
3702 if @{ $self->{children} };
3703
3704 $self
3705}
3706
3707sub add {
3708 my ($self, @widgets) = @_;
3709
3710 $self->SUPER::add (@widgets);
3711
3712 $self->{current} = $self->{children}[0]
3713 if @{ $self->{children} };
3714}
3715
3716sub get_current_page {
3717 my ($self) = @_;
3718
3719 $self->{current}
3720}
3721
3722sub set_current_page {
3723 my ($self, $page_or_widget) = @_;
3724
3725 my $widget = ref $page_or_widget
3726 ? $page_or_widget
3727 : $self->{children}[$page_or_widget];
3728
3729 $self->{current} = $widget;
3730 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3731
3732 $self->emit (page_changed => $self->{current});
3733
3734 $self->realloc;
3735}
3736
3737sub visible_children {
3738 $_[0]{current}
3739}
3740
3741sub size_request {
3742 my ($self) = @_;
3743
3744 $self->{current}->size_request
3745}
3746
3747sub invoke_size_allocate {
3748 my ($self, $w, $h) = @_;
3749
3750 $self->{current}->configure (0, 0, $w, $h);
3751
3752 1
3753}
3754
3755sub _draw {
3756 my ($self) = @_;
3757
3758 $self->{current}->draw;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Notebook;
3764
3765our @ISA = CFPlus::UI::VBox::;
3766
3767sub new {
3768 my $class = shift;
3769
3770 my $self = $class->SUPER::new (
3771 buttonbar => (new CFPlus::UI::Buttonbar),
3772 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3773 # filter => # will be put between multiplexer and $self
3774 @_,
3775 );
3776
3777 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3778 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3779
3780 $self
3781}
3782
3783sub add {
3784 my ($self, $title, $widget, $tooltip) = @_;
3785
3786 CFPlus::weaken $self;
3787
3788 $self->{buttonbar}->add (new CFPlus::UI::Button
3789 markup => $title,
3790 tooltip => $tooltip,
3791 on_activate => sub { $self->set_current_page ($widget) },
3792 );
3793
3794 $self->{multiplexer}->add ($widget);
3795}
3796
3797sub get_current_page {
3798 my ($self) = @_;
3799
3800 $self->{multiplexer}->get_current_page
3801}
3802
3803sub set_current_page {
3804 my ($self, $page) = @_;
3805
3806 $self->{multiplexer}->set_current_page ($page);
3807 $self->emit (page_changed => $self->{multiplexer}{current});
3808}
3809
3810#############################################################################
3811
3812package CFPlus::UI::Selector;
3813
3814use utf8;
3815
3816our @ISA = CFPlus::UI::Button::;
3817
3818sub new {
3819 my $class = shift;
3820
3821 my $self = $class->SUPER::new (
3822 options => [], # [value, title, longdesc], ...
3823 value => undef,
3824 @_,
3825 );
3826
3827 $self->_set_value ($self->{value});
3828
3829 $self
3830}
3831
3832sub invoke_button_down {
3833 my ($self, $ev) = @_;
3834
3835 my @menu_items;
3836
3837 for (@{ $self->{options} }) {
3838 my ($value, $title, $tooltip) = @$_;
3839
3840 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3841 }
3842
3843 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3844}
3845
3846sub _set_value {
3847 my ($self, $value) = @_;
3848
3849 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3850 or return;
3851
3852 $self->{value} = $item->[0];
3853 $self->set_markup ("$item->[1] ⇓");
3854 $self->set_tooltip ($item->[2]);
3855}
3856
3857sub set_value {
3858 my ($self, $value) = @_;
3859
3860 return unless $self->{value} ne $value;
3861
3862 $self->_set_value ($value);
3863 $self->emit (changed => $value);
3864}
3865
3866#############################################################################
3867
3868package CFPlus::UI::Statusbox;
3869
3870our @ISA = CFPlus::UI::VBox::;
3871
3872sub new {
3873 my $class = shift;
3874
3875 my $self = $class->SUPER::new (
2857 fontsize => 0.8, 3876 fontsize => 0.8,
2858 @_, 3877 @_,
2859 ) 3878 );
3879
3880 CFPlus::weaken (my $this = $self);
3881
3882 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3883
3884 $self
2860} 3885}
2861 3886
2862sub reorder { 3887sub reorder {
2863 my ($self) = @_; 3888 my ($self) = @_;
2864 my $NOW = time; 3889 my $NOW = Time::HiRes::time;
3890
3891 # freeze display when hovering over any label
3892 return if $CFPlus::UI::TOOLTIP->{owner}
3893 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3894 values %{ $self->{item} };
2865 3895
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3896 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3897 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3898 }
2869 3899
… …
2872 my @items = sort { 3902 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3903 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3904 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3905 } values %{ $self->{item} };
2876 3906
3907 $self->{timer}->interval (1);
3908
2877 my $count = 10 + 1; 3909 my $count = 10 + 1;
2878 for my $item (@items) { 3910 for my $item (@items) {
2879 last unless --$count; 3911 last unless --$count;
2880 3912
2881 push @widgets, $item->{label} ||= do { 3913 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3914 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3915 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3916 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3917 : $item->{text};
2886 3918
2887 for ($short) { 3919 for ($short) {
2888 s/^\s+//; 3920 s/^\s+//;
2889 s/\s+/ /g; 3921 s/\s+/ /g;
2890 } 3922 }
2891 3923
2892 new CFClient::UI::Label 3924 new CFPlus::UI::Label
2893 markup => $short, 3925 markup => $short,
2894 tooltip => $item->{tooltip}, 3926 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3927 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3928 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3929 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3930 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3931 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3932 can_events => 1,
2901 can_hover => 1 3933 can_hover => 1
2902 }; 3934 };
3935
3936 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3937 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3938 $label->update;
3939 $label->set_max_size (undef, $label->{req_h} * $diff)
3940 if $diff < 1;
3941 $self->{timer}->interval (1/30);
3942 } else {
3943 $label->{fg}[3] = $item->{fg}[3] || 1;
3944 }
3945
3946 push @widgets, $label;
2903 } 3947 }
2904 3948
2905 $self->clear; 3949 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3950 $self->SUPER::add (reverse @widgets);
2907} 3951}
… …
2912 $text =~ s/^\s+//; 3956 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3957 $text =~ s/\s+$//;
2914 3958
2915 return unless $text; 3959 return unless $text;
2916 3960
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3961 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3962
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3964
2921 if (my $item = $self->{item}{$group}) { 3965 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3966 if ($item->{text} eq $text) {
2923 $item->{count}++; 3967 $item->{count}++;
2924 } else { 3968 } else {
2925 $item->{count} = 1; 3969 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text; 3970 $item->{text} = $item->{tooltip} = $text;
2927 } 3971 }
2928 $item->{id} = ++$self->{id}; 3972 $item->{id} += 0.2;#d#
2929 $item->{timeout} = $timeout; 3973 $item->{timeout} = $timeout;
2930 delete $item->{label}; 3974 delete $item->{label};
2931 } else { 3975 } else {
2932 $self->{item}{$group} = { 3976 $self->{item}{$group} = {
2933 id => ++$self->{id}, 3977 id => ++$self->{id},
… …
2939 count => 1, 3983 count => 1,
2940 %arg, 3984 %arg,
2941 }; 3985 };
2942 } 3986 }
2943 3987
3988 $ROOT->on_refresh (reorder => sub {
2944 $self->reorder; 3989 $self->reorder;
3990 });
2945} 3991}
2946 3992
2947sub reconfigure { 3993sub reconfigure {
2948 my ($self) = @_; 3994 my ($self) = @_;
2949 3995
… …
2952 3998
2953 $self->reorder; 3999 $self->reorder;
2954 $self->SUPER::reconfigure; 4000 $self->SUPER::reconfigure;
2955} 4001}
2956 4002
4003sub destroy {
4004 my ($self) = @_;
4005
4006 $self->{timer}->cancel;
4007
4008 $self->SUPER::destroy;
4009}
4010
2957############################################################################# 4011#############################################################################
2958 4012
2959package CFClient::UI::Root; 4013package CFPlus::UI::Root;
2960 4014
2961our @ISA = CFClient::UI::Container::; 4015our @ISA = CFPlus::UI::Container::;
2962 4016
4017use List::Util qw(min max);
4018
2963use CFClient::OpenGL; 4019use CFPlus::OpenGL;
2964 4020
2965sub new { 4021sub new {
2966 my $class = shift; 4022 my $class = shift;
2967 4023
2968 $class->SUPER::new ( 4024 my $self = $class->SUPER::new (
4025 visible => 1,
2969 @_, 4026 @_,
2970 ) 4027 );
2971}
2972 4028
2973sub configure { 4029 CFPlus::weaken ($self->{root} = $self);
2974 my ($self, $x, $y, $w, $h) = @_;
2975 4030
2976 $self->{w} = $w; 4031 $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} 4032}
2986 4033
2987sub size_request { 4034sub size_request {
2988 my ($self) = @_; 4035 my ($self) = @_;
2989 4036
2990 ($self->{w}, $self->{h}) 4037 ($self->{w}, $self->{h})
2991} 4038}
2992 4039
4040sub _to_pixel {
4041 my ($coord, $size, $max) = @_;
4042
4043 $coord =
4044 $coord eq "center" ? ($max - $size) * 0.5
4045 : $coord eq "max" ? $max
4046 : $coord;
4047
4048 $coord = 0 if $coord < 0;
4049 $coord = $max - $size if $coord > $max - $size;
4050
4051 int $coord + 0.5
4052}
4053
2993sub size_allocate { 4054sub invoke_size_allocate {
2994 my ($self, $w, $h) = @_; 4055 my ($self, $w, $h) = @_;
2995 4056
2996 for my $child ($self->children) { 4057 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4058 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 4059
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4060 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 4061 $Y = $child->{force_y} if exists $child->{force_y};
3001 4062
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4063 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 4064 $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 4065
3008 $child->configure ($X, $Y, $W, $H); 4066 $child->configure ($X, $Y, $W, $H);
3009 } 4067 }
4068
4069 1
3010} 4070}
3011 4071
3012sub coord2local { 4072sub coord2local {
3013 my ($self, $x, $y) = @_; 4073 my ($self, $x, $y) = @_;
3014 4074
… …
3022} 4082}
3023 4083
3024sub update { 4084sub update {
3025 my ($self) = @_; 4085 my ($self) = @_;
3026 4086
3027 $self->check_size;
3028 $::WANT_REFRESH++; 4087 $::WANT_REFRESH++;
3029} 4088}
3030 4089
3031sub add { 4090sub add {
3032 my ($self, @children) = @_; 4091 my ($self, @children) = @_;
3033 4092
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; 4093 $_->{is_toplevel} = 1
3042 4094 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 4095
3048 $self->SUPER::add (@children); 4096 $self->SUPER::add (@children);
3049} 4097}
3050 4098
3051sub remove { 4099sub remove {
3052 my ($self, @children) = @_; 4100 my ($self, @children) = @_;
3053 4101
3054 $self->SUPER::remove (@children); 4102 $self->SUPER::remove (@children);
4103
4104 delete $self->{is_toplevel}
4105 for @children;
3055 4106
3056 while (@children) { 4107 while (@children) {
3057 my $w = pop @children; 4108 my $w = pop @children;
3058 push @children, $w->children; 4109 push @children, $w->children;
3059 $w->set_invisible; 4110 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 4129 while ($self->{refresh_hook}) {
3079 $_->() 4130 $_->()
3080 for values %{delete $self->{refresh_hook}}; 4131 for values %{delete $self->{refresh_hook}};
3081 } 4132 }
3082 4133
3083 if ($self->{check_size}) { 4134 if ($self->{realloc}) {
3084 my @queue = ([], []); 4135 my %queue;
4136 my @queue;
4137 my $widget;
3085 4138
3086 for (;;) { 4139 outer:
3087 if ($self->{check_size}) { 4140 while () {
3088 # heuristic: check containers last 4141 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4142 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 4143 $widget->{visible} or next; # do not resize invisible widgets
4144
4145 $queue{$widget+0}++ and next; # duplicates are common
4146
4147 push @{ $queue[$widget->{visible}] }, $widget;
4148 }
3091 } 4149 }
3092 4150
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4151 while () {
4152 @queue or last outer;
3094 4153
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4154 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 4155 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 4156
4157 pop @queue;
4158 }
4159
4160 delete $queue{$widget+0};
4161
4162 my ($w, $h) = $widget->size_request;
4163
4164 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4165 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4166
4167 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4168 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4169
4170 $w = $widget->{force_w} if exists $widget->{force_w};
4171 $h = $widget->{force_h} if exists $widget->{force_h};
4172
4173 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4174 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 4175 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 4176 $widget->{req_h} = $h;
3105 4177
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4178 $self->{size_alloc}{$widget+0} = $widget;
3107 4179
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 4180 if (my $parent = $widget->{parent}) {
4181 $self->{realloc}{$parent+0} = $parent
4182 unless $queue{$parent+0};
4183
4184 $parent->{force_size_alloc} = 1;
4185 $self->{size_alloc}{$parent+0} = $parent;
4186 }
3110 } 4187 }
4188
4189 delete $self->{realloc}{$widget+0};
3111 } 4190 }
3112 } 4191 }
3113 4192
3114 while ($self->{size_alloc}) { 4193 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 4194 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 4195 values %$size_alloc;
4196
4197 while () {
4198 my $widget = pop @queue || last;
4199
4200 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 4201
3118 $w = 0 if $w < 0; 4202 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 4203 $h = 0 if $h < 0;
3120 4204
4205 $w = max $widget->{min_w}, $w;
4206 $h = max $widget->{min_h}, $h;
4207
4208# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4209# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4210
4211 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4212 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4213
4214 $w = int $w + 0.5;
4215 $h = int $h + 0.5;
4216
4217 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4218 $widget->{old_w} = $widget->{w};
4219 $widget->{old_h} = $widget->{h};
4220
3121 $widget->{w} = $w; 4221 $widget->{w} = $w;
3122 $widget->{h} = $h; 4222 $widget->{h} = $h;
4223
3123 $widget->emit (size_allocate => $w, $h); 4224 $widget->emit (size_allocate => $w, $h);
4225 }
3124 } 4226 }
3125 } 4227 }
3126 4228
3127 while ($self->{post_alloc_hook}) { 4229 while ($self->{post_alloc_hook}) {
3128 $_->() 4230 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 4231 for values %{delete $self->{post_alloc_hook}};
3130 } 4232 }
4233
3131 4234
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4235 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4236 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 4237 glClear GL_COLOR_BUFFER_BIT;
3135 4238
… …
3137 glLoadIdentity; 4240 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4241 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 4242 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 4243 glLoadIdentity;
3141 4244
4245 {
4246 package CFPlus::UI::Base;
4247
4248 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4249 (0, 0, $self->{w}, $self->{h});
4250
3142 $self->_draw; 4251 $self->_draw;
4252 }
3143} 4253}
3144 4254
3145############################################################################# 4255#############################################################################
3146 4256
3147package CFClient::UI; 4257package CFPlus::UI;
3148 4258
3149$ROOT = new CFClient::UI::Root; 4259$ROOT = new CFPlus::UI::Root;
3150$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4260$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3151 4261
31521 42621
3153 4263

Diff Legend

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