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

Diff Legend

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